Changeset 12986 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (4 diffs)

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;
     }