Changeset 6736 in josm for trunk/src

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (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;
                 }
             }