don’t duplicate defaults in renderers

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
             });

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"

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");

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");
 

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");