From e8d8dfccb7b332878536a19107f531020778f7de Mon Sep 17 00:00:00 2001 From: ahocevar Date: Sun, 17 Feb 2008 14:49:37 +0000 Subject: [PATCH] New minimumSymbolizer object on Renderer.Elements, which defines only those properties that are needed to ensure that nothing breaks. r=tschaub (closes #1345) git-svn-id: http://svn.openlayers.org/trunk/openlayers@6317 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Renderer/Elements.js | 12 ++++++++++++ lib/OpenLayers/Renderer/VML.js | 12 ++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js index 899e93ece2..b6d4c5c553 100644 --- a/lib/OpenLayers/Renderer/Elements.js +++ b/lib/OpenLayers/Renderer/Elements.js @@ -41,6 +41,17 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, { */ xmlns: null, + /** + * Property: minimumSymbolizer + * {Object} + */ + minimumSymbolizer: { + strokeLinecap: "round", + strokeOpacity: 1, + fillOpacity: 1, + pointRadius: 0 + }, + /** * Constructor: OpenLayers.Renderer.Elements * @@ -161,6 +172,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, { */ drawGeometryNode: function(node, geometry, style) { style = style || node._style; + OpenLayers.Util.applyDefaults(style, this.minimumSymbolizer); var options = { 'isFilled': true, diff --git a/lib/OpenLayers/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js index 4176fadd2c..748850fb9b 100644 --- a/lib/OpenLayers/Renderer/VML.js +++ b/lib/OpenLayers/Renderer/VML.js @@ -197,10 +197,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { if (!fill) { fill = this.createNode('v:fill', node.id + "_fill"); } - - if (style.fillOpacity) { - fill.setAttribute("opacity", style.fillOpacity); - } + fill.setAttribute("opacity", style.fillOpacity); if (node._geometryClass == "OpenLayers.Geometry.Point" && style.externalGraphic) { @@ -242,9 +239,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { stroke = this.createNode('v:stroke', node.id + "_stroke"); node.appendChild(stroke); } - if (style.strokeOpacity) { - stroke.setAttribute("opacity", style.strokeOpacity); - } + stroke.setAttribute("opacity", style.strokeOpacity); stroke.setAttribute("endcap", !style.strokeLinecap || style.strokeLinecap == 'butt' ? 'flat' : style.strokeLinecap); } @@ -410,9 +405,6 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, { * radius - {float} */ drawCircle: function(node, geometry, radius) { - if (typeof radius == "undefined") { - radius = 0; - } if(!isNaN(geometry.x)&& !isNaN(geometry.y)) { var resolution = this.getResolution();