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

Only call dashStyle when strokeDashstyle is set. r=tschaub (closes #2768)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10621 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2010-08-15 19:53:14 +00:00
parent 5a8775cd16
commit 9ae54040db
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Renderer.js
View File

@@ -345,7 +345,6 @@ OpenLayers.Renderer = OpenLayers.Class({
* strokeColor: "#000000", * strokeColor: "#000000",
* strokeOpacity: 1, * strokeOpacity: 1,
* strokeWidth: 1, * strokeWidth: 1,
* strokeDashstyle: "solid",
* pointRadius: 3, * pointRadius: 3,
* graphicName: "square" * graphicName: "square"
* }; * };
@@ -357,7 +356,6 @@ OpenLayers.Renderer.defaultSymbolizer = {
strokeWidth: 2, strokeWidth: 2,
fillOpacity: 1, fillOpacity: 1,
strokeOpacity: 1, strokeOpacity: 1,
strokeDashstyle: "solid",
pointRadius: 0 pointRadius: 0
}; };

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

@@ -371,8 +371,8 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
// Hard-coded linejoin for now, to make it look the same as in VML. // Hard-coded linejoin for now, to make it look the same as in VML.
// There is no strokeLinejoin property yet for symbolizers. // There is no strokeLinejoin property yet for symbolizers.
node.setAttributeNS(null, "stroke-linejoin", "round"); node.setAttributeNS(null, "stroke-linejoin", "round");
node.setAttributeNS(null, "stroke-dasharray", this.dashStyle(style, style.strokeDashstyle && node.setAttributeNS(null,
widthFactor)); "stroke-dasharray", this.dashStyle(style, widthFactor));
} else { } else {
node.setAttributeNS(null, "stroke", "none"); node.setAttributeNS(null, "stroke", "none");
} }

4
lib/OpenLayers/Renderer/VML.js
View File

@@ -329,7 +329,9 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
stroke.opacity = style.strokeOpacity; stroke.opacity = style.strokeOpacity;
stroke.endcap = style.strokeLinecap == 'butt' ? 'flat' : stroke.endcap = style.strokeLinecap == 'butt' ? 'flat' :
(style.strokeLinecap || 'round'); (style.strokeLinecap || 'round');
stroke.dashstyle = this.dashStyle(style); if (style.strokeDashstyle) {
stroke.dashstyle = this.dashStyle(style);
}
} }
if (style.cursor != "inherit" && style.cursor != null) { if (style.cursor != "inherit" && style.cursor != null) {

2
lib/OpenLayers/Symbolizer/Line.js
View File

@@ -40,7 +40,7 @@ OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, {
* "longdash", "longdashdot", or "solid") will not work in SLD, but * "longdash", "longdashdot", or "solid") will not work in SLD, but
* most SLD patterns will render correctly in OpenLayers. * most SLD patterns will render correctly in OpenLayers.
*/ */
strokeDashstyle: "solid", strokeDashstyle: null,
/** /**
* Constructor: OpenLayers.Symbolizer.Line * Constructor: OpenLayers.Symbolizer.Line

2
lib/OpenLayers/Symbolizer/Point.js
View File

@@ -40,7 +40,7 @@ OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, {
* "longdash", "longdashdot", or "solid") will not work in SLD, but * "longdash", "longdashdot", or "solid") will not work in SLD, but
* most SLD patterns will render correctly in OpenLayers. * most SLD patterns will render correctly in OpenLayers.
*/ */
strokeDashstyle: "solid", strokeDashstyle: null,
/** /**
* APIProperty: fillColor * APIProperty: fillColor

2
lib/OpenLayers/Symbolizer/Polygon.js
View File

@@ -40,7 +40,7 @@ OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, {
* "longdash", "longdashdot", or "solid") will not work in SLD, but * "longdash", "longdashdot", or "solid") will not work in SLD, but
* most SLD patterns will render correctly in OpenLayers. * most SLD patterns will render correctly in OpenLayers.
*/ */
strokeDashstyle: "solid", strokeDashstyle: null,
/** /**
* APIProperty: fillColor * APIProperty: fillColor