From 10eaa329ba7a43dbadd0af8ac1b602088f8bddc6 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 9 Nov 2007 17:14:10 +0000 Subject: [PATCH] stop the renderers from flashing black and filling white - ahhh, much prettier vector drawing now - thanks to pgiraud and crschmidt (closes #1042). git-svn-id: http://svn.openlayers.org/trunk/openlayers@5158 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Renderer/Elements.js | 6 +++--- lib/OpenLayers/Renderer/SVG.js | 6 ++---- lib/OpenLayers/Renderer/VML.js | 25 +++++++++++++++---------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js index 16ad1b51ab..1ef2ad6b1e 100644 --- a/lib/OpenLayers/Renderer/Elements.js +++ b/lib/OpenLayers/Renderer/Elements.js @@ -127,10 +127,10 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, { 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 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, { //set style //TBD simplify this - this.setStyle(node, style, options, geometry); + return this.setStyle(node, style, options, geometry); }, /** diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 4229bd3801..464ccd337a 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.js @@ -179,7 +179,6 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { 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 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { 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 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { if (style.cursor) { node.setAttributeNS(null, "cursor", style.cursor); } + return node; }, /** diff --git a/lib/OpenLayers/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js index f2ccfaa3c0..996da3b0fa 100644 --- a/lib/OpenLayers/Renderer/VML.js +++ b/lib/OpenLayers/Renderer/VML.js @@ -157,16 +157,14 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { 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 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { } } - //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 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { } - //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 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { if (style.cursor) { node.style.cursor = style.cursor; } + return node; },