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

Timestamp:

2013-12-31T10:56:23+01:00 (11 years ago)

Author:

simon04

Message:

fix #9043 - Validator: Verify links on highways

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/Highways.java (modified) (4 diffs)
• tools/Predicates.java (modified) (2 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -36 +37 @@
     protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_MAXSPEED = 2705;
     protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_HIGHWAY = 2706;
+    protected static final int SOURCE_WRONG_LINK = 2707;
 
     /**
@@ -104 +106 @@
                 testSourceMaxspeed(w, true);
             }
+            testHighwayLink(w);
         }
     }
@@ -140 +143 @@
     }
 
+    public static boolean isHighwayLinkOkay(final Way way) {
+        final String highway = way.get("highway");
+        if (highway == null || !highway.endsWith("_link")) {
+            return true;
+        }
+
+        final HashSet<OsmPrimitive> referrers = new HashSet<OsmPrimitive>();
+        referrers.addAll(way.firstNode().getReferrers());
+        referrers.addAll(way.lastNode().getReferrers());
+
+        return Utils.exists(Utils.filteredCollection(referrers, Way.class), new Predicate<Way>() {
+            @Override
+            public boolean evaluate(final Way otherWay) {
+                return !way.equals(otherWay) && otherWay.hasTag("highway", highway, highway.replaceAll("_link$", ""));
+            }
+        });
+    }
+
+    private void testHighwayLink(final Way way) {
+        if (!isHighwayLinkOkay(way)) {
+            errors.add(new TestError(this, Severity.WARNING,
+                    tr("Highway link is not linked to adequate highway/link"), SOURCE_WRONG_LINK, way));
+        }
+    }
+
     private void testMissingPedestrianCrossing(Node n) {
         leftByPedestrians = false;

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 import java.util.regex.Pattern;
@@ -46 +48 @@
         };
     }
+
+    /**
+     * Returns a {@link Predicate} executing {@link OsmPrimitive#hasTag(String, String...)}.
+     */
+    public static Predicate<OsmPrimitive> hasTag(final String key, final String... values) {
+        return new Predicate<OsmPrimitive>() {
+            @Override
+            public boolean evaluate(OsmPrimitive p) {
+                return p.hasTag(key, values);
+            }
+        };
+    }
 }