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

Timestamp:

2018-04-23T23:46:31+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16188 - Detect crossing of residential areas (patch by marxin, modified)

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (1 diff)
• tests/CrossingWays.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -347 +347 @@
     }
 
+    /**
+     * Determines if the specified primitive denotes a residential area.
+     * @param p The primitive to be tested
+     * @return True if landuse key is equal to residential
+     */
+    protected static final boolean isResidentialArea(OsmPrimitive p) {
+        return p.hasTag("landuse", "residential");
+    }
+
     @Override
     public int hashCode() {

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

@@ -6 +6 @@
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -35 +36 @@
     static final String RAILWAY = "railway";
     static final String WATERWAY = "waterway";
+    static final String LANDUSE = "landuse";
+
+    /**
+     * Type of way. Entries have to be declared in alphabetical order, see sort below.
+     */
+    private enum WayType {
+        BUILDING, HIGHWAY, RESIDENTIAL_AREA, WATERWAY, WAY
+    }
 
     /** All way segments, grouped by cells */
@@ -65 +74 @@
                     || isRailway(w)
                     || isCoastline(w)
-                    || isBuilding(w));
+                    || isBuilding(w)
+                    || isResidentialArea(w));
         }
 
@@ -78 +88 @@
                 return true;
             }
+            if ((w1.hasKey(HIGHWAY) && isResidentialArea(w2))
+             || (w2.hasKey(HIGHWAY) && isResidentialArea(w1)))
+                return true;
             if (isSubwayOrTramOrRazed(w2)) {
                 return true;
@@ -91 +104 @@
         }
 
+        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) {
-            if (isBuilding(w1)) {
-                return tr("Crossing buildings");
-            } else if (w1.hasKey(WATERWAY) && w2.hasKey(WATERWAY)) {
-                return tr("Crossing waterways");
-            } else if ((w1.hasKey(HIGHWAY) && w2.hasKey(WATERWAY))
-                    || (w2.hasKey(HIGHWAY) && w1.hasKey(WATERWAY))) {
-                return tr("Crossing waterway/highway");
+            WayType[] types = {getWayType(w1), getWayType(w2)};
+            Arrays.sort(types);
+
+            if (types[0] == types[1]) {
+                switch(types[0]) {
+                    case BUILDING:
+                        return tr("Crossing buildings");
+                    case HIGHWAY:
+                        return tr("Crossing highways");
+                    case RESIDENTIAL_AREA:
+                        return tr("Crossing residential areas");
+                    case WATERWAY:
+                        return tr("Crossing waterways");
+                    case WAY:
+                    default:
+                        return tr("Crossing ways");
+                }
             } else {
-                return tr("Crossing ways");
+                switch (types[0]) {
+                    case BUILDING:
+                        switch (types[1]) {
+                            case HIGHWAY:
+                                return tr("Crossing building/highway");
+                            case RESIDENTIAL_AREA:
+                                return tr("Crossing building/residential area");
+                            case WATERWAY:
+                                return tr("Crossing building/waterway");
+                            case WAY:
+                            default:
+                                return tr("Crossing building/way");
+                        }
+                    case HIGHWAY:
+                        switch (types[1]) {
+                            case RESIDENTIAL_AREA:
+                                return tr("Crossing highway/residential area");
+                            case WATERWAY:
+                                return tr("Crossing highway/waterway");
+                            case WAY:
+                            default:
+                                return tr("Crossing highway/way");
+                        }
+                    case RESIDENTIAL_AREA:
+                        switch (types[1]) {
+                            case WATERWAY:
+                                return tr("Crossing residential area/waterway");
+                            case WAY:
+                            default:
+                                return tr("Crossing residential area/way");
+                        }
+                    case WATERWAY:
+                    default:
+                        return tr("Crossing waterway/way");
+                }
             }
         }
@@ -236 +306 @@
 
     static boolean isCoastline(OsmPrimitive w) {
-        return w.hasTag("natural", "water", "coastline") || w.hasTag("landuse", "reservoir");
+        return w.hasTag("natural", "water", "coastline") || w.hasTag(LANDUSE, "reservoir");
     }