exempting trains from bidi-cleanup fix #10845, refs #10445

eclipse-sumo · May 31, 2022 · 0d0c276 · 0d0c276
1 parent 30b3741
commit 0d0c276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/microsim/MSLane.cpp b/src/microsim/MSLane.cpp
@@ -415,7 +415,7 @@ MSLane::incorporateVehicle(MSVehicle* veh, double pos, double speed, double posL
     if (wasInactive) {
         MSNet::getInstance()->getEdgeControl().gotActive(this);
     }
-    if (!isRailway(myPermissions) && getBidiLane() != nullptr) {
+    if (!isRailway(veh->getVClass()) && getBidiLane() != nullptr) {
         // railways don't need to "see" each other when moving in opposite directions on the same track (efficiency)
         getBidiLane()->setPartialOccupation(veh);
     }
@@ -1987,7 +1987,7 @@ MSLane::executeMovements(const SUMOTime t) {
                 // vehicle has entered a new lane (leaveLane and workOnMoveReminders were already called in MSVehicle::executeMove)
                 target->myVehBuffer.push_back(veh);
                 MSNet::getInstance()->getEdgeControl().needsVehicleIntegration(target);
-                if (!isRailway(myPermissions) && target->getBidiLane() != nullptr) {
+                if (!isRailway(veh->getVClass()) && target->getBidiLane() != nullptr) {
                     // railways don't need to "see" each other when moving in opposite directions on the same track (efficiency)
                     target->getBidiLane()->setPartialOccupation(veh);
                     //MSNet::getInstance()->getEdgeControl().needsVehicleIntegration(target->getBidiLane());

diff --git a/src/microsim/MSVehicle.cpp b/src/microsim/MSVehicle.cpp
@@ -5174,7 +5174,7 @@ MSVehicle::leaveLane(const MSMoveReminder::Notification reason, const MSLane* ap
     if ((reason == MSMoveReminder::NOTIFICATION_JUNCTION || reason == MSMoveReminder::NOTIFICATION_TELEPORT) && myLane != nullptr) {
         myOdometer += getLane()->getLength();
     }
-    if (myLane != nullptr && myLane->getBidiLane() != nullptr && myAmOnNet) {
+    if (myLane != nullptr && myLane->getBidiLane() != nullptr && myAmOnNet && !isRailway(getVClass())) {
         myLane->getBidiLane()->resetPartialOccupation(this);
     }
     if (reason != MSMoveReminder::NOTIFICATION_JUNCTION && reason != MSMoveReminder::NOTIFICATION_LANE_CHANGE) {