fix #7454

eclipse-sumo · Aug 25, 2020 · 0d83f7e · 0d83f7e
1 parent 60c8221
commit 0d83f7e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/libsumo/Simulation.cpp b/src/libsumo/Simulation.cpp
@@ -702,6 +702,7 @@ Simulation::loadState(const std::string& fileName) {
     if (MsgHandler::getErrorInstance()->wasInformed()) {
         throw TraCIException("Loading state from '" + fileName + "' failed.");
     }
+    Helper::clearVehicleStates();
     PROGRESS_TIME_MESSAGE(before);
     return STEPS2TIME(newTime);
 }

diff --git a/src/netload/NLBuilder.cpp b/src/netload/NLBuilder.cpp
@@ -220,7 +220,7 @@ NLBuilder::build() {
         if (myOptions.isDefault("begin")) {
             myOptions.set("begin", time2string(h.getTime()));
             if (TraCIServer::getInstance() != nullptr) {
-                TraCIServer::getInstance()->setTargetTime(h.getTime());
+                TraCIServer::getInstance()->stateLoaded(h.getTime());
             }
         }
         if (MsgHandler::getErrorInstance()->wasInformed()) {

diff --git a/src/traci-server/TraCIServer.cpp b/src/traci-server/TraCIServer.cpp
@@ -1558,10 +1558,13 @@ TraCIServer::readTypeCheckingPolygon(tcpip::Storage& inputStorage, PositionVecto
 
 
 void
-TraCIServer::setTargetTime(SUMOTime targetTime) {
+TraCIServer::stateLoaded(SUMOTime targetTime) {
     myTargetTime = targetTime;
     for (auto& s : mySockets) {
         s.second->targetTime = targetTime;
+        for (auto& stateChange : s.second->vehicleStateChanges) {
+            stateChange.second.clear();
+        }
     }
 }
 

diff --git a/src/traci-server/TraCIServer.h b/src/traci-server/TraCIServer.h
@@ -239,9 +239,9 @@ class TraCIServer final : public MSNet::VehicleStateListener, public libsumo::Va
     /// @}
 
 
-    /// @brief Sets myTargetTime on server and sockets to the given value
+    /// @brief updates myTargetTime and resets vehicle state changes after loading a simulation state
     /// @note  Used in MSStateHandler to update the server's time after loading a state
-    void setTargetTime(SUMOTime targetTime);
+    void stateLoaded(SUMOTime targetTime);
 
     std::vector<std::string>& getLoadArgs() {
         return myLoadArgs;

diff --git a/src/traci-server/TraCIServerAPI_Simulation.cpp b/src/traci-server/TraCIServerAPI_Simulation.cpp
@@ -344,7 +344,7 @@ TraCIServerAPI_Simulation::processSet(TraCIServer& server, tcpip::Storage& input
                     return server.writeErrorStatusCmd(libsumo::CMD_SET_SIM_VARIABLE, "A string is needed for loading simulation state.", outputStorage);
                 }
                 double time = libsumo::Simulation::loadState(file);
-                TraCIServer::getInstance()->setTargetTime(TIME2STEPS(time));
+                TraCIServer::getInstance()->stateLoaded(TIME2STEPS(time));
             }
             break;
             case libsumo::CMD_MESSAGE: {