Merge branch 'master' of github.com:openlayers/ol3

src/ol/layer/XYZ.js

@@ -108,7 +108,7 @@ ol.layer.XYZ.prototype.setResolutions = function(resolutions) {
  */
 ol.layer.XYZ.prototype.getData = function(bounds, resolution) {
     var me = this,
-        zoom = me.zoomForResolution_(resolution);
+        zoom = me.zoomForResolution(resolution);
     resolution = me.resolutions_[zoom];
 
     var boundsMinX = bounds.getMinX(),
@@ -157,10 +157,9 @@ ol.layer.XYZ.prototype.getData = function(bounds, resolution) {
 
 /**
  * Get the zoom level (z) for the given resolution.
- * @private
  * @param {number} resolution
  */
-ol.layer.XYZ.prototype.zoomForResolution_ = function(resolution) {
+ol.layer.XYZ.prototype.zoomForResolution = function(resolution) {
     var delta = Number.POSITIVE_INFINITY,
         currentDelta,
         resolutions = this.resolutions_;

src/ol/mixins/coordinate.js

@@ -1,31 +0,0 @@
-goog.provide('ol.mixins.coordinate');
-goog.require('goog.object');
-
-goog.object.extend(ol.mixins.coordinate, {
-    
-    getX : function() {
-        return this.x_;
-    },
-    
-    getY : function() {
-        return this.y_;
-    },
-    
-    getZ : function() {
-        return this.z_;
-    },
-    
-    setX : function(x) {
-        this.x_ = x;
-        return this;
-    },
-    
-    setY : function(y) {
-        this.y_ = y;
-        return this;
-    },
-    setZ: function(z) {
-        this.z_ = z;
-        return this;
-    }
-});