Changeset 6294 in josm for trunk/src/org

Timestamp:

2013-10-04T00:57:06+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9142, fix #9143 - Ignore highway=proposed in CrossingWays validator test

File:

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

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

@@ -71 +71 @@
         String landuse1 = w.get("landuse");
         boolean isCoastline1 = "water".equals(natural1) || "coastline".equals(natural1) || "reservoir".equals(landuse1);
+        String highway1 = w.get("highway");
         String railway1 = w.get("railway");
         boolean isSubway1 = "subway".equals(railway1);
@@ -90 +91 @@
         for (int i = 0; i < nodesSize - 1; i++) {
             WaySegment ws = new WaySegment(w, i);
-            ExtendedSegment es1 = new ExtendedSegment(ws, layer1, railway1, isCoastline1, waterway1);
+            ExtendedSegment es1 = new ExtendedSegment(ws, layer1, highway1, railway1, isCoastline1, waterway1);
             for (List<ExtendedSegment> segments : getSegments(es1.n1, es1.n2)) {
                 for (ExtendedSegment es2 : segments) {
@@ -101 +102 @@
 
                     String layer2 = es2.layer;
+                    String highway2 = es2.highway;
                     String railway2 = es2.railway;
                     boolean isCoastline2 = es2.coastline;
@@ -125 +127 @@
                     }
 
-                    if (("abandoned".equals(es1.railway)) || ("abandoned".equals(railway2))) {
+                    if ("proposed".equals(es1.highway) || "proposed".equals(highway2)
+                     || "abandoned".equals(es1.railway) || "abandoned".equals(railway2)) {
                         continue;
                     }
@@ -140 +143 @@
                         } else if ((es1.waterway != null && es2.waterway != null)) {
                             message = tr("Crossing waterways");
-                        } else if ((es1.waterway != null && es2.ws.way.get("highway") != null)
-                                || (es2.waterway != null && es1.ws.way.get("highway") != null)) {
+                        } else if ((es1.waterway != null && es2.highway != null)
+                                || (es2.waterway != null && es1.highway != null)) {
                             message = tr("Crossing waterway/highway");
                         } else {
@@ -189 +192 @@
      */
     public static class ExtendedSegment {
-        private Node n1, n2;
-
-        private WaySegment ws;
+        private final Node n1, n2;
+
+        private final WaySegment ws;
 
         /** The layer */
-        private String layer;
+        private final String layer;
+
+        /** The highway type */
+        private final String highway;
 
         /** The railway type */
-        private String railway;
+        private final String railway;
 
         /** The waterway type */
-        private String waterway;
+        private final String waterway;
 
         /** The coastline type */
-        private boolean coastline;
+        private final boolean coastline;
 
         /**
@@ -209 +215 @@
          * @param ws The way segment
          * @param layer The layer of the way this segment is in
+         * @param highway The highway type of the way this segment is in
          * @param railway The railway type of the way this segment is in
          * @param coastline The coastline flag of the way the segment is in
          * @param waterway The waterway type of the way this segment is in
          */
-        public ExtendedSegment(WaySegment ws, String layer, String railway, boolean coastline, String waterway) {
+        public ExtendedSegment(WaySegment ws, String layer, String highway, String railway, boolean coastline, String waterway) {
             this.ws = ws;
             this.n1 = ws.way.getNodes().get(ws.lowerIndex);
             this.n2 = ws.way.getNodes().get(ws.lowerIndex + 1);
             this.layer = layer;
+            this.highway = highway;
             this.railway = railway;
             this.coastline = coastline;