Merge pull request #42 from movsim/vasa

Fixes parsing of vasaloppet.xodr. Adapts geometrie of vasa to new y a…
movsim · Aug 27, 2018 · 37d8767 · 37d8767
2 parents 4eb72a0 + 5498fca
commit 37d8767
Show file tree

Hide file tree

Showing 5 changed files with 2,723 additions and 1,937 deletions.
diff --git a/core/src/main/java/org/movsim/input/network/OpenDriveHandler.java b/core/src/main/java/org/movsim/input/network/OpenDriveHandler.java
@@ -483,11 +483,12 @@ private static void joinByLanes(RoadNetwork roadNetwork, Road road, List<Lane> l
                             roadSegment);
                 }
             }
-            if (lane.getLink().isSetSuccessor()) {
-                if (!hasRoadSuccessor(road)) {
-                    throw new IllegalArgumentException(
-                            "successor lane link but no road link defined for road=" + road.getId());
-                }
+            if (lane.getLink().isSetSuccessor() && !road.isSetJunction()) {
+				if (!hasRoadSuccessor(road)) {
+					throw new IllegalArgumentException(
+							"successor lane link but no road link defined for road=" + road.getId() + " name="
+									+ road.getName() + " junction=" + road.getJunction() + " lane=" + lane.getId());
+				}
                 int fromLane = lane.getId();
                 RoadSegment roadSegment = getRoadSegment(roadNetwork, road.getId(), fromLane);
                 int toLane = lane.getLink().getSuccessor().getId();