Changeset 13678 in josm for trunk/src/org

Timestamp:

2018-04-25T01:16:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16188 - rework new test

File:

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

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

@@ -42 +42 @@
      */
     private enum WayType {
-        BUILDING, HIGHWAY, RESIDENTIAL_AREA, WATERWAY, WAY
+        BUILDING, HIGHWAY, RESIDENTIAL_AREA, WATERWAY, WAY;
+
+        static WayType of(Way w) {
+            if (isBuilding(w))
+                return BUILDING;
+            else if (w.hasKey(CrossingWays.HIGHWAY))
+                return HIGHWAY;
+            else if (isResidentialArea(w))
+                return RESIDENTIAL_AREA;
+            else if (w.hasKey(CrossingWays.WATERWAY))
+                return WATERWAY;
+            else
+                return WAY;
+        }
     }
 
@@ -104 +117 @@
         }
 
-        private static WayType getWayType(Way w) {
-            if (isBuilding(w))
-                return WayType.BUILDING;
-            else if (w.hasKey(HIGHWAY))
-                return WayType.HIGHWAY;
-            else if (isResidentialArea(w))
-                return WayType.RESIDENTIAL_AREA;
-            else if (w.hasKey(WATERWAY))
-                return WayType.WATERWAY;
-            else
-                return WayType.WAY;
-        }
-
         @Override
         String createMessage(Way w1, Way w2) {
-            WayType[] types = {getWayType(w1), getWayType(w2)};
+            WayType[] types = {WayType.of(w1), WayType.of(w2)};
             Arrays.sort(types);