diff --git a/examples/vector-features-with-text.html b/examples/vector-features-with-text.html index cbdba665ab..e2eb1df5e8 100644 --- a/examples/vector-features-with-text.html +++ b/examples/vector-features-with-text.html @@ -39,7 +39,10 @@ fontWeight: "bold", labelAlign: "${align}", labelXOffset: "${xOffset}", - labelYOffset: "${yOffset}" + labelYOffset: "${yOffset}", + labelAlign: "cm", + labelOutlineColor: "white", + labelOutlineWidth: 3 }}), renderers: renderer }); diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js index 40afe9ccc7..d18cba3aeb 100644 --- a/lib/OpenLayers/Feature/Vector.js +++ b/lib/OpenLayers/Feature/Vector.js @@ -447,7 +447,11 @@ OpenLayers.Feature.Vector.style = { hoverPointRadius: 1, hoverPointUnit: "%", pointerEvents: "visiblePainted", - cursor: "inherit" + cursor: "inherit", + fontColor: "#000000", + labelAlign: "cm", + labelOutlineColor: "white", + labelOutlineWidth: 3 }, 'select': { fillColor: "blue", @@ -466,7 +470,12 @@ OpenLayers.Feature.Vector.style = { hoverPointRadius: 1, hoverPointUnit: "%", pointerEvents: "visiblePainted", - cursor: "pointer" + cursor: "pointer", + fontColor: "#000000", + labelAlign: "cm", + labelOutlineColor: "white", + labelOutlineWidth: 3 + }, 'temporary': { fillColor: "#66cccc", @@ -485,7 +494,12 @@ OpenLayers.Feature.Vector.style = { hoverPointRadius: 1, hoverPointUnit: "%", pointerEvents: "visiblePainted", - cursor: "inherit" + cursor: "inherit", + fontColor: "#000000", + labelAlign: "cm", + labelOutlineColor: "white", + labelOutlineWidth: 3 + }, 'delete': { display: "none" diff --git a/lib/OpenLayers/Renderer/Canvas.js b/lib/OpenLayers/Renderer/Canvas.js index 2fd620c11e..1448bfb585 100644 --- a/lib/OpenLayers/Renderer/Canvas.js +++ b/lib/OpenLayers/Renderer/Canvas.js @@ -525,12 +525,6 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, { * style - {Object} */ drawText: function(location, style) { - style = OpenLayers.Util.extend({ - fontColor: "#000000", - labelAlign: "cm", - labelOutlineColor: "white", - labelOutlineWidth: 3 - }, style); var pt = this.getLocalXY(location); this.setCanvasStyle("reset"); diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 5d445093bf..d74233d0c7 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.js @@ -677,7 +677,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { } else { label.setAttributeNS(null, "pointer-events", "none"); } - var align = style.labelAlign || "cm"; + var align = style.labelAlign; label.setAttributeNS(null, "text-anchor", OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]] || "middle"); diff --git a/lib/OpenLayers/Renderer/SVG2.js b/lib/OpenLayers/Renderer/SVG2.js index 4743ea2690..8e398636c4 100644 --- a/lib/OpenLayers/Renderer/SVG2.js +++ b/lib/OpenLayers/Renderer/SVG2.js @@ -584,7 +584,7 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, { } else { text.setAttributeNS(null, "pointer-events", "none"); } - var align = style.labelAlign || "cm"; + var align = style.labelAlign; text.setAttributeNS(null, "text-anchor", OpenLayers.Renderer.SVG2.LABEL_ALIGN[align[0]] || "middle");