avoiding dead-ends due to permission changes. refs #5121

eclipse-sumo · Apr 1, 2019 · 808c0f4 · 808c0f4
1 parent 7e47f8e
commit 808c0f4
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/netbuild/NBEdge.cpp b/src/netbuild/NBEdge.cpp
@@ -2698,17 +2698,18 @@ NBEdge::appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool noGeometr
     if (noTLSControlled && myTo->isTLControlled()) {
         return;
     }
-    if (onlyDeadends) {
-        int allowedOutgoing = 0;
-        for (NBEdge* out : myTo->getOutgoingEdges()) {
-            if ((out->getPermissions() & SVC_PASSENGER) != 0 || out->getPermissions() == getPermissions()) {
-                allowedOutgoing++;
-                if (allowedOutgoing > 1) {
-                    return;
-                }
+    int allowedOutgoing = 0;
+    for (NBEdge* out : myTo->getOutgoingEdges()) {
+        if ((out->getPermissions() & SVC_PASSENGER) != 0 || out->getPermissions() == getPermissions()) {
+            allowedOutgoing++;
+            if (allowedOutgoing > 1) {
+                break;
             }
         }
     }
+    if (onlyDeadends && allowedOutgoing > 1) {
+        return;
+    }
     const int fromLane = (int)myLanes.size() - 1;
     const int toLane = (int)myTurnDestination->getNumLanes() - 1;
     if (checkPermissions) {
@@ -2735,7 +2736,7 @@ NBEdge::appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool noGeometr
             return;
         }
     };
-    if (noGeometryLike && myTo->geometryLike() && myTo->getOutgoingEdges().size() > 1) {
+    if (noGeometryLike && myTo->geometryLike() && allowedOutgoing > 1) {
         return;
     }
     setConnection(fromLane, myTurnDestination, toLane, L2L_VALIDATED);