fixed invalid detection for oncoming bidi neighbor. refs #13313

eclipse-sumo · May 25, 2023 · d62d849 · d62d849
1 parent a9c80cc
commit d62d849
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/microsim/MSLaneChanger.cpp b/src/microsim/MSLaneChanger.cpp
@@ -566,8 +566,11 @@ MSLaneChanger::getRealLeader(const ChangerIt& target) const {
         double leaderBack = targetLane->getLength();
         for (MSVehicle* pl : targetLane->myPartialVehicles) {
             double plBack = pl->getBackPositionOnLane(targetLane);
-            if (plBack < leaderBack &&
-                    pl->getPositionOnLane(targetLane) + pl->getVehicleType().getMinGap() >= egoBack) {
+            if (pl->getLane() == targetLane->getBidiLane()) {
+                plBack -= pl->getVehicleType().getLengthWithGap();
+            }
+            const double plPos = plBack + pl->getVehicleType().getLength();
+            if (plBack < leaderBack && plPos + pl->getVehicleType().getMinGap() >= egoBack) {
                 neighLead = pl;
                 leaderBack = plBack;
             }
@@ -578,10 +581,7 @@ MSLaneChanger::getRealLeader(const ChangerIt& target) const {
                 std::cout << "  found leader=" << neighLead->getID() << " (partial)\n";
             }
 #endif
-            double gap = leaderBack - vehicle->getPositionOnLane() - vehicle->getVehicleType().getMinGap();
-            if (neighLead->getLane() == targetLane->getBidiLane()) {
-                gap -= neighLead->getVehicleType().getLengthWithGap();
-            }
+            const double gap = leaderBack - vehicle->getPositionOnLane() - vehicle->getVehicleType().getMinGap();
             return std::pair<MSVehicle*, double>(neighLead, gap);
         }
         double seen = myCandi->lane->getLength() - vehicle->getPositionOnLane();