fix #14815

eclipse-sumo · May 2, 2024 · 7acfddd · 7acfddd
1 parent 8190105
commit 7acfddd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/microsim/MSBaseVehicle.cpp b/src/microsim/MSBaseVehicle.cpp
@@ -1658,7 +1658,7 @@ MSBaseVehicle::replaceStop(int nextStopIndex, SUMOVehicleParameter::Stop stop, c
         return true;
     }
 
-    if (!stopLane->allowsVehicleClass(getVClass())) {
+    if (!stopLane->allowsVehicleClass(getVClass(), myRoutingMode)) {
         errorMsg = ("Disallowed stop lane '" + stopLane->getID() + "'");
         return false;
     }
@@ -1870,7 +1870,7 @@ MSBaseVehicle::insertStop(int nextStopIndex, SUMOVehicleParameter::Stop stop, co
     MSLane* stopLane = MSLane::dictionary(stop.lane);
     MSEdge* stopEdge = &stopLane->getEdge();
 
-    if (!stopLane->allowsVehicleClass(getVClass())) {
+    if (!stopLane->allowsVehicleClass(getVClass(), myRoutingMode)) {
         errorMsg = ("Disallowed stop lane '" + stopLane->getID() + "'");
         return false;
     }

diff --git a/src/microsim/MSLane.cpp b/src/microsim/MSLane.cpp
@@ -4528,4 +4528,10 @@ MSLane::getSpaceTillLastStanding(const MSVehicle* ego, bool& foundStopped) const
     return getLength() - lengths;
 }
 
+
+bool
+MSLane::allowsVehicleClass(SUMOVehicleClass vclass, int routingMode) const {
+    return (((routingMode & libsumo::ROUTING_MODE_IGNORE_TRANSIENT_PERMISSIONS) ? myOriginalPermissions : myPermissions) & vclass) == vclass;
+}
+
 /****************************************************************************/
diff --git a/src/microsim/MSLane.h b/src/microsim/MSLane.h
@@ -914,6 +914,8 @@ class MSLane : public Named, public Parameterised {
         return (myPermissions & vclass) == vclass;
     }
 
+    bool allowsVehicleClass(SUMOVehicleClass vclass, int routingMode) const;
+
     /** @brief Returns whether the given vehicle class may change left from this lane */
     inline bool allowsChangingLeft(SUMOVehicleClass vclass) const {
         return (myChangeLeft & vclass) == vclass;