Removing null default values from symbolizers. Later, we could consider static setDefaults methods on the constructors. r=ahocevar (closes #2840)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10770 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -17,26 +17,30 @@ OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* APIProperty: strokeColor
|
* APIProperty: strokeColor
|
||||||
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
||||||
* for red).
|
* for red).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeColor: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeOpacity
|
* APIProperty: strokeOpacity
|
||||||
* {Number} Stroke opacity (0-1).
|
* {Number} Stroke opacity (0-1).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeWidth
|
* APIProperty: strokeWidth
|
||||||
* {Number} Pixel stroke width.
|
* {Number} Pixel stroke width.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeWidth: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeLinecap
|
* APIProperty: strokeLinecap
|
||||||
* {String} Stroke cap type ("butt", "round", or "square").
|
* {String} Stroke cap type ("butt", "round", or "square").
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeLinecap: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: strokeDashstyle
|
* Property: strokeDashstyle
|
||||||
@@ -44,8 +48,9 @@ OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
||||||
* "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.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeDashstyle: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Symbolizer.Line
|
* Constructor: OpenLayers.Symbolizer.Line
|
||||||
|
|||||||
@@ -17,26 +17,30 @@ OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* APIProperty: strokeColor
|
* APIProperty: strokeColor
|
||||||
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
||||||
* for red).
|
* for red).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeColor: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeOpacity
|
* APIProperty: strokeOpacity
|
||||||
* {Number} Stroke opacity (0-1).
|
* {Number} Stroke opacity (0-1).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeWidth
|
* APIProperty: strokeWidth
|
||||||
* {Number} Pixel stroke width.
|
* {Number} Pixel stroke width.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeWidth: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeLinecap
|
* APIProperty: strokeLinecap
|
||||||
* {String} Stroke cap type ("butt", "round", or "square").
|
* {String} Stroke cap type ("butt", "round", or "square").
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeLinecap: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: strokeDashstyle
|
* Property: strokeDashstyle
|
||||||
@@ -44,80 +48,92 @@ OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
||||||
* "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.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeDashstyle: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fillColor
|
* APIProperty: fillColor
|
||||||
* {String} RGB hex fill color (e.g. "#ff0000" for red).
|
* {String} RGB hex fill color (e.g. "#ff0000" for red).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fillColor: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fillOpacity
|
* APIProperty: fillOpacity
|
||||||
* {Number} Fill opacity (0-1).
|
* {Number} Fill opacity (0-1).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fillOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: pointRadius
|
* APIProperty: pointRadius
|
||||||
* {Number} Pixel point radius.
|
* {Number} Pixel point radius.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
pointRadius: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: externalGraphic
|
* APIProperty: externalGraphic
|
||||||
* {String} Url to an external graphic that will be used for rendering
|
* {String} Url to an external graphic that will be used for rendering
|
||||||
* points.
|
* points.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
externalGraphic: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicWidth
|
* APIProperty: graphicWidth
|
||||||
* {Number} Pixel width for sizing an external graphic.
|
* {Number} Pixel width for sizing an external graphic.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicWidth: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicHeight
|
* APIProperty: graphicHeight
|
||||||
* {Number} Pixel height for sizing an external graphic.
|
* {Number} Pixel height for sizing an external graphic.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicHeight: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicOpacity
|
* APIProperty: graphicOpacity
|
||||||
* {Number} Opacity (0-1) for an external graphic.
|
* {Number} Opacity (0-1) for an external graphic.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicXOffset
|
* APIProperty: graphicXOffset
|
||||||
* {Number} Pixel offset along the positive x axis for displacing an
|
* {Number} Pixel offset along the positive x axis for displacing an
|
||||||
* external graphic.
|
* external graphic.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicXOffset: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicYOffset
|
* APIProperty: graphicYOffset
|
||||||
* {Number} Pixel offset along the positive y axis for displacing an
|
* {Number} Pixel offset along the positive y axis for displacing an
|
||||||
* external graphic.
|
* external graphic.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicYOffset: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: rotation
|
* APIProperty: rotation
|
||||||
* {Number} The rotation of a graphic in the clockwise direction about its
|
* {Number} The rotation of a graphic in the clockwise direction about its
|
||||||
* center point (or any point off center as specified by
|
* center point (or any point off center as specified by
|
||||||
* <graphicXOffset> and <graphicYOffset>).
|
* <graphicXOffset> and <graphicYOffset>).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
rotation: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: graphicName
|
* APIProperty: graphicName
|
||||||
* {String} Named graphic to use when rendering points. Supported values
|
* {String} Named graphic to use when rendering points. Supported values
|
||||||
* include "circle", "square", "star", "x", "cross", and "triangle".
|
* include "circle", "square", "star", "x", "cross", and "triangle".
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
graphicName: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Symbolizer.Point
|
* Constructor: OpenLayers.Symbolizer.Point
|
||||||
|
|||||||
@@ -17,26 +17,30 @@ OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* APIProperty: strokeColor
|
* APIProperty: strokeColor
|
||||||
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
* {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000"
|
||||||
* for red).
|
* for red).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeColor: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeOpacity
|
* APIProperty: strokeOpacity
|
||||||
* {Number} Stroke opacity (0-1).
|
* {Number} Stroke opacity (0-1).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeWidth
|
* APIProperty: strokeWidth
|
||||||
* {Number} Pixel stroke width.
|
* {Number} Pixel stroke width.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeWidth: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: strokeLinecap
|
* APIProperty: strokeLinecap
|
||||||
* {String} Stroke cap type ("butt", "round", or "square").
|
* {String} Stroke cap type ("butt", "round", or "square").
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeLinecap: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: strokeDashstyle
|
* Property: strokeDashstyle
|
||||||
@@ -44,20 +48,23 @@ OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
* OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
|
||||||
* "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.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
strokeDashstyle: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fillColor
|
* APIProperty: fillColor
|
||||||
* {String} RGB hex fill color (e.g. "#ff0000" for red).
|
* {String} RGB hex fill color (e.g. "#ff0000" for red).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fillColor: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fillOpacity
|
* APIProperty: fillOpacity
|
||||||
* {Number} Fill opacity (0-1).
|
* {Number} Fill opacity (0-1).
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fillOpacity: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Symbolizer.Polygon
|
* Constructor: OpenLayers.Symbolizer.Polygon
|
||||||
|
|||||||
@@ -16,32 +16,37 @@ OpenLayers.Symbolizer.Text = OpenLayers.Class(OpenLayers.Symbolizer, {
|
|||||||
/**
|
/**
|
||||||
* APIProperty: label
|
* APIProperty: label
|
||||||
* {String} The text for the label.
|
* {String} The text for the label.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
label: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fontFamily
|
* APIProperty: fontFamily
|
||||||
* {String} The font family for the label.
|
* {String} The font family for the label.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fontFamily: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fontSize
|
* APIProperty: fontSize
|
||||||
* {String} The font size for the label.
|
* {String} The font size for the label.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fontSize: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: fontWeight
|
* APIProperty: fontWeight
|
||||||
* {String} The font weight for the label.
|
* {String} The font weight for the label.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fontWeight: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: fontStyle
|
* Property: fontStyle
|
||||||
* {String} The font style for the label.
|
* {String} The font style for the label.
|
||||||
|
*
|
||||||
|
* No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults.
|
||||||
*/
|
*/
|
||||||
fontStyle: null,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Symbolizer.Text
|
* Constructor: OpenLayers.Symbolizer.Text
|
||||||
|
|||||||
@@ -25,6 +25,16 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_defaults(t) {
|
||||||
|
t.plan(5);
|
||||||
|
var symbolizer = new OpenLayers.Symbolizer.Line();
|
||||||
|
t.ok(symbolizer.strokeColor === undefined, "no default strokeColor");
|
||||||
|
t.ok(symbolizer.strokeOpacity === undefined, "no default strokeOpacity");
|
||||||
|
t.ok(symbolizer.strokeWidth === undefined, "no default strokeWidth");
|
||||||
|
t.ok(symbolizer.strokeLinecap === undefined, "no default strokeLinecap");
|
||||||
|
t.ok(symbolizer.strokeDashstyle === undefined, "no default strokeDashstyle");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -25,6 +25,26 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_defaults(t) {
|
||||||
|
t.plan(16);
|
||||||
|
var symbolizer = new OpenLayers.Symbolizer.Point();
|
||||||
|
t.ok(symbolizer.strokeColor === undefined, "no default strokeColor");
|
||||||
|
t.ok(symbolizer.strokeOpacity === undefined, "no default strokeOpacity");
|
||||||
|
t.ok(symbolizer.strokeWidth === undefined, "no default strokeWidth");
|
||||||
|
t.ok(symbolizer.strokeLinecap === undefined, "no default strokeLinecap");
|
||||||
|
t.ok(symbolizer.strokeDashstyle === undefined, "no default strokeDashstyle");
|
||||||
|
t.ok(symbolizer.fillColor === undefined, "no default fillColor");
|
||||||
|
t.ok(symbolizer.fillOpacity === undefined, "no default fillOpacity");
|
||||||
|
t.ok(symbolizer.pointRadius === undefined, "no default pointRadius");
|
||||||
|
t.ok(symbolizer.externalGraphic === undefined, "no default externalGraphic");
|
||||||
|
t.ok(symbolizer.graphicWidth === undefined, "no default graphicWidth");
|
||||||
|
t.ok(symbolizer.graphicHeight === undefined, "no default graphicHeight");
|
||||||
|
t.ok(symbolizer.graphicOpacity === undefined, "no default graphicOpacity");
|
||||||
|
t.ok(symbolizer.graphicXOffset === undefined, "no default graphicXOffset");
|
||||||
|
t.ok(symbolizer.graphicYOffset === undefined, "no default graphicYOffset");
|
||||||
|
t.ok(symbolizer.rotation === undefined, "no default rotation");
|
||||||
|
t.ok(symbolizer.graphicName === undefined, "no default graphicName");
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -25,6 +25,18 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_defaults(t) {
|
||||||
|
t.plan(7);
|
||||||
|
var symbolizer = new OpenLayers.Symbolizer.Polygon();
|
||||||
|
t.ok(symbolizer.strokeColor === undefined, "no default strokeColor");
|
||||||
|
t.ok(symbolizer.strokeOpacity === undefined, "no default strokeOpacity");
|
||||||
|
t.ok(symbolizer.strokeWidth === undefined, "no default strokeWidth");
|
||||||
|
t.ok(symbolizer.strokeLinecap === undefined, "no default strokeLinecap");
|
||||||
|
t.ok(symbolizer.strokeDashstyle === undefined, "no default strokeDashstyle");
|
||||||
|
t.ok(symbolizer.fillColor === undefined, "no default fillColor");
|
||||||
|
t.ok(symbolizer.fillOpacity === undefined, "no default fillOpacity");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -25,6 +25,16 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_defaults(t) {
|
||||||
|
t.plan(5);
|
||||||
|
var symbolizer = new OpenLayers.Symbolizer.Point();
|
||||||
|
t.ok(symbolizer.label === undefined, "no default label");
|
||||||
|
t.ok(symbolizer.fontFamily === undefined, "no default fontFamily");
|
||||||
|
t.ok(symbolizer.fontSize === undefined, "no default fontSize");
|
||||||
|
t.ok(symbolizer.fontWeight === undefined, "no default fontWeight");
|
||||||
|
t.ok(symbolizer.fontStyle === undefined, "no default fontStyle");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
Reference in New Issue
Block a user