addendum refs #14886

eclipse-sumo · May 18, 2024 · 699b294 · 699b294
1 parent 807036e
commit 699b294
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/microsim/transportables/MSTransportable.cpp b/src/microsim/transportables/MSTransportable.cpp
@@ -343,6 +343,8 @@ MSTransportable::removeStage(int next, bool stayInSim) {
         (*myStep)->abort(this);
         if (!proceed(MSNet::getInstance(), SIMSTEP)) {
             MSNet::getInstance()->getPersonControl().erase(this);
+        } else if (myPlan->front()->getDeparted() < 0) {
+            myPlan->front()->setDeparted(SIMSTEP);
         }
     }
 }
@@ -587,7 +589,13 @@ void
 MSTransportable::saveState(OutputDevice& out) {
     // this saves lots of departParameters which are only needed for transportables that did not yet depart
     // the parameters may hold the name of a vTypeDistribution but we are interested in the actual type
+    const SUMOTime desiredDepart = myParameter->depart;
+    if (myPlan->front()->getDeparted() >= 0) {
+        // this is only relevant in the context of delayed departure (max-num-persons)
+        const_cast<SUMOVehicleParameter*>(myParameter)->depart = myPlan->front()->getDeparted();
+    }
     myParameter->write(out, OptionsCont::getOptions(), myAmPerson ? SUMO_TAG_PERSON : SUMO_TAG_CONTAINER, getVehicleType().getID());
+    const_cast<SUMOVehicleParameter*>(myParameter)->depart = desiredDepart;
     if (!myParameter->wasSet(VEHPARS_SPEEDFACTOR_SET) && getChosenSpeedFactor() != 1) {
         out.setPrecision(MAX2(gPrecisionRandom, gPrecision));
         out.writeAttr(SUMO_ATTR_SPEEDFACTOR, getChosenSpeedFactor());
@@ -618,6 +626,7 @@ MSTransportable::loadState(const std::string& state) {
     std::istringstream iss(state);
     int step;
     iss >> myParameter->parametersSet >> step;
+    myPlan->front()->setDeparted(myParameter->depart);
     myStep = myPlan->begin() + step;
     (*myStep)->loadState(this, iss);
 }