Changeset 5386

Timestamp:

12/12/07 15:08:49 (1 year ago)

Author:

elemoine

Message:

removeLayer must reset layers z-index. Thanks tschaub for the review and the new patch. (closes #1090)

Files:

• trunk/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Map.js

@@ -634 +634 @@
-
-    /**
+     * Method: resetLayersZIndex
+     * Reset each layer's z-index based on layer's array index
+     */
+    resetLayersZIndex: function() {
+        for (var i = 0; i < this.layers.length; i++) {
+            var layer = this.layers[i];
+            this.setLayerZIndex(layer, i);
+        }
+    },
+
+    /**
-    * APIMethod: addLayer
-    *
@@ -741 +752 @@
-            }
-        }
+
+        this.resetLayersZIndex();
+
-        this.events.triggerEvent("removelayer");
-    },

trunk/openlayers/tests/test_Map.html

@@ -603 +603 @@
-            baseLayer: layers[0],
-            layerContainerDiv: {removeChild: f},
-
+
+
-        };
-        OpenLayers.Map.prototype.removeLayer.apply(map, [map.baseLayer, false]);
@@ -637 +638 @@
-        t.eq(map.getResolution(), layer0.resolutions[1],
-             "correct resolution after removal");
+    }
+
+    function test_Map_removeLayer_zindex(t) {
+        t.plan(2);
+        
+        map = new OpenLayers.Map('map');
+
+        var layer0 = new OpenLayers.Layer('Test Layer 0', {isBaseLayer:true});
+        var layer1 = new OpenLayers.Layer('Test Layer 1', {isBaseLayer:true});
+        var layer2 = new OpenLayers.Layer('Test Layer 2', {isBaseLayer:false});
+
+        map.addLayers([layer0, layer1, layer2]);
+        map.removeLayer(layer0);
+
+        t.eq(parseInt(layer1.div.style.zIndex), map.Z_INDEX_BASE['BaseLayer'],
+             "correct z-index after removeLayer");
+        t.eq(parseInt(layer2.div.style.zIndex), map.Z_INDEX_BASE['Overlay'] + 5,
+             "correct z-index after removeLayer");
-    }
-