diff --git a/lib/OpenLayers/Symbolizer/Line.js b/lib/OpenLayers/Symbolizer/Line.js index 5d2e0b70f6..e75e3dfce6 100644 --- a/lib/OpenLayers/Symbolizer/Line.js +++ b/lib/OpenLayers/Symbolizer/Line.js @@ -16,27 +16,31 @@ OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, { /** * APIProperty: strokeColor * {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 * {Number} Stroke opacity (0-1). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeOpacity: null, /** * APIProperty: strokeWidth * {Number} Pixel stroke width. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeWidth: null, /** * APIProperty: strokeLinecap * {String} Stroke cap type ("butt", "round", or "square"). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeLinecap: null, /** * Property: strokeDashstyle @@ -44,8 +48,9 @@ OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, { * OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot", * "longdash", "longdashdot", or "solid") will not work in SLD, but * most SLD patterns will render correctly in OpenLayers. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeDashstyle: null, /** * Constructor: OpenLayers.Symbolizer.Line diff --git a/lib/OpenLayers/Symbolizer/Point.js b/lib/OpenLayers/Symbolizer/Point.js index d9568cd28c..04f8044338 100644 --- a/lib/OpenLayers/Symbolizer/Point.js +++ b/lib/OpenLayers/Symbolizer/Point.js @@ -17,26 +17,30 @@ OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, { * APIProperty: strokeColor * {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000" * for red). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeColor: null, /** * APIProperty: strokeOpacity * {Number} Stroke opacity (0-1). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeOpacity: null, /** * APIProperty: strokeWidth * {Number} Pixel stroke width. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeWidth: null, /** * APIProperty: strokeLinecap * {String} Stroke cap type ("butt", "round", or "square"). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeLinecap: null, /** * Property: strokeDashstyle @@ -44,80 +48,92 @@ OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, { * OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot", * "longdash", "longdashdot", or "solid") will not work in SLD, but * most SLD patterns will render correctly in OpenLayers. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeDashstyle: null, /** * APIProperty: fillColor * {String} RGB hex fill color (e.g. "#ff0000" for red). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fillColor: null, /** * APIProperty: fillOpacity * {Number} Fill opacity (0-1). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fillOpacity: null, /** * APIProperty: pointRadius * {Number} Pixel point radius. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - pointRadius: null, /** * APIProperty: externalGraphic * {String} Url to an external graphic that will be used for rendering * points. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - externalGraphic: null, /** * APIProperty: graphicWidth * {Number} Pixel width for sizing an external graphic. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicWidth: null, /** * APIProperty: graphicHeight * {Number} Pixel height for sizing an external graphic. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicHeight: null, /** * APIProperty: graphicOpacity * {Number} Opacity (0-1) for an external graphic. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicOpacity: null, /** * APIProperty: graphicXOffset * {Number} Pixel offset along the positive x axis for displacing an * external graphic. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicXOffset: null, /** * APIProperty: graphicYOffset * {Number} Pixel offset along the positive y axis for displacing an * external graphic. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicYOffset: null, /** * APIProperty: rotation * {Number} The rotation of a graphic in the clockwise direction about its * center point (or any point off center as specified by * and ). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - rotation: null, /** * APIProperty: graphicName * {String} Named graphic to use when rendering points. Supported values * include "circle", "square", "star", "x", "cross", and "triangle". + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - graphicName: null, /** * Constructor: OpenLayers.Symbolizer.Point diff --git a/lib/OpenLayers/Symbolizer/Polygon.js b/lib/OpenLayers/Symbolizer/Polygon.js index 10d9a20f0b..68025b4cc4 100644 --- a/lib/OpenLayers/Symbolizer/Polygon.js +++ b/lib/OpenLayers/Symbolizer/Polygon.js @@ -17,26 +17,30 @@ OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, { * APIProperty: strokeColor * {String} Color for line stroke. This is a RGB hex value (e.g. "#ff0000" * for red). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeColor: null, /** * APIProperty: strokeOpacity * {Number} Stroke opacity (0-1). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeOpacity: null, /** * APIProperty: strokeWidth * {Number} Pixel stroke width. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeWidth: null, /** * APIProperty: strokeLinecap * {String} Stroke cap type ("butt", "round", or "square"). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeLinecap: null, /** * Property: strokeDashstyle @@ -44,20 +48,23 @@ OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, { * OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot", * "longdash", "longdashdot", or "solid") will not work in SLD, but * most SLD patterns will render correctly in OpenLayers. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - strokeDashstyle: null, /** * APIProperty: fillColor * {String} RGB hex fill color (e.g. "#ff0000" for red). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fillColor: null, /** * APIProperty: fillOpacity * {Number} Fill opacity (0-1). + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fillOpacity: null, /** * Constructor: OpenLayers.Symbolizer.Polygon diff --git a/lib/OpenLayers/Symbolizer/Text.js b/lib/OpenLayers/Symbolizer/Text.js index 1b44178272..602a1e83ff 100644 --- a/lib/OpenLayers/Symbolizer/Text.js +++ b/lib/OpenLayers/Symbolizer/Text.js @@ -16,32 +16,37 @@ OpenLayers.Symbolizer.Text = OpenLayers.Class(OpenLayers.Symbolizer, { /** * APIProperty: label * {String} The text for the label. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - label: null, /** * APIProperty: fontFamily * {String} The font family for the label. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fontFamily: null, /** * APIProperty: fontSize * {String} The font size for the label. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fontSize: null, /** * APIProperty: fontWeight * {String} The font weight for the label. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fontWeight: null, /** * Property: fontStyle * {String} The font style for the label. + * + * No default set here. Use OpenLayers.Renderer.defaultRenderer for defaults. */ - fontStyle: null, /** * Constructor: OpenLayers.Symbolizer.Text diff --git a/tests/Symbolizer/Line.html b/tests/Symbolizer/Line.html index ed321f1806..7f57e2a92e 100644 --- a/tests/Symbolizer/Line.html +++ b/tests/Symbolizer/Line.html @@ -24,6 +24,16 @@ t.eq(clone.foo, "bar", "clone copies properties"); } + + 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"); + } diff --git a/tests/Symbolizer/Point.html b/tests/Symbolizer/Point.html index e308191f49..d4715adae1 100644 --- a/tests/Symbolizer/Point.html +++ b/tests/Symbolizer/Point.html @@ -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"); + } diff --git a/tests/Symbolizer/Polygon.html b/tests/Symbolizer/Polygon.html index 84dc03aa47..4f64599f1a 100644 --- a/tests/Symbolizer/Polygon.html +++ b/tests/Symbolizer/Polygon.html @@ -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"); + } + diff --git a/tests/Symbolizer/Text.html b/tests/Symbolizer/Text.html index 482afb5bbf..51c0d461c5 100644 --- a/tests/Symbolizer/Text.html +++ b/tests/Symbolizer/Text.html @@ -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"); + } +