Changeset 10141 in josm

Timestamp:

2016-04-11T22:06:50+02:00 (9 years ago)

Author:

simon04

Message:

Validate that stop position lies on public transport route

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java (modified) (1 diff)

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

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -40 +45 @@
 
         final List<RelationMember> membersToCheck = new ArrayList<>();
+        final Set<Node> routeNodes = new HashSet<>();
         for (RelationMember member : r.getMembers()) {
             if (member.hasRole("forward", "backward")) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Route relation contains a ''{0}'' role", "forward/backward"), 3601, r));
                 return;
-            } else if (member.hasRole("")) {
+            } else if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) {
                 membersToCheck.add(member);
+                routeNodes.addAll(member.getWay().getNodes());
             }
         }
@@ -65 +72 @@
         }
 
+        for (RelationMember member : r.getMembers()) {
+            if (member.hasRole("stop", "stop_exit_only", "stop_entry_only")
+                    && OsmPrimitiveType.NODE.equals(member.getType())
+                    && !routeNodes.contains(member.getNode())) {
+                errors.add(new TestError(this, Severity.WARNING, tr("Stop position not part of route"), 3603, Arrays.asList(member.getMember(), r)));
+            }
+        }
+
     }
 }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java

@@ -67 +67 @@
         assertEquals("Route relation contains a gap", test.getErrors().get(0).getMessage());
 
+        final Relation r5 = TestUtils.newRelation("type=route route=tram public_transport:version=2",
+                new RelationMember("", w1), new RelationMember("", w2), new RelationMember("", w3),
+                new RelationMember("stop", w1.firstNode()), new RelationMember("stop", w4.lastNode()));
+        test.startTest(null);
+        test.visit(r5);
+        assertEquals(1, test.getErrors().size());
+        assertEquals("Stop position not part of route", test.getErrors().get(0).getMessage());
+        assertEquals(w4.lastNode(), test.getErrors().get(0).getPrimitives().iterator().next());
+
     }
 }