Changeset 6457 in josm

Timestamp:

2013-12-09T01:52:16+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9411 - validator: no "crossing ways" warning for indoor ways with different level

File:

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

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

@@ -83 +83 @@
             return;
 
+        String level1 = w.get("level");
         String layer1 = w.get("layer");
         if ("0".equals(layer1)) {
-            layer1 = null; //0 is default value
+            layer1 = null; // 0 is default value for layer. Don't assume the same for levels
         }
 
@@ -91 +92 @@
         for (int i = 0; i < nodesSize - 1; i++) {
             WaySegment ws = new WaySegment(w, i);
-            ExtendedSegment es1 = new ExtendedSegment(ws, layer1, highway1, railway1, isCoastline1, waterway1);
+            ExtendedSegment es1 = new ExtendedSegment(ws, layer1, highway1, railway1, isCoastline1, waterway1, level1);
             for (List<ExtendedSegment> segments : getSegments(es1.n1, es1.n2)) {
                 for (ExtendedSegment es2 : segments) {
@@ -101 +102 @@
                     }
 
+                    String level2 = es2.level;
                     String layer2 = es2.layer;
                     String highway2 = es2.highway;
@@ -106 +108 @@
                     boolean isCoastline2 = es2.coastline;
                     if (layer1 == null ? layer2 != null : !layer1.equals(layer2)) {
+                        continue;
+                    }
+                    // Ignore indoor highways on different levels
+                    if (highway1 != null && highway2 != null && level1 != null && level2 != null && !level1.equals(level2)) {
                         continue;
                     }
@@ -212 +218 @@
         private final boolean coastline;
 
+        /** The level, only considered for indoor highways */
+        private final String level;
+
         /**
          * Constructor
@@ -220 +229 @@
          * @param coastline The coastline flag of the way the segment is in
          * @param waterway The waterway type of the way this segment is in
+         * @param level The level of the way this segment is in
          */
-        public ExtendedSegment(WaySegment ws, String layer, String highway, String railway, boolean coastline, String waterway) {
+        public ExtendedSegment(WaySegment ws, String layer, String highway, String railway, boolean coastline, String waterway, String level) {
             this.ws = ws;
             this.n1 = ws.way.getNodes().get(ws.lowerIndex);
@@ -230 +240 @@
             this.coastline = coastline;
             this.waterway = waterway;
+            this.level = level;
         }