Merge pull request openlayers#201 from tonio/labeldefault

re-add default labelAlign
kochizufan · Feb 6, 2012 · 4b971a1 · 4b971a1
2 parents e3ab08b + 0d27dc8
commit 4b971a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js
@@ -411,6 +411,7 @@ OpenLayers.Renderer.defaultSymbolizer = {
     strokeWidth: 2,
     fillOpacity: 1,
     strokeOpacity: 1,
-    pointRadius: 0
+    pointRadius: 0,
+    labelAlign: 'cm'
 };
 
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
@@ -696,7 +696,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         } else {
             label.setAttributeNS(null, "pointer-events", "none");
         }
-        var align = style.labelAlign;
+        var align = style.labelAlign || OpenLayers.Renderer.defaultSymbolizer.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
@@ -584,7 +584,7 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
         } else {
             text.setAttributeNS(null, "pointer-events", "none");
         }
-        var align = style.labelAlign;
+        var align = style.labelAlign || OpenLayers.Renderer.defaultSymbolizer.labelAlign;
         text.setAttributeNS(null, "text-anchor",
             OpenLayers.Renderer.SVG2.LABEL_ALIGN[align[0]] || "middle");