Changeset 12986 in josm for trunk/src

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmUtils.java (modified) (1 diff)
• data/validation/tests/CrossingWays.java (modified) (4 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -139 +139 @@
         return p;
     }
+
+    /**
+     * Returns the layer value of primitive (null for layer 0).
+     * @param w OSM primitive
+     * @return the value of "layer" key, or null if absent or set to 0 (default value)
+     * @since 12986
+     */
+    public static String getLayer(OsmPrimitive w) {
+        String layer1 = w.get("layer");
+        if ("0".equals(layer1)) {
+            layer1 = null; // 0 is default value for layer.
+        }
+        return layer1;
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -71 +72 @@
             if (w1 == w2)
                 return false;
-            if (!Objects.equals(getLayer(w1), getLayer(w2))) {
+            if (!Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2))) {
                 return true;
             }
@@ -164 +165 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return !Objects.equals(getLayer(w1), getLayer(w2));
+            return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2));
         }
 
@@ -232 +233 @@
         cellSegments.clear();
         seenWays.clear();
-    }
-
-    static String getLayer(OsmPrimitive w) {
-        String layer1 = w.get("layer");
-        if ("0".equals(layer1)) {
-            layer1 = null; // 0 is default value for layer.
-        }
-        return layer1;
     }
 

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()))) {