ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don’t duplicate defaults in renderers

Browse Source
This commit is contained in:
Antoine Abt
2012-01-05 10:26:05 +01:00
parent 0ff9d54d5c
commit 5be7e7f844
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/vector-features-with-text.html
View File

@@ -39,7 +39,10 @@
fontWeight: "bold",
labelAlign: "${align}",
labelXOffset: "${xOffset}",
labelYOffset: "${yOffset}"
labelYOffset: "${yOffset}",
labelAlign: "cm",
labelOutlineColor: "white",
labelOutlineWidth: 3
}}),
renderers: renderer
});

20
lib/OpenLayers/Feature/Vector.js
View File

@@ -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"

6
lib/OpenLayers/Renderer/Canvas.js
View File

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

2
lib/OpenLayers/Renderer/SVG.js
View File

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

2
lib/OpenLayers/Renderer/SVG2.js
View File

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