Changeset 4053

Timestamp:

08/27/07 11:54:57 (1 year ago)

Author:

euzuro

Message:

add removeLayer() function to Layers... implement it for EventPane so that it removes the extra 'pane' div when the layer is removed. (Closes #887)

Files:

• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/EventPane.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_EventPane.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -420 +420 @@
-    
-    /**
+     * APIMethod: removeMap
+     * Just as setMap() allows each layer the possibility to take a 
+     *     personalized action on being added to the map, removeMap() allows
+     *     each layer to take a personalized action on being removed from it. 
+     *     For now, this will be mostly unused, except for the EventPane layer,
+     *     which needs this hook so that it can remove the special invisible
+     *     pane. 
+     * 
+     * Parameters:
+     * map - {<OpenLayers.Map>}
+     */
+    removeMap: function(map) {
+        //to be overridden by subclasses
+    },
+    
+    /**
-     * APIMethod: getImageSize
-     * 

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

@@ -105 +105 @@
-        }
-    },
+
+    /**
+     * APIMethod: removeMap
+     * On being removed from the map, we'll like to remove the invisible 'pane'
+     *     div that we added to it on creation. 
+     * 
+     * Parameters:
+     * map - {<OpenLayers.Map>}
+     */
+    removeMap: function(map) {
+        if (this.pane && this.pane.parentNode) {
+            this.pane.parentNode.removeChild(this.pane);
+            this.pane = null;
+        }
+        OpenLayers.Layer.prototype.removeMap.apply(this, arguments);
+    },
-  
-    /**

trunk/openlayers/lib/OpenLayers/Map.js

@@ -567 +567 @@
-            this.layerContainerDiv.removeChild(layer.div);
-        }
+        OpenLayers.Util.removeItem(this.layers, layer);
+        layer.removeMap(this);
-        layer.map = null;
-        OpenLayers.Util.removeItem(this.layers, layer);
-
-        // if we removed the base layer, need to set a new one

trunk/openlayers/tests/Layer/test_EventPane.html

@@ -106 +106 @@
-        t.eq(layer.visibility, true, "layer pane is now visible");
-    }
+
+    
+    function test_Layer_EventPane_removeLayer(t) {
+        t.plan(1);
+        var map = new OpenLayers.Map('map');
+        
+        layer = new OpenLayers.Layer.EventPane('Test Layer');
+        layer.loadMapObject = function() { };
+        layer.getWarningHTML = function() { this.warning = true; return ""; };
+        map.addLayer(layer);
+        map.removeLayer(layer);
+        t.eq(layer.pane, null, "Layer.pane is null after being removed.");
+   }      
+
-  // -->
-  </script>