Changeset 7712

Timestamp:

08/08/08 08:23:59 (4 months ago)

Author:

elemoine

Message:

maxZIndex becomes NULL when the last feature is removed, p=pvalsecc, r=me (closes #1670)

Files:

• trunk/openlayers/lib/OpenLayers/Renderer/Elements.js (modified) (3 diffs)
• trunk/openlayers/tests/Renderer/Elements.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Renderer/Elements.js

@@ -129 +129 @@
-            // Reset the maxium z-index based on the last item in the 
-            // order array.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-    
-    /**
-     * APIMethod: exists
- 
+
-     * Parameters:
-     * node- {DOMElement} The node to test for existence.
- 
+
-     * Returns:
-     * {Boolean} Whether or not the node exists in the indexer?
@@ -146 +159 @@
-        return (this.indices[node.id] != null);
-    },
-
+
-    /**
-     * APIMethod: getZIndex
@@ -396 +409 @@
-            }
-        }
+        this.indexer.clear();
-    },
-

trunk/openlayers/tests/Renderer/Elements.html

@@ -453 +453 @@
-    }
-
+    function test_Elements_drawAndErase(t) {
+        t.plan(20);
+
+        setUp();
+
+        var r = create_renderer();
+        var element = document.createElement("div");
+        r.root = element;
+        document.body.appendChild(element);
+
+        r.createNode = function(type, id) {
+            var element = document.createElement("div");
+            element.id = id;
+            return element;
+        };
+        r.setStyle = function(node, style, options, geometry) {
+            return node;
+        };
+        
+        var geometry = {
+            id: 'foo',
+            CLASS_NAME: 'bar'
+        };
+        var style = {
+            graphicZIndex: 10
+        };
+        var featureId = 'foo';
+        r.drawGeometry(geometry, style, featureId);
+
+        function count(obj) {
+            var result = 0;
+            for (var i in obj) {
+                result++;
+            }
+            return result;
+        }
+
+        t.ok(r.root.childNodes.length == 1, "root is correctly filled");
+        t.ok(r.indexer.maxZIndex == 10, "indexer.maxZIndex is correctly filled");
+        t.ok(r.indexer.order.length == 1, "indexer.order is correctly filled");
+        t.ok(count(r.indexer.indices) == 1, "indexer.indices is correctly filled");
+
+        r.eraseGeometry(geometry);
+
+        t.ok(r.root.childNodes.length == 0, "root is correctly cleared");
+        t.ok(r.indexer.maxZIndex == 0, "indexer.maxZIndex is correctly reset");
+        t.ok(r.indexer.order.length == 0, "indexer.order is correctly reset");
+        t.ok(count(r.indexer.indices) == 0, "indexer.indices is correctly reset");
+
+        delete(style.graphicZIndex);
+        r.drawGeometry(geometry, style, featureId);
+
+        t.ok(r.root.childNodes.length == 1, "root is correctly filled");
+        t.ok(r.indexer.maxZIndex == 0, "indexer.maxZIndex is correctly filled");
+        t.ok(r.indexer.order.length == 1, "indexer.order is correctly filled");
+        t.ok(count(r.indexer.indices) == 1, "indexer.indices is correctly filled");
+
+        r.clear();
+
+        t.ok(r.root.childNodes.length == 0, "root is correctly cleared");
+        t.ok(r.indexer.maxZIndex == 0, "indexer.maxZIndex is correctly reset");
+        t.ok(r.indexer.order.length == 0, "indexer.order is correctly reset");
+        t.ok(count(r.indexer.indices) == 0, "indexer.indices is correctly reset");
+
+        style.graphicZIndex = 12;
+        r.drawGeometry(geometry, style, featureId);
+
+        t.ok(r.root.childNodes.length == 1, "root is correctly filled");
+        t.ok(r.indexer.maxZIndex == 12, "indexer.maxZIndex is correctly filled");
+        t.ok(r.indexer.order.length == 1, "indexer.order is correctly filled");
+        t.ok(count(r.indexer.indices) == 1, "indexer.indices is correctly filled");
+
+        tearDown();
+    }
+
+
-  </script>
-</head>