Ticket #987: layer.2.patch

tests/Layer.html

@@ -145 +145 @@
-    }
-
-    function test_Layer_initResolutions(t) {
-2
+5
-        var map = new OpenLayers.Map("map");
-        var options, layer;
-        
-hree t
+
-        options = {
-            minResolution: 1.5,
-            maxResolution: 10.5,
@@ -163 +163 @@
-        t.eq(layer.maxResolution.toPrecision(6), (10.5).toPrecision(6),
-             "(with numZoomLevels) layer maxResolution preserved");
-        t.eq(layer.numZoomLevels, 5, "(with numZoomLevels) layer numZoomLevels preserved");
-
+
+
-        // three tests for minResolution, and maxResolution
-        options = {
-            minResolution: 1.5,
@@ -206 +207 @@
-        t.eq(layer.maxScale.toPrecision(6), (155).toPrecision(6),
-             "(without numZoomLevels) layer maxScale preserved");
-        t.eq(layer.numZoomLevels, 4, "(without numZoomLevels) layer numZoomLevels calculated");
+        
+        layer = new OpenLayers.Layer("test", {'projection': 'EPSG:4326', 'map': map});
+        layer.initResolutions();
+        t.eq(layer.alwaysInRange, true, "always in range true if only get projection.");     
+        
+        OpenLayers.Layer.prototype.alwaysInRange = false;
+        layer = new OpenLayers.Layer("test", {'projection': 'EPSG:4326', 'map': map});
+        layer.initResolutions();
+        t.eq(layer.alwaysInRange, false, "always in range true if overridden on prototype.");     
+        OpenLayers.Layer.prototype.alwaysInRange = null;
-
-        map.destroy();
-        

lib/OpenLayers/Layer.js

@@ -38 +38 @@
-    opacity: null,
-
-    /**
+     * APIProperty: alwaysInRange
+     * {Boolean} If a layer should not use scale-based display properties,
+     *     this should be set to true. This will cause the layer, as an
+     *     overlay, to always be 'active'. By default, this is set to
+     *     true on overlays which do not pass any explicit scale-based options
+     *     in the options of the layer.
+     */
+    alwaysInRange: null,   
+
+    /**
-     * Constant: EVENT_TYPES
-     * {Array(String)} Supported application event types.  Register a listener
-     *     for a particular event with the following syntax:
@@ -618 +628 @@
-     *     resolution.
-     */
-    calculateInRange: function() {
+        if (this.alwaysInRange) {
+            return true;
+        }
-        var inRange = false;
-        if (this.map) {
-            var resolution = this.map.getResolution();
@@ -677 +690 @@
-          'numZoomLevels', 'maxZoomLevel'
-        );
-
+        var notScaleProps = ['projection', 'units'];    
+
-        // First we create a new object where we will store all of the 
-        //  resolution-related properties that we find in either the layer's
-        //  'options' array or from the map.
-
+
+
-        var confProps = {};        
-        for(var i=0, len=props.length; i<len; i++) {
-            var property = props[i];
+            
+            // If the layer had one of these properties set *and* the property
+            // is not a non-scale property, then the user intended to use
+            // scale-dependant display.
+            if (this.options[property] && OpenLayers.Util.indexOf(notScaleProps, property) == -1) {
+                useInRange = true;
+            }
+                   
-            confProps[property] = this.options[property] || this.map[property];
-        }
+        
+        this.alwaysInRange = (this.alwaysInRange == null) ? !useInRange : this.alwaysInRange;
-
-        // Do not use the scales/resolutions at the map level if
-        // minScale/minResolution and maxScale/maxResolution are