Changeset 15515 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-11-05T22:31:25+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18293 - handle level tag like layer in CrossingWays test

File:

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

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

@@ -27 +27 @@
 
 /**
- * Tests if there are segments that crosses in the same layer
+ * Tests if there are segments that crosses in the same layer/level
  *
  * @author frsantos
@@ -107 +107 @@
             if (w1 == w2)
                 return false;
-            if (!Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2))) {
+            if (areLayerOrLevelDifferent(w1, w2)) {
                 return true;
             }
@@ -252 +252 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2));
-        }
-
+            return areLayerOrLevelDifferent(w1, w2);
+        }
     }
 
@@ -393 +392 @@
     }
 
+    private static boolean areLayerOrLevelDifferent(Way w1, Way w2) {
+        return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2))
+            || !Objects.equals(w1.get("level"), w2.get("level"));
+    }
+
     /**
      * Returns all the cells this segment crosses.  Each cell contains the list