Changeset 6736 in josm

Timestamp:

2014-01-19T17:46:33+01:00 (11 years ago)

Author:

simon04

Message:

fix #8568 - MapCSS rule applied several times if several selectors applies

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -174 +174 @@
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
         Environment env = new Environment(osm, mc, null, this);
-        for (MapCSSRule r : rules) {
+        RULE: for (MapCSSRule r : rules) {
             for (Selector s : r.selectors) {
                 env.clearSelectorMatchingInformation();
@@ -200 +200 @@
                     env.layer = sub;
                     r.execute(env);
+                    continue RULE;
                 }
             }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -3 +3 @@
 import org.junit.Before
 import org.junit.Test
+import org.openstreetmap.TestUtils
 import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.Preferences
@@ -181 +182 @@
         assert !c2.applies(new Environment().withPrimitive(w2))
     }
+
+    @Test
+    public void testTicket8568() throws Exception {
+        def sheet = new MapCSSStyleSource("")
+        getParser("" +
+                "way { width: 5; }\n" +
+                "way[keyA], way[keyB] { width: eval(prop(width)+10); }").sheet(sheet)
+        def mc = new MultiCascade()
+        sheet.apply(mc, TestUtils.createPrimitive("way foo=bar"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 5
+        sheet.apply(mc, TestUtils.createPrimitive("way keyA=true"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15
+        sheet.apply(mc, TestUtils.createPrimitive("way keyB=true"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15
+        sheet.apply(mc, TestUtils.createPrimitive("way keyA=true keyB=true"), 20, null, false)
+        assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15
+    }
 }