Changeset 6303 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2013-10-06T20:27:55+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9141 - new validator test: detect nodes with missing highway=crossing

File:

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

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

@@ -14 +14 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
@@ -28 +29 @@
 
     protected static final int WRONG_ROUNDABOUT_HIGHWAY = 2701;
+    protected static final int MISSING_PEDESTRIAN_CROSSING = 2702;
     
     protected static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList(
             "motorway", "trunk", "primary", "secondary", "tertiary", "living_street", "residential", "unclassified");
 
+    boolean leftByPedestrians = false;
+    boolean leftByCyclists = false;
+    boolean leftByCars = false;
+    int pedestrianWays = 0;
+    int cyclistWays = 0;
+    int carsWays = 0;
+    
     /**
      * Constructs a new {@code Highways} test.
@@ -38 +47 @@
         super(tr("Highways"), tr("Performs semantic checks on highways."));
     }
-    
+
     protected class WrongRoundaboutHighway extends TestError {
 
@@ -52 +61 @@
     
     @Override
+    public void visit(Node n) {
+        if (n.isUsable() && !n.hasTag("highway", "crossing") && !n.hasTag("crossing", "no") && n.isReferredByWays(2)) {
+            testMissingPedestrianCrossing(n);
+        }
+    }
+
+    @Override
     public void visit(Way w) {
         if (w.isUsable() && w.hasKey("highway") && w.hasKey("junction") && w.get("junction").equals("roundabout")) {
-            Map<String, List<Way>> map = new HashMap<String, List<Way>>();
-            // Count all highways (per type) connected to this roundabout
-            // As roundabouts are closed ways, take care of not processing the first/last node twice
-            for (Node n : new HashSet<Node>(w.getNodes())) {
-                for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
-                    if (h != w && h.hasKey("highway")) {
-                        List<Way> list = map.get(h.get("highway"));
-                        if (list == null) {
-                            map.put(h.get("highway"), list = new ArrayList<Way>());
-                        }
-                        list.add(h);
+            testWrongRoundabout(w);
+        }
+    }
+
+    private void testWrongRoundabout(Way w) {
+        Map<String, List<Way>> map = new HashMap<String, List<Way>>();
+        // Count all highways (per type) connected to this roundabout
+        // As roundabouts are closed ways, take care of not processing the first/last node twice
+        for (Node n : new HashSet<Node>(w.getNodes())) {
+            for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
+                if (h != w && h.hasKey("highway")) {
+                    List<Way> list = map.get(h.get("highway"));
+                    if (list == null) {
+                        map.put(h.get("highway"), list = new ArrayList<Way>());
                     }
+                    list.add(h);
                 }
             }
-            // The roundabout should carry the highway tag of its two biggest highways
-            for (String s : CLASSIFIED_HIGHWAYS) {
-                List<Way> list = map.get(s);
-                if (list != null && list.size() >= 2) {
-                    // Except when a single road is connected, but with two oneway segments
-                    Boolean oneway1 = OsmUtils.getOsmBoolean(list.get(0).get("oneway"));
-                    Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
-                    if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
-                        // Error when the highway tags do not match
-                        if (!w.get("highway").equals(s)) {
-                            errors.add(new TestError(this, Severity.WARNING, 
-                                    tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s), 
-                                    WRONG_ROUNDABOUT_HIGHWAY, w));
-                        }
-                        break;
+        }
+        // The roundabout should carry the highway tag of its two biggest highways
+        for (String s : CLASSIFIED_HIGHWAYS) {
+            List<Way> list = map.get(s);
+            if (list != null && list.size() >= 2) {
+                // Except when a single road is connected, but with two oneway segments
+                Boolean oneway1 = OsmUtils.getOsmBoolean(list.get(0).get("oneway"));
+                Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
+                if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
+                    // Error when the highway tags do not match
+                    if (!w.get("highway").equals(s)) {
+                        errors.add(new WrongRoundaboutHighway(w, tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s)));
                     }
+                    break;
                 }
             }
+        }
+    }
+    
+    private void testMissingPedestrianCrossing(Node n) {
+        leftByPedestrians = false;
+        leftByCyclists = false;
+        leftByCars = false;
+        pedestrianWays = 0;
+        cyclistWays = 0;
+        carsWays = 0;
+        
+        for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+            String highway = w.get("highway");
+            if (highway != null) {
+                if (highway.equals("footway") || highway.equals("path")) {
+                    handlePedestrianWay(n, w);
+                    if (w.hasTag("bicycle", "yes", "designated")) {
+                        handleCyclistWay(n, w);
+                    }
+                } else if (highway.equals("cycleway")) {
+                    handleCyclistWay(n, w);
+                    if (w.hasTag("foot", "yes", "designated")) {
+                        handlePedestrianWay(n, w);
+                    }
+                } else if (CLASSIFIED_HIGHWAYS.contains(highway) || highway.equals("service") || highway.equals("road")) {
+                    handleCarWay(n, w);
+                }
+                if ((leftByPedestrians || leftByCyclists) && leftByCars) {
+                    errors.add(new TestError(this, Severity.WARNING, tr("Missing crossing information"), MISSING_PEDESTRIAN_CROSSING, n));
+                    return;
+                }
+            }
+        }
+    }
+
+    private void handleCarWay(Node n, Way w) {
+        carsWays++;
+        if (!w.isFirstLastNode(n) || carsWays > 1) {
+            leftByCars = true;
+        }
+    }
+
+    private void handleCyclistWay(Node n, Way w) {
+        cyclistWays++;
+        if (!w.isFirstLastNode(n) || cyclistWays > 1) {
+            leftByCyclists = true;
+        }
+    }
+
+    private void handlePedestrianWay(Node n, Way w) {
+        pedestrianWays++;
+        if (!w.isFirstLastNode(n) || pedestrianWays > 1) {
+            leftByPedestrians = true;
         }
     }