Merge branch '2.12'

lib/OpenLayers/Layer.js

@@ -275,16 +275,6 @@ OpenLayers.Layer = OpenLayers.Class({
      * {Float}
      */
     minResolution: null,
-    
-    /**
-     * Property: resolution
-     * {Float} Current resolution that the layer is drawn in. This is
-     *     used to determine whether the zoom has changed when calling
-     *     <moveTo> from <redraw>. Subclasses may set this.resolution to
-     *     null prior to calling redraw to force passing zoomChanged
-     *     true to moveTo.
-     */
-    resolution: null,
 
     /**
      * APIProperty: numZoomLevels
@@ -566,8 +556,7 @@ OpenLayers.Layer = OpenLayers.Class({
             var extent = this.getExtent();
 
             if (extent && this.inRange && this.visibility) {
-                var zoomChanged = this.resolution == null ||
-                              this.resolution !== this.map.getResolution();
+                var zoomChanged = true;
                 this.moveTo(extent, zoomChanged, false);
                 this.events.triggerEvent("moveend",
                     {"zoomChanged": zoomChanged});
@@ -592,7 +581,6 @@ OpenLayers.Layer = OpenLayers.Class({
             display = display && this.inRange;
         }
         this.display(display);
-        this.resolution = this.map.getResolution();
     },
 
     /**
@@ -648,8 +636,6 @@ OpenLayers.Layer = OpenLayers.Class({
             
             // deal with gutters
             this.setTileSize();
-
-            this.resolution = null;
         }
     },
     
@@ -889,16 +875,6 @@ OpenLayers.Layer = OpenLayers.Class({
                 props.resolutions = this.resolutionsFromScales(props.scales);
             }
             if(props.resolutions == null) {
-                var maxExtent = this.maxExtent;
-                if (!props.maxResolution && maxExtent) {
-                    // maxResolution for default grid sets assumes that at zoom
-                    // level zero, the whole world fits on one tile.
-                    var tileSize = this.tileSize || this.map.getTileSize();
-                    props.maxResolution = Math.max(
-                        maxExtent.getWidth() / tileSize.w,
-                        maxExtent.getHeight() / tileSize.h
-                    );
-                }
                 props.resolutions = this.calculateResolutions(props);
             }
         }
@@ -1034,6 +1010,18 @@ OpenLayers.Layer = OpenLayers.Class({
             minResolution = Math.max(wRes, hRes);
         }
 
+        if(typeof maxResolution !== "number" &&
+           typeof minResolution !== "number" &&
+           this.maxExtent != null) {
+            // maxResolution for default grid sets assumes that at zoom
+            // level zero, the whole world fits on one tile.
+            var tileSize = this.tileSize || this.map.getTileSize();
+            maxResolution = Math.max(
+                this.maxExtent.getWidth() / tileSize.w,
+                this.maxExtent.getHeight() / tileSize.h
+            );
+        }
+
         // determine numZoomLevels
         var maxZoomLevel = props.maxZoomLevel;
         var numZoomLevels = props.numZoomLevels;