Changeset 7919

Timestamp:

09/01/08 17:46:26 (3 months ago)

Author:

ahocevar

Message:

Let's take care that background graphic nodes of features with backgroundGraphic style get removed properly when the style is changed to display: "none".

This solves the backgroundGraphic issue of #1709, the remaining issue with externalGraphic will be fixed by #1675.

Thanks jstern81 for the patch, and I am truly impressed by jstern81 finding the right spot in the codebase that needs to be fixed -- as an OpenLayers newcomer.

Tests added by myself. r=me. (references #1709)

Files:

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

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

@@ -464 +464 @@
-        };
-
-        //
-        if (style.backgroundGraphic) {
-            this.redrawBackgroundNode(geometry.id, geometry, style, featureId);
-        }
-        
-        if (style.display != "none") {
-
+
+
+
+
-        } else {
-            var node = OpenLayers.Util.getElement(geometry.id);
-            if (node) {
+                if (node._style.backgroundGraphic) {
+                    node.parentNode.removeChild(document.getElementById(
+                        geometry.id + this.BACKGROUND_ID_SUFFIX));
+                }
-                node.parentNode.removeChild(node);
-            }

trunk/openlayers/tests/Renderer/Elements.html

@@ -128 +128 @@
-    
-    function test_Elements_drawGeometry(t) {
-5
+7
-
-        setUp();
@@ -135 +135 @@
-        
-        var element = document.createElement("div");
+        document.body.appendChild(element);
-        r.root = element;
-
@@ -146 +147 @@
-            return node;
-        };
+        r.redrawBackgroundNode = function(id, geometry, style, featureId) {
+            var el = r.nodeFactory();
+            el.id = "foo_background";
+            r.root.appendChild(el);
+        };
+
-        r.getNodeType = function(geometry, style) {
-            return "div";
@@ -153 +160 @@
-            CLASS_NAME: 'bar'
-        };
-true
+{'backgroundGraphic': 'foo'}
-        var featureId = 'dude';
-        r.drawGeometry(geometry, style, featureId);
-        t.ok(g_Node.parentNode == r.root, "node is correctly appended to root");
+        t.eq(r.root.childNodes.length, 2, "redrawBackgroundNode appended background node");
-        t.eq(g_Node._featureId, 'dude', "_featureId is correct");
-ok(g_Node._style
+eq(g_Node._style.backgroundGraphic, "foo"
-        t.eq(g_Node._geometryClass, 'bar', "_geometryClass is correct");
-
@@ -165 +173 @@
-            return g_Node;
-        }
-
-var 
+
+
-        r.drawGeometry(geometry, style, featureId);
-        t.ok(g_Node.parentNode != r.root, "node is correctly removed");
+        t.ok(!document.getElementById("foo_background"), "background node correctly removed")
-            
-        tearDown();