addendum refs #14796

eclipse-sumo · Apr 30, 2024 · 67d99b4 · 67d99b4
1 parent 80b3f46
commit 67d99b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/microsim/transportables/MSPModel_Striping.cpp b/src/microsim/transportables/MSPModel_Striping.cpp
@@ -1562,8 +1562,12 @@ MSPModel_Striping::Obstacle::Obstacle(const PState& ped) :
     xBack(ped.getMinX()),
     speed(ped.myDir * ped.mySpeed),
     type(ped.getOType()),
-    description(ped.getID()) {
+    description(ped.getID())
+{
     assert(!ped.myWaitingToEnter);
+    if (type == OBSTACLE_VEHICLE) {
+        vehicle = static_cast<const PStateVehicle&>(ped).getVehicle();
+    }
 }
 
 
@@ -2148,6 +2152,12 @@ MSPModel_Striping::PState::walk(const Obstacles& obs, SUMOTime currentTime) {
         xSpeed = 0;
     }
     if (xSpeed == 0) {
+        if (DEBUGCOND(*this)) {
+            std::cout << " sharedWA=" << (myWalkingAreaFoes.find(&myLane->getEdge()) != myWalkingAreaFoes.end())
+                << " vehObs=" << Named::getIDSecure(obs[current].vehicle)
+                << " vehWait=" << STEPS2TIME(obs[current].vehicle ? obs[current].vehicle->getWaitingTime() : 0)
+                << "\n";
+        }
         if (myWaitingTime > ((myLane->getEdge().isCrossing()
                               // treat shared walkingarea like a crossing to avoid deadlocking vehicles
                               || (myLane->getEdge().isWalkingArea() && obs[current].vehicle != nullptr && obs[current].vehicle->getWaitingTime() > jamTimeCrossing

diff --git a/src/microsim/transportables/MSPModel_Striping.h b/src/microsim/transportables/MSPModel_Striping.h
@@ -418,6 +418,10 @@ class MSPModel_Striping : public MSPModel {
         ObstacleType getOType() const {
             return OBSTACLE_VEHICLE;
         }
+
+        const MSVehicle* getVehicle() const {
+            return myVehicle;
+        }
     private:
         const MSVehicle* myVehicle;
         const double myXWidth;