From 0d27dc82aeb46f6583bf9931bc54715ab9723051 Mon Sep 17 00:00:00 2001 From: Antoine Abt Date: Mon, 6 Feb 2012 21:41:08 +0100 Subject: [PATCH] re-add default labelAlign, but avoid duplicate declaration accross renderers --- lib/OpenLayers/Renderer.js | 3 ++- lib/OpenLayers/Renderer/SVG.js | 2 +- lib/OpenLayers/Renderer/SVG2.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js index a843edd178..45de3a6f3f 100644 --- 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 index 42a72e855b..dfd345553d 100644 --- 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 index a385689481..3f64c50ca8 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; + var align = style.labelAlign || OpenLayers.Renderer.defaultSymbolizer.labelAlign; text.setAttributeNS(null, "text-anchor", OpenLayers.Renderer.SVG2.LABEL_ALIGN[align[0]] || "middle");