[OpenLayers-Commits] r5158 - trunk/openlayers/lib/OpenLayers/Renderer

[commits at openlayers.org]

Author: tschaub
Date: 2007-11-09 12:14:10 -0500 (Fri, 09 Nov 2007)
New Revision: 5158

Modified:
   trunk/openlayers/lib/OpenLayers/Renderer/Elements.js
   trunk/openlayers/lib/OpenLayers/Renderer/SVG.js
   trunk/openlayers/lib/OpenLayers/Renderer/VML.js
Log:
stop the renderers from flashing black and filling white - ahhh, much prettier vector drawing now - thanks to pgiraud and crschmidt (closes #1042).

Modified: trunk/openlayers/lib/OpenLayers/Renderer/Elements.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Renderer/Elements.js	2007-11-09 16:23:54 UTC (rev 5157)
+++ trunk/openlayers/lib/OpenLayers/Renderer/Elements.js	2007-11-09 17:14:10 UTC (rev 5158)
@@ -127,10 +127,10 @@
         node._featureId = featureId;
         node._geometryClass = geometry.CLASS_NAME;
         node._style = style;
-        this.root.appendChild(node);
         
         //now actually draw the node, and style it
-        this.drawGeometryNode(node, geometry);
+        node = this.drawGeometryNode(node, geometry);
+        this.root.appendChild(node);
     },
 
     /**
@@ -180,7 +180,7 @@
 
         //set style
         //TBD simplify this
-        this.setStyle(node, style, options, geometry);
+        return this.setStyle(node, style, options, geometry);
     },
     
     /**

Modified: trunk/openlayers/lib/OpenLayers/Renderer/SVG.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Renderer/SVG.js	2007-11-09 16:23:54 UTC (rev 5157)
+++ trunk/openlayers/lib/OpenLayers/Renderer/SVG.js	2007-11-09 17:14:10 UTC (rev 5158)
@@ -179,7 +179,6 @@
     setStyle: function(node, style, options) {
         style = style  || node._style;
         options = options || node._options;
-
         if (node._geometryClass == "OpenLayers.Geometry.Point") {
             if (style.externalGraphic) {
                 // remove old node
@@ -189,14 +188,12 @@
                 var _featureId = node._featureId;
                 var _geometryClass = node._geometryClass;
                 var _style = node._style;
-                this.root.removeChild(node);
                 
                 // create new image node
-                var node = this.createNode("image", id);
+                node = this.createNode("image", id);
                 node._featureId = _featureId;
                 node._geometryClass = _geometryClass;
                 node._style = _style;
-                this.root.appendChild(node);
 
                 // now style the new node
                 if (style.graphicWidth && style.graphicHeight) {
@@ -247,6 +244,7 @@
         if (style.cursor) {
             node.setAttributeNS(null, "cursor", style.cursor);
         }
+        return node;
     },
 
     /** 

Modified: trunk/openlayers/lib/OpenLayers/Renderer/VML.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Renderer/VML.js	2007-11-09 16:23:54 UTC (rev 5157)
+++ trunk/openlayers/lib/OpenLayers/Renderer/VML.js	2007-11-09 17:14:10 UTC (rev 5158)
@@ -157,16 +157,14 @@
                 var _featureId = node._featureId;
                 var _geometryClass = node._geometryClass;
                 var _style = node._style;
-                this.root.removeChild(node);
                 
                 // create new image node
-                var node = this.createNode("v:rect", id);
+                node = this.createNode("v:rect", id);
                 var fill = this.createNode("v:fill", id+"_image");
                 node.appendChild(fill);
                 node._featureId = _featureId;
                 node._geometryClass = _geometryClass;
                 node._style = _style;
-                this.root.appendChild(node);
                 
                 fill.src = style.externalGraphic;
                 fill.type = "frame";
@@ -202,9 +200,12 @@
             }
         }
 
-      //fill
-        var fillColor = (options.isFilled) ? style.fillColor : "none";
-        node.setAttribute("fillcolor", fillColor);
+        // fill 
+        if (options.isFilled) { 
+            node.setAttribute("fillcolor", style.fillColor); 
+        } else { 
+            node.setAttribute("filled", "false"); 
+        }
         var fills = node.getElementsByTagName("fill");
         var fill = (fills.length == 0) ? null : fills[0];
         if (!options.isFilled) {
@@ -227,10 +228,13 @@
         }
 
 
-      //stroke
-        var strokeColor = (options.isStroked) ? style.strokeColor : "none";
-        node.setAttribute("strokecolor", strokeColor);
-        node.setAttribute("strokeweight", style.strokeWidth);
+        // stroke 
+        if (options.isStroked) { 
+            node.setAttribute("strokecolor", style.strokeColor); 
+            node.setAttribute("strokeweight", style.strokeWidth); 
+        } else { 
+            node.setAttribute("stroked", "false"); 
+        }
         var strokes = node.getElementsByTagName("stroke");
         var stroke = (strokes.length == 0) ? null : strokes[0];
         if (!options.isStroked) {
@@ -249,6 +253,7 @@
         if (style.cursor) {
             node.style.cursor = style.cursor;
         }
+        return node;
     },