Ticket #577: layerswitcherMem.3.patch

lib/OpenLayers/Control/LayerSwitcher.js

@@ -25 +25 @@
-    baseLayersDiv: null,
-
-    /** @type Array */
-Input
+
-    
-    
-    /** @type DOMElement */
@@ -35 +35 @@
-    dataLayersDiv: null,
-
-    /** @type Array */
-Input
+
-
-
-    /** @type DOMElement */
@@ -85 +85 @@
-        return this.div;
-    },
-
+    /** user specifies either "base" or "data". we then clear all the 
+     *    corresponding listeners, the div, and reinitialize a new array.
+     * 
+     * @private
+     * 
+     * @param {String} layersType Ei
+     */
+    clearLayersArray: function(layersType) {
+        var layers = this[layersType + "Layers"];
+        if (layers) {
+            for(var i=0; i < layers.length; i++) {
+                var layer = layers[i];
+                OpenLayers.Event.stopObservingElement(layer.inputElem);
+                OpenLayers.Event.stopObservingElement(layer.labelSpan);
+            }
+        }
+        this[layersType + "LayersDiv"].innerHTML = "";
+        this[layersType + "Layers"] = new Array();
+    },
+
+
-    /** Goes through and takes the current state of the Map and rebuilds the
-     *   control to display that state. Groups base layers into a radio-button
-     *   group and lists each data layer with a checkbox.
@@ -95 +116 @@
-    redraw: function() {
-
-        //clear out previous layers 
-baseLayersDiv.innerHTML = ""
-baseLayerInputs = new Array(
+clearLayersArray("base")
+clearLayersArray("data"
-        
-        this.dataLayersDiv.innerHTML = "";
-        this.dataLayerInputs = new Array();
-        
-        var containsOverlays = false;
-        
-        var layers = this.map.layers.slice();
@@ -128 +146 @@
-                inputElem.value = layer.name;
-                inputElem.checked = checked;
-                inputElem.defaultChecked = checked;
-                inputElem.layer = layer;
-                inputElem.control = this;
-
-                if (!baseLayer && !layer.inRange) {
-                    inputElem.disabled = true;
-                }
+                var context = {
+                    'inputElem': inputElem,
+                    'layer': layer,
+                    'layerSwitcher': this
+                }
-                OpenLayers.Event.observe(inputElem, "mouseup", 
-inputElem
+context
-                
-                // create span
-                var labelSpan = document.createElement("span");
@@ -143 +164 @@
-                    labelSpan.style.color = "gray";
-                }
-                labelSpan.innerHTML = layer.name;
-
+
+
-                OpenLayers.Event.observe(labelSpan, "click", 
-inputElem
+context
-                // create line break
-                var br = document.createElement("br");
-    
-                
-
-
-
+
+
+
+
+
+
+
-                                                     
-    
-                var groupDiv = (baseLayer) ? this.baseLayersDiv
@@ -173 +199 @@
-     * 
-     * @private
-     * 
+     * @context 
+     *      {DOMElement} inputElem
+     *      {OpenLayers.Control.LayerSwitcher} layerSwitcher
+     *      {OpenLayers.Layer} layer
+     * 
-     * @param {Event} e
-     */
-
-    onInputClick: function(e) {
-
-
-
+
+
+
+
-                this.layer.map.setBaseLayer(this.layer, true);
-                this.layer.map.events.triggerEvent("changebaselayer");
-            } else {
-checked = !this
-control
+inputElem.checked = !this.inputElem
+layerSwitcher
-            }
-        }
-        OpenLayers.Event.stop(e);
@@ -211 +243 @@
-    updateMap: function() {
-
-        // set the newly selected base layer        
-Input
-input = this.baseLayerInputs[i];   
-input
-input
+
+layerEntry = this.baseLayers[i];
+layerEntry.inputElem
+layerEntry
-            }
-        }
-
-        // set the correct visibilities for the overlays
-Input
-input = this.dataLayerInput
-input.layer.setVisibility(input
+
+layerEntry = this.dataLayer
+layerEntry.layer.setVisibility(layerEntry.inputElem
-        }
-
-    },