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

propertyStyles of a Style's default symbolizer will not be parsed unless rules are specified. r=tschaub (closes #1432)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@6505 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2008-03-12 16:42:16 +00:00
parent 0768fa4d27
commit 7a25a14f93
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/OpenLayers/Style.js
View File

@@ -115,7 +115,8 @@ OpenLayers.Style = OpenLayers.Class({
* {Object} symbolizer hash * {Object} symbolizer hash
*/ */
createSymbolizer: function(feature) { createSymbolizer: function(feature) {
var style = OpenLayers.Util.extend({}, this.defaultStyle); var style = this.createLiterals(
OpenLayers.Util.extend({}, this.defaultStyle), feature);
var rules = this.rules; var rules = this.rules;
@@ -173,11 +174,9 @@ OpenLayers.Style = OpenLayers.Class({
var symbolizer = rule.symbolizer[symbolizerPrefix] || rule.symbolizer; var symbolizer = rule.symbolizer[symbolizerPrefix] || rule.symbolizer;
var context = this.context || feature.attributes || feature.data;
// merge the style with the current style // merge the style with the current style
return this.createLiterals( return this.createLiterals(
OpenLayers.Util.extend(style, symbolizer), context); OpenLayers.Util.extend(style, symbolizer), feature);
}, },
/** /**
@@ -188,14 +187,14 @@ OpenLayers.Style = OpenLayers.Class({
* Parameters: * Parameters:
* style - {Object} style to create literals for. Will be modified * style - {Object} style to create literals for. Will be modified
* inline. * inline.
* context - {Object} context to take property values from. Defaults to * feature - {Object}
* feature.attributes (or feature.data, if attributes are not
* available)
* *
* Returns: * Returns:
* {Object} the modified style * {Object} the modified style
*/ */
createLiterals: function(style, context) { createLiterals: function(style, feature) {
var context = this.context || feature.attributes || feature.data;
for (var i in this.propertyStyles) { for (var i in this.propertyStyles) {
style[i] = OpenLayers.Style.createLiteral(style[i], context); style[i] = OpenLayers.Style.createLiteral(style[i], context);
} }

9
tests/test_Style.html
View File

@@ -41,7 +41,6 @@
symbolizer: {"Point": {fillColor: "red"}}, symbolizer: {"Point": {fillColor: "red"}},
minScaleDenominator: 1000000, minScaleDenominator: 1000000,
maxScaleDenominator: 2500000}); maxScaleDenominator: 2500000});
style.addRules([rule1, rule2, rule3]);
var feature = new OpenLayers.Feature.Vector( var feature = new OpenLayers.Feature.Vector(
new OpenLayers.Geometry.Point(3,5), new OpenLayers.Geometry.Point(3,5),
@@ -58,9 +57,13 @@
map.setCenter(new OpenLayers.LonLat(3,5), 10); map.setCenter(new OpenLayers.LonLat(3,5), 10);
// at this scale, the feature should be green
var createdStyle = style.createSymbolizer(feature); var createdStyle = style.createSymbolizer(feature);
t.eq(createdStyle.externalGraphic, "barbar.png", "Calculated property style correctly."); t.eq(createdStyle.externalGraphic, "barbar.png", "Calculated property style for default symbolizer correctly.");
style.addRules([rule1, rule2, rule3]);
createdStyle = style.createSymbolizer(feature);
// at this scale, the feature should be green
t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale()); t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale());
t.eq(createdStyle.fillColor, "green", "Point symbolizer from rule applied correctly."); t.eq(createdStyle.fillColor, "green", "Point symbolizer from rule applied correctly.");