Changeset 1577

Timestamp:

10/05/06 00:20:16 (2 years ago)

Author:

euzuro

Message:

add a new property to layer.js called 'visibility' which we now need to store instead of reading directly from the visiblity of the div itself, since the div might be hidden, but only because it is out of range. we thus add a new method on layer called inRange() which returns whether or not the layer's max/min resolution settings allow it to be displayed at the current map's resolution. to make sure that min/max resolution, scale, etc are set for *all* layers, we remove the if statement limiting the running of initResolution() to only baselayers, and we add code at the end of that function that, once the resolutions array has been calculated, then goes back and sets min/max scale and resolution. now what we have to do is every time moveTo() is called on a layer, if the zoom has changed, then we must check if the layer is inRange() and update the display accordingly. on that same note, the layerswitcher must now be attentive to these changes, so we set it to redraw every time the zoom changes. in the layerswitcher code, we now add special code to disable a layer if it is out of range. must add the superclass call to moveTo() for all of the layers to ensure this code is executed for all. update test.

Files:

• trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Canvas.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Google.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js

@@ -130 +130 @@
-                inputElem.layer = layer;
-                inputElem.control = this;
+                if (!layer.inRange()) {
+                    inputElem.disabled = true;
+                }
-                Event.observe(inputElem, "mouseup", 
-                              this.onInputClick.bindAsEventListener(inputElem));
@@ -135 +138 @@
-                // create span
-                var labelSpan = document.createElement("span");
+                if (!layer.inRange()) {
+                    labelSpan.style.color = "grey";
+                }
-                labelSpan.innerHTML = layer.name;
-                labelSpan.style.verticalAlign = (baseLayer) ? "bottom" : "baseline";
@@ -170 +176 @@
-
-    onInputClick: function(e) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-        Event.stop(e);

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -41 +41 @@
-     * @type boolean */
-    displayInLayerSwitcher: true,
+
+    /** Whether or not the layer should be displayed in the map
+     * 
+     * @type Boolean
+     */
+    visibility: true,
-
-  // OPTIONS
@@ -181 +187 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-
+
+
+
+
-    },
-
@@ -212 +221 @@
-            }    
-        }
-
-
-
+
-    },
-  
-    /**
-is visible
+should be displayed (if in range)
-    * @type Boolean
-    */
-    getVisibility: function() {
-(this.div.style.display != "none")
+this.visibility
-    },
-
-    /** 
-
+
+
-     * @param {Boolean} noEvent
-     */
-le
-le != this.getVisibility()
-div.style.display = (visible) ? "block" : "none"
-(visible) && (this.map != null)
+ility
+ility != this.visibility
+visibility = visibility
+this.map != null
-                var extent = this.map.getExtent();
-                if (extent != null) {
@@ -244 +252 @@
-        }
-    },
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** 
-     * @param {Boolean} isBaseLayer 
@@ -335 +367 @@
-                                   return(b-a);
-                               });
+
+        this.minResolution = this.resolutions[this.resolutions.length - 1];
+        this.maxResolution = this.resolutions[0];
+        
+        this.minScale = 
+            OpenLayers.Util.getScaleFromResolution(this.maxResolution, 
+                                                   this.units);
+        this.maxScale = 
+            OpenLayers.Util.getScaleFromResolution(this.minResolution, 
+                                                   this.units);
-    },
-

trunk/openlayers/lib/OpenLayers/Layer/Canvas.js

@@ -50 +50 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-
+
+
+
-    },
-

trunk/openlayers/lib/OpenLayers/Layer/Google.js

@@ -77 +77 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
-
-        if ((this.gmap != null) && (!this.dragging)) {

trunk/openlayers/lib/OpenLayers/Layer/Grid.js

@@ -97 +97 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this, arguments);
+        
-        if (bounds == null) {
-            bounds = this.map.getExtent();

trunk/openlayers/lib/OpenLayers/Layer/Markers.js

@@ -49 +49 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
+
-        if (zoomChanged) {
-            this.redraw();

trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js

@@ -48 +48 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
-
-        if (this.multimap != null) {

trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js

@@ -51 +51 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
-
-        if (this.vemap != null) {

trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js

@@ -48 +48 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
-
-        if (this.yahoomap != null) {

trunk/openlayers/lib/OpenLayers/Map.js

@@ -621 +621 @@
-            for (var i = 0; i < this.layers.length; i++) {
-                var layer = this.layers[i];
-layer.getVisibility(
+zoomChanged || (layer.display && layer.inRange()
-                    layer.moveTo(bounds, zoomChanged, dragging);
-                }