* added stroke, fill and graphic symbolizer properties (all boolean) to

control whether or not to render a stroke, fill and graphic.
 * added a defaultsPerSymbolizer property to OpenLayers.Style to allow 
for extending incomplete symbolizers with defaults for stroke, fill or 
graphic. This also makes Format.SLD read/write round trips possible 
without modifying empty or incomplete <Stroke/>, <Fill/> and <Graphic/> 
constructs. r=tschaub (closes #1876)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@9278 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2009-04-13 13:35:13 +00:00
parent 13e42ec59b
commit 2aa7f22926
7 changed files with 327 additions and 45 deletions

View File

@@ -151,6 +151,91 @@
style.createSymbolizer(new OpenLayers.Feature.Vector());
}
function test_Style_applySymbolizer(t) {
t.plan(15);
var feature = new OpenLayers.Feature.Vector();
var defaults = OpenLayers.Feature.Vector.style["default"];
var style, symbolizer;
style = new OpenLayers.Style();
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.pointRadius, defaults.pointRadius, "symbolizer has the correct pointRadius");
t.eq(symbolizer.strokeWidth, defaults.strokeWidth, "symbolizer has the correct strokeWidth");
t.eq(symbolizer.fillColor, defaults.fillColor, "symbolizer has the correct fillColor");
t.eq(symbolizer.graphicName, defaults.graphicName, "symbolizer has the correct graphicName");
style = new OpenLayers.Style(null, {
defaultsPerSymbolizer: true,
rules: [
new OpenLayers.Rule({
symbolizer: {
stroke: true
}
})
]
});
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.strokeWidth, defaults.strokeWidth, "symbolizer has the correct strokeWidth");
t.ok(symbolizer.fillColor == undefined, "fillColor is undefined");
style = new OpenLayers.Style(null, {
defaultsPerSymbolizer: true,
rules: [
new OpenLayers.Rule({
symbolizer: {
}
})
]
});
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.pointRadius, defaults.pointRadius, "symbolizer has the correct pointRadius");
t.ok(symbolizer.strokeWidth == undefined, "strokeWidth is undefined");
t.ok(symbolizer.fillColor == undefined, "fillColor is undefined");
t.ok(symbolizer.graphicName == undefined, "graphicName is undefined");
style = new OpenLayers.Style(null, {
defaultsPerSymbolizer: true,
rules: [
new OpenLayers.Rule({
symbolizer: {
stroke: true
}
})
]
});
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.strokeWidth, defaults.strokeWidth, "symbolizer has the correct strokeWidth");
t.ok(symbolizer.fillColor == undefined, "fillColor is undefined");
style = new OpenLayers.Style(null, {
defaultsPerSymbolizer: true,
rules: [
new OpenLayers.Rule({
symbolizer: {
fill: true
}
})
]
});
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.fillColor, defaults.fillColor, "symbolizer has the correct fillColor");
t.ok(symbolizer.strokeWidth == undefined, "strokeWidth is undefined");
style = new OpenLayers.Style(null, {
defaultsPerSymbolizer: true,
rules: [
new OpenLayers.Rule({
symbolizer: {
graphic: true
}
})
]
});
symbolizer = style.createSymbolizer(feature);
t.eq(symbolizer.graphicName, defaults.graphicName, "symbolizer has the correct graphicName");
}
function test_Style_context(t) {
t.plan(2);
var rule = new OpenLayers.Rule({