Changeset 12986 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-10-11T20:42:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14132 - MapCSS crossing operator must check layer attribute first

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.IntFunction;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -258 +260 @@
 
         private final class CrossingFinder extends AbstractFinder {
+
+            private final String layer;
+
             private CrossingFinder(Environment e) {
                 super(e);
                 CheckParameterUtil.ensureThat(e.osm instanceof Way, "Only ways are supported");
+                layer = OsmUtils.getLayer(e.osm);
             }
 
             @Override
             public void visit(Way w) {
-                if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
+                if (e.child == null && Objects.equals(layer, OsmUtils.getLayer(w))
+                    && left.matches(new Environment(w).withParent(e.osm))
                     && e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {