Merge remote-tracking branch 'remotes/origin/main' into Netedit_dev

# Conflicts: # tests/netedit/contextualMenuOperations.py # tests/netedit/network/edges/contextual_menu/edge_operations/add_reverse_direction/net.tll.xml # tests/netedit/network/edges/contextual_menu/edge_operations/testsuite.netedit # tests/netedit/network/edges/contextual_menu/edge_operations/testsuite.neteditcheckoutput # tests/netedit/network/edges/contextual_menu/lane_operations/remove_restricted_lane/testsuite.netedit # tests/netedit/network/edges/contextual_menu/lane_operations/remove_restricted_lane/testsuite.neteditcheckoutput # tests/netedit/network/edges/contextual_menu/lane_operations/testsuite.netedit # tests/netedit/network/edges/contextual_menu/lane_operations/testsuite.neteditcheckoutput # tests/netedit/network/edges/contextual_menu/lane_operations/transform_restricted_lane/testsuite.netedit # tests/netedit/network/edges/contextual_menu/lane_operations/transform_restricted_lane/testsuite.neteditcheckoutput # tests/netedit/network/edges/contextual_menu/reset_lenght/net.tll.xml # tests/netedit/network/edges/contextual_menu/template_operations/testsuite.netedit # tests/netedit/network/edges/contextual_menu/template_operations/testsuite.neteditcheckoutput # tests/netedit/network/edges/contextual_menu/testsuite.netedit # tests/netedit/network/edges/contextual_menu/testsuite.neteditcheckoutput # tests/netedit/network/edges/inspect_selected/allow_dialog/net.netccfg # tests/netedit/network/edges/inspect_selected/allow_dialog/net.tll.xml # tests/netedit/network/edges/inspect_selected/stopexception_dialog/net.netccfg # tests/netedit/network/edges/inspect_selected/stopexception_dialog/net.tll.xml # tests/netedit/network/edges/templates/net.tll.xml # tests/netedit/network/lanes/contextual_menu/remove_restricted_lane/testsuite.netedit # tests/netedit/network/lanes/contextual_menu/remove_restricted_lane/testsuite.neteditcheckoutput # tests/netedit/network/lanes/contextual_menu/transform_restricted_lane/testsuite.netedit # tests/netedit/network/lanes/contextual_menu/transform_restricted_lane/testsuite.neteditcheckoutput
eclipse-sumo · Aug 6, 2024 · 58a6bad · 58a6bad
2 parents d18e79a + d0e3e8e
commit 58a6bad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md b/docs/web/docs/TraCI/Interfacing_TraCI_from_Python.md
@@ -421,7 +421,7 @@ endEdge according to the estimated travel times in the network at the
 time of departure. For details of this mechanism see
 [Demand/Automatic_Routing](../Demand/Automatic_Routing.md).
 
-### coordinate transformations
+### Coordinate transformations
 
 ```python
 x, y = traci.vehicle.getPosition(vehID)

diff --git a/src/microsim/devices/MSDevice_StationFinder.cpp b/src/microsim/devices/MSDevice_StationFinder.cpp
@@ -262,7 +262,8 @@ MSDevice_StationFinder::notifyMove(SUMOTrafficObject& veh, double /*oldPos*/, do
             }
         }
     } else if (myChargingStation == nullptr &&
-               (myUpdateSoC - currentSoC > DEFAULT_SOC_INTERVAL || (mySearchState == SEARCHSTATE_UNSUCCESSFUL && now - myLastSearch >= myRepeatInterval))) {
+               (myUpdateSoC - currentSoC > DEFAULT_SOC_INTERVAL || (mySearchState == SEARCHSTATE_UNSUCCESSFUL &&
+                       now - myLastSearch >= myRepeatInterval && !myHolder.isStopped()))) {
         // check if a charging stop is already planned without the device, otherwise reroute inside this device
         if (!alreadyPlannedCharging() && now > myHolder.getDeparture()) {
             rerouteToChargingStation();