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

no longer overwrite "display" symbolizer properties set by the user in

Browse Source 
Style objects. r=elemoine (closes #1898)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@8620 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2009-01-09 16:22:56 +00:00
parent e1d294193a
commit 8b08f79898
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Style.js
View File

@@ -161,8 +161,6 @@ OpenLayers.Style = OpenLayers.Class({
// don't display if there were rules but none applied // don't display if there were rules but none applied
if(rules.length > 0 && appliedRules == false) { if(rules.length > 0 && appliedRules == false) {
style.display = "none"; style.display = "none";
} else {
style.display = "";
} }
return style; return style;

6
tests/Style.html
View File

@@ -75,19 +75,19 @@
createdStyle = style.createSymbolizer(feature); createdStyle = style.createSymbolizer(feature);
// at this scale, the feature should be green // at this scale, the feature should be green
t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale()); t.eq(createdStyle.display, undefined, "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.");
map.setCenter(new OpenLayers.LonLat(3,5), 9); map.setCenter(new OpenLayers.LonLat(3,5), 9);
// at this scale, the feature should be red // at this scale, the feature should be red
createdStyle = style.createSymbolizer(feature); createdStyle = style.createSymbolizer(feature);
t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale()); t.eq(createdStyle.display, undefined, "Feature is visible at scale "+map.getScale());
t.eq(createdStyle.fillColor, "yellow", "Point symbolizer from rule applied correctly."); t.eq(createdStyle.fillColor, "yellow", "Point symbolizer from rule applied correctly.");
map.setCenter(new OpenLayers.LonLat(3,5), 8); map.setCenter(new OpenLayers.LonLat(3,5), 8);
// at this scale, the feature should be yellow // at this scale, the feature should be yellow
createdStyle = style.createSymbolizer(feature); createdStyle = style.createSymbolizer(feature);
t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale()); t.eq(createdStyle.display, undefined, "Feature is visible at scale "+map.getScale());
t.eq(createdStyle.fillColor, "red", "Point symbolizer from rule applied correctly."); t.eq(createdStyle.fillColor, "red", "Point symbolizer from rule applied correctly.");
map.setCenter(new OpenLayers.LonLat(3,5), 7); map.setCenter(new OpenLayers.LonLat(3,5), 7);