cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle partial overrides correctly

Browse Source
This commit is contained in:
Konstantin Käfer 2011-01-25 19:09:02 -05:00
parent d155a5ad5e
commit 5bd5b0fe9d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mess/renderer.js
View File

@ -257,10 +257,12 @@ mess.Renderer = function Renderer(env) {
}
}
// iterate in reverse - low to high specificity
for (var i = ancestors.length - 1; i >= 0; i--) {
for (var j = 0; j < winners.length; j++) {
winners[j].inheritFrom(ancestors[i]);
for (var i = 0; i < winners.length; i++) {
for (var j = i + 1; j < winners.length; j++) {
winners[i].inheritFrom(winners[j]);
}
for (var j = 0; j < ancestors.length; j++) {
winners[i].inheritFrom(ancestors[j]);
}
}

7
test/rendering/complex_cascades.result
View File

@ -22,13 +22,13 @@
</Style>
<Style name="world-line/__default__">
<Rule>
<Filter>([NAME] = 'Canada')</Filter>
<LineSymbolizer stroke-width="1"
stroke="#cccccc"/>
</Rule>
<Rule>
<Filter>([NAME] != 'Canada')</Filter>
<LineSymbolizer stroke-width="0.5"
stroke="#ff0000"/>
@ -61,7 +61,8 @@
<Style name="countries-line/__default__">
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<LineSymbolizer stroke-width="0.5"/>
<LineSymbolizer stroke-width="0.5"
stroke="#cccccc"/>
</Rule>
<Rule>
<MinScaleDenominator>12500000</MinScaleDenominator>