skipping last stop in cul-de-sac rerouting ref #15552

Signed-off-by: m-kro <[email protected]>
eclipse-sumo · Oct 2, 2024 · 2b5d3e5 · 2b5d3e5
1 parent 88e9192
commit 2b5d3e5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/microsim/MSBaseVehicle.cpp b/src/microsim/MSBaseVehicle.cpp
@@ -288,7 +288,8 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
                 sourcePos = getNextStop().pars.endPos;
             }
             // avoid superfluous waypoints for first and last edge
-            const bool skipFirst = stops.front() == source && (source != getEdge() || sourcePos + getBrakeGap() <= firstPos + NUMERICAL_EPS);
+            const bool skipFirst = stops.front() == source &&
+                                   (source != getEdge() || (source == sink && sink->getNumSuccessors() == 0 && jumps.size() == 0) || sourcePos + getBrakeGap() <= firstPos + NUMERICAL_EPS);
             const bool skipLast = (stops.back() == sink
                                    && myArrivalPos >= lastPos
                                    && (stops.size() < 2 || stops.back() != stops[stops.size() - 2])
@@ -346,10 +347,6 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
             source = stopEdge;
             continue;
         }
-        //if (source == stopEdge) {
-        //    edges.push_back(source);
-        //    continue;
-        //}
         router.computeLooped(source, stopEdge, this, t, into, silent);
         //std::cout << SIMTIME << " reroute veh=" << getID() << " source=" << source->getID() << " target=" << (*s)->getID() << " edges=" << toString(into) << "\n";
         if (into.size() > 0) {