fixing duarouter problems with parameterized plan items #14198

eclipse-sumo · Jan 11, 2024 · 39a468e · 39a468e
1 parent ac9a8a7
commit 39a468e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/router/ROPerson.h b/src/router/ROPerson.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <iostream>
+#include <utils/common/Parameterised.h>
 #include <utils/common/StdDefs.h>
 #include <utils/common/SUMOTime.h>
 #include <utils/vehicle/SUMOVehicleParameter.h>
@@ -79,7 +80,7 @@ class ROPerson : public RORoutable {
      * @brief Every person has a plan comprising of multiple planItems
      *
      */
-    class PlanItem {
+    class PlanItem : public Parameterised {
     public:
         /// @brief Destructor
         virtual ~PlanItem() {}

diff --git a/src/router/RORouteHandler.cpp b/src/router/RORouteHandler.cpp
@@ -1289,6 +1289,7 @@ RORouteHandler::addPersonTrip(const SUMOSAXAttributes& attrs) {
         const std::string originStopID = myActivePlan->empty() ?  "" : myActivePlan->back()->getStopDest();
         ROPerson::addTrip(*myActivePlan, myVehicleParameter->id, from, to, modeSet, types,
                           departPos, originStopID, arrivalPos, busStopID, walkFactor, group);
+        myParamStack.push_back(myActivePlan->back());
     }
 }
 
@@ -1333,6 +1334,7 @@ RORouteHandler::addWalk(const SUMOSAXAttributes& attrs) {
         retrieveStoppingPlace(attrs, errorSuffix, stoppingPlaceID);
         if (ok) {
             ROPerson::addWalk(*myActivePlan, myActiveRoute, duration, speed, departPos, arrivalPos, stoppingPlaceID);
+            myParamStack.push_back(myActivePlan->back());
         }
     } else {
         addPersonTrip(attrs);

diff --git a/src/utils/vehicle/SUMORouteHandler.cpp b/src/utils/vehicle/SUMORouteHandler.cpp
@@ -294,7 +294,9 @@ SUMORouteHandler::myEndElement(int element) {
             break;
         case SUMO_TAG_PERSONTRIP:
         case SUMO_TAG_WALK:
-            myParamStack.pop_back();
+            if (myParamStack.size() == 2) {
+                myParamStack.pop_back();
+            }
             break;
         case SUMO_TAG_INTERVAL:
             myBeginDefault = string2time(OptionsCont::getOptions().getString("begin"));