Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

# Conflicts:
#	tests/netedit/elements/demands/personplan/testsuite.netedit.daily.elements.demands.personplans.rides
#	tests/netedit/elements/demands/personplan/testsuite.netedit.daily.elements.demands.personplans.walks

.github/workflows/build-macos.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
     runs-on: ${{ matrix.os }}
     env:
       CCACHE_COMPILERTYPE: clang

.github/workflows/wheel-macos.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-14]
         python_version: [3.8, 3.9, '3.10', 3.11, 3.12]
         exclude:
           - os: macos-14
@@ -88,8 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-13]
-        # os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
         python_version: [3.8, 3.9, '3.10', 3.11, 3.12]
         # exclude:
         #   - os: macos-14

data/po/de_sumo.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2024-07-22 10:12+0200\n"
-"PO-Revision-Date: 2024-08-21 11:38+0000\n"
+"PO-Revision-Date: 2024-09-19 16:24+0000\n"
 "Last-Translator: Mirko Barthauer <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/eclipse-sumo/"
 "applications/de/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7\n"
+"X-Generator: Weblate 5.8-dev\n"
 
 #: src/activitygen/AGActivityGen.cpp:46
 msgid "Reading input"
@@ -1541,7 +1541,7 @@ msgstr "Das Fahrzeug '%' unterstützt den Knotenpunktmodellparameter '%' nicht."
 
 #: src/microsim/MSBaseVehicle.cpp:2271
 msgid "could not interpret routing.mode '%'"
-msgstr ""
+msgstr "der Wert '%' von routing.mode konnte nicht interpretiert werden"
 
 #: src/microsim/MSBaseVehicle.cpp:2354
 msgid "Invalid device parameter '%' for vehicle '%'."
@@ -1578,6 +1578,8 @@ msgstr ""
 #: src/microsim/MSBaseVehicle.cpp:2390
 msgid "Invalid check for device. Expected format is 'has.DEVICENAME.device'."
 msgstr ""
+"Ungültige Abfrage nach einer Einrichtung. Das erwartete Format lautet 'has."
+"DEVICENAME.device'."
 
 #: src/microsim/MSBaseVehicle.cpp:2417
 msgid "Unsupported parking parameter '%' for vehicle '%'."
@@ -3039,21 +3041,27 @@ msgstr "Fahrzeug '%' wird teleportier; % mit Fahrzeug '%"
 
 #: src/microsim/MSLane.cpp:2057
 msgid "Removing % participants: vehicle '%', vehicle '%"
-msgstr ""
+msgstr "Es werden % Teilnehmer entfernt: Fahrzeug '%', Fahrzeug '%"
 
 #: src/microsim/MSLane.cpp:2070
 msgid "Keeping remote-controlled % participants: vehicle '%', vehicle '%"
 msgstr ""
+"Es werden % extern gesteuerte Teilnehmer beibehalten: Fahrzeug '%', Fahrzeug "
+"'%"
 
 #: src/microsim/MSLane.cpp:2072
 msgid ""
 "Removing % participant: vehicle '%', keeping remote-controlled vehicle '%"
 msgstr ""
+"Es wird % Teilnehmer entfernt: Fahrzeug '%'; Beibehalten des extern "
+"gesteuerten Fahrzeugs '%"
 
 #: src/microsim/MSLane.cpp:2075
 msgid ""
 "Keeping remote-controlled % participant: vehicle '%', removing vehicle '%"
 msgstr ""
+"Es wird % extern gesteuerter Teilnehmer beibehalten: Fahrzeug '%'; Entfernt "
+"wird Fahrzeug '%"
 
 #: src/microsim/MSLane.cpp:2086
 msgid ", latGap="
@@ -3190,7 +3198,7 @@ msgstr "Zu viele Teleports."
 
 #: src/microsim/MSNet.cpp:945
 msgid "TraCI issued load command."
-msgstr ""
+msgstr "TraCI hat eine Ladeanweisung ausgegeben."
 
 #: src/microsim/MSNet.cpp:947
 msgid "Unknown reason."
@@ -4613,6 +4621,7 @@ msgid ""
 "Scale battery need with this factor to account for unexpected traffic "
 "situations"
 msgstr ""
+"Energiebedarf mit diesem Faktor für unvorhergesehene Verkehrslage skalieren"
 
 #: src/microsim/devices/MSDevice_StationFinder.cpp:67
 msgid "Battery percentage to go into rescue mode"
@@ -4628,6 +4637,8 @@ msgid ""
 "Euclidean search distance in meters (a negative value disables the "
 "restriction)"
 msgstr ""
+"Euklidische Suchentfernung in Metern (ein negativer Wert deaktiviert die "
+"Einschränkung)"
 
 #: src/microsim/devices/MSDevice_StationFinder.cpp:73
 msgid "When to trigger a new search if no station has been found"

data/po/it_sumo.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2024-07-22 10:12+0200\n"
-"PO-Revision-Date: 2024-09-17 09:31+0000\n"
+"PO-Revision-Date: 2024-09-20 11:47+0000\n"
 "Last-Translator: Mirko Barthauer <[email protected]>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/eclipse-sumo/"
 "applications/it/>\n"
@@ -7288,19 +7288,21 @@ msgstr "Probabilità di nodi di avere esattamente 6 vicini"
 
 #: src/netgen/NGFrame.cpp:215
 msgid "Place nodes on a regular grid with spacing rand.min-distance"
-msgstr ""
+msgstr "Posiziona nodi su una griglia regolare a distanza di rand.min-distance"
 
 #: src/netgen/NGFrame.cpp:235
 msgid "You have to specify the type of network to generate."
-msgstr ""
+msgstr "Devi specificare il tipo di rete da generare."
 
 #: src/netgen/NGFrame.cpp:239
 msgid "You may specify only one type of network to generate at once."
-msgstr ""
+msgstr "Si può specificare soltanto un tipo di rete da generare alla volta."
 
 #: src/netgen/NGFrame.cpp:274
 msgid "Option 'random-type' takes no effect unless 'type-files' are loaded"
 msgstr ""
+"L'opzione 'random-type' mostra un'effetto soltanto se 'type-files' vengono "
+"caricati"
 
 #: src/netgen/netgen_main.cpp:90
 msgid ""
@@ -7311,22 +7313,26 @@ msgstr ""
 
 #: src/netgen/netgen_main.cpp:120
 msgid "Spider networks need at least 3 arms."
-msgstr ""
+msgstr "Reti di ragnatela necessitano almeno 3 rami."
 
 #: src/netgen/netgen_main.cpp:124
 msgid "Spider networks with many arms should use option spider.omit-center"
 msgstr ""
+"Si dovrebbe applicare l'opzione spider.omit-center nel caso di reti di "
+"ragnatela con molti rami"
 
 #: src/netgen/netgen_main.cpp:127
 msgid "Spider networks need at least one circle."
-msgstr ""
+msgstr "Reti di ragnatela necessitano almeno un cerchio."
 
 #: src/netgen/netgen_main.cpp:135
 #, c-format
 msgid ""
 "The radius of spider networks should be at least % for the given lanenumber, "
 "lanewidth and junction radius"
 msgstr ""
+"Il raggio di reti di ragnatele dovrebbe essere di almeno % considerando il "
+"numero di corsie, la larghezza di corsia e il raggio di incroci dati"
 
 #: src/netgen/netgen_main.cpp:177
 msgid ""
@@ -7525,6 +7531,8 @@ msgstr ""
 #: src/netimport/NIFrame.cpp:194
 msgid "Whether one-way roads should be spread to the side instead of centered"
 msgstr ""
+"Se vie a senso unico devono essere posizionate verso il lato oppure verso il "
+"centro"
 
 #: src/netimport/NIFrame.cpp:197
 msgid "Import lane-specific access restrictions"
@@ -7550,19 +7558,19 @@ msgstr "Importa frecce di svolta da OSM per la creazione di collegamenti"
 
 #: src/netimport/NIFrame.cpp:213
 msgid "The default length of a public transport stop in FLOAT m"
-msgstr ""
+msgstr "La lunghezza standard di una fermata di trasporto pubblico in FLOAT m"
 
 #: src/netimport/NIFrame.cpp:215
 msgid "The default length of a bus stop in FLOAT m"
-msgstr ""
+msgstr "La lunghezza standard di una fermata di autobus in FLOAT m"
 
 #: src/netimport/NIFrame.cpp:217
 msgid "The default length of a tram stop in FLOAT m"
-msgstr ""
+msgstr "La lunghezza standard di una fermata tranviaria in FLOAT m"
 
 #: src/netimport/NIFrame.cpp:219
 msgid "The default length of a train stop in FLOAT m"
-msgstr ""
+msgstr "La lunghezza standard di una fermata ferroviaria in FLOAT m"
 
 #: src/netimport/NIFrame.cpp:222
 msgid "Specify custom rules for importing railway signals"
@@ -8882,11 +8890,13 @@ msgstr "Le classi di veicolo '%' dei file ingresso non si usano più."
 
 #: src/netimport/NINavTeqHelper.cpp:61
 msgid "Invalid speed code (edge '%')."
-msgstr ""
+msgstr "Codice di velocità invalido (arco '%')."
 
 #: src/netimport/NINavTeqHelper.cpp:64
 msgid "Non-numerical value for an edge's speed type occurred (edge '%')."
 msgstr ""
+"Un valore non numerico per il tipo di velocità dell'arco è stato incontrato ("
+"arco '%')."
 
 #: src/netimport/NINavTeqHelper.cpp:90
 msgid "Invalid lane number (edge '%')."
@@ -8899,7 +8909,7 @@ msgstr ""
 
 #: src/netimport/NITypeLoader.cpp:62
 msgid "Could not open %-file '%'."
-msgstr ""
+msgstr "Non ho potuto leggere il file % '%'."
 
 #: src/netimport/NIVisumTL.cpp:76
 msgid "invalid node for traffic light '%'"
@@ -8908,6 +8918,8 @@ msgstr "nodo invalido per il semaforo '%'"
 #: src/netimport/NIXMLConnectionsHandler.cpp:219
 msgid "Unable to project shape for connection from edge '%' to edge '%'."
 msgstr ""
+"La forma del collegamento tra l'arco '%' e l'arco '%' non poteva essere "
+"proiettata."
 
 #: src/netimport/NIXMLConnectionsHandler.cpp:227
 msgid "Could not set loaded connection from lane '%' to lane '%'."
@@ -8954,7 +8966,7 @@ msgstr "L'arco '%' non tocca il nodo '%'."
 #: src/netimport/NIXMLConnectionsHandler.cpp:421
 #, c-format
 msgid "Crossing at controlled node '%' must be prioritized"
-msgstr ""
+msgstr "Il passaggio pedonale del nodo controllato '%' deve essere prioritario"
 
 #: src/netimport/NIXMLConnectionsHandler.cpp:426
 msgid "Unable to project shape for crossing at node '%'."
@@ -8971,7 +8983,7 @@ msgstr ""
 #: src/netimport/NIXMLConnectionsHandler.cpp:478
 #, c-format
 msgid "Edge '%' for walkingArea at node '%' is not known."
-msgstr ""
+msgstr "L'arco '%' per l'area pedonale nel nodo '%' è sconosciuta."
 
 #: src/netimport/NIXMLConnectionsHandler.cpp:504
 msgid "Unable to project shape for walkingArea at node '%'."
@@ -11596,51 +11608,57 @@ msgstr ""
 #: src/utils/options/OptionsCont.cpp:175
 #, c-format
 msgid "No option with the name '%' exists."
-msgstr ""
+msgstr "Non esiste nessun'opzione con il nome '%'."
 
 #: src/utils/options/OptionsCont.cpp:192
 #, c-format
 msgid ""
 "Please note that '%' is deprecated.\n"
 " Use '%' instead."
 msgstr ""
+"Nota che '%' è obsoleto.\n"
+" Usa '%' al suo posto."
 
 #: src/utils/options/OptionsCont.cpp:388
 #, c-format
 msgid "The file list for '%' is empty."
-msgstr ""
+msgstr "L'elenco file per '%' è vuoto."
 
 #: src/utils/options/OptionsCont.cpp:394
 msgid "File '%' is not accessible (%)."
-msgstr ""
+msgstr "Il file '%' non è accessibile (%)."
 
 #: src/utils/options/OptionsCont.cpp:397
 msgid "Empty file name given; ignoring."
-msgstr ""
+msgstr "Il nome del file dato è vuoto; va ignorato."
 
 #: src/utils/options/OptionsCont.cpp:418
 msgid "Option '%' needs option '%'."
-msgstr ""
+msgstr "L'opzione '%' necessita l'opzione '%'."
 
 #: src/utils/options/OptionsCont.cpp:432
 msgid ""
 "A value for the option '%' was already set.\n"
 " Possible synonymes: "
 msgstr ""
+"Un valore è già stato impostasto per l'opzione '%'.\n"
+" Sinonimi possibili: "
 
 #: src/utils/options/OptionsCont.cpp:621 src/utils/options/OptionsCont.cpp:642
 msgid " Build features: "
-msgstr ""
+msgstr " Caratteristische del build: "
 
 #: src/utils/options/OptionsCont.cpp:625
 msgid ""
 " License EPL-2.0: Eclipse Public License Version 2 <https://eclipse.org/"
 "legal/epl-v20.html>"
 msgstr ""
+" Licenza EPL-2.0: Eclipse Public License Versione 2 <https://eclipse.org/"
+"legal/epl-v20.html>"
 
 #: src/utils/options/OptionsCont.cpp:626
 msgid " Use --help to get the list of options."
-msgstr ""
+msgstr " Usa --help per accedere all'elenco di opzioni."
 
 #: src/utils/options/OptionsCont.cpp:673
 msgid "Could not save configuration to '%'"

docs/web/docs/Tools/Drt.md

@@ -104,7 +104,7 @@ Also [pre-booking](../Simulation/Taxi.md#prebooking) is possible.
 | **-d --cost-type** | str('distance' or 'time') | distance | defines if distance or time is used as costs for the dispatch |
 | **-f --drf**   | float           | 1.5              | direct route factor: factor for maximum allowed cost for the route of a request in relation to the minimum possible cost (of the direct route); use '-1' to ignore this constraint |
 | **-a --fix-allocation** | bool   | false            | if true: as soon as a solution was found and a request was assigned to a taxi, this assignment keeps up for all following calculations |
-| **-w --waiting-time** | int (seconds) | 900s        | maximum waiting time until service after spontaneous booking or the earliest pick-up time |
+| **-w --waiting-time** | int (seconds) | 900s        | maximum waiting time until service after spontaneous booking or the earliest pick-up time; use '-1' for ignoring the waiting time |
 | **-p --penalty-factor** | 'dynamic' or int | 'dynamic' | factor for different penalties of constraints in realtion to the routing costs; 'dynamic' prefers holding constraints of already accepted requests, than accepting new requests |
 
 For further help on the command line arguments run:

src/mesosim/MEVehicle.cpp

@@ -294,7 +294,7 @@ MEVehicle::resumeFromStopping() {
             MSStopOut::getInstance()->stopEnded(this, stop.pars, mySegment->getEdge().getID());
         }
         myPastStops.push_back(stop.pars);
-        myPastStops.back().routeIndex = stop.edge - myRoute->begin();
+        myPastStops.back().routeIndex = (int)(stop.edge - myRoute->begin());
         if (myAmRegisteredAsWaiting && (stop.triggered || stop.containerTriggered || stop.joinTriggered)) {
             MSNet::getInstance()->getVehicleControl().unregisterOneWaiting();
             myAmRegisteredAsWaiting = false;

src/microsim/MSBaseVehicle.cpp

@@ -288,9 +288,9 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
             // avoid superfluous waypoints for first and last edge
             const bool skipFirst = stops.front() == source && (source != getEdge() || sourcePos + getBrakeGap() <= firstPos + NUMERICAL_EPS);
             const bool skipLast = (stops.back() == sink
-                    && myArrivalPos >= lastPos
-                    && (stops.size() < 2 || stops.back() != stops[stops.size() - 2])
-                    && (stops.size() > 1 || skipFirst));
+                                   && myArrivalPos >= lastPos
+                                   && (stops.size() < 2 || stops.back() != stops[stops.size() - 2])
+                                   && (stops.size() > 1 || skipFirst));
 
 #ifdef DEBUG_REROUTE
             if (DEBUG_COND) {
@@ -1412,7 +1412,7 @@ MSBaseVehicle::addStop(const SUMOVehicleParameter::Stop& stopPar, std::string& e
                    + "' set to end at " + time2string(stop.getUntil())
                    + " earlier than arrival at " + time2string(stop.pars.arrival) + ".";
     }
-    setSkips(stop, myStops.size());
+    setSkips(stop, (int)myStops.size());
     myStops.insert(iter, stop);
     //std::cout << " added stop " << errorMsgStart << " totalStops=" << myStops.size() << " searchStart=" << (*searchStart - myRoute->begin())
     //    << " routeIndex=" << (stop.edge - myRoute->begin())
@@ -1431,7 +1431,7 @@ MSBaseVehicle::setSkips(MSStop& stop, int prevActiveStops) {
         MSRouteIterator itPrev;
         double prevEndPos;
         if (prevActiveStops > 0) {
-            assert(myStops.size() >= prevActiveStops);
+            assert((int)myStops.size() >= prevActiveStops);
             auto prevStopIt = myStops.begin();
             std::advance(prevStopIt, prevActiveStops - 1);
             const MSStop& prev = *prevStopIt;
@@ -1456,7 +1456,7 @@ MSBaseVehicle::setSkips(MSStop& stop, int prevActiveStops) {
         }
         if (foundSkips > 0) {
             //std::cout << "   foundSkips=" << foundSkips << "\n";
-            const_cast<SUMOVehicleParameter::Stop&>(stop.pars).index = myPastStops.size() + prevActiveStops + foundSkips;
+            const_cast<SUMOVehicleParameter::Stop&>(stop.pars).index = (int)myPastStops.size() + prevActiveStops + foundSkips;
         }
     }
 }

src/microsim/MSVehicle.cpp

@@ -7230,7 +7230,7 @@ MSVehicle::resumeFromStopping() {
             myState.myPosLat = 0;
         }
         myPastStops.push_back(stop.pars);
-        myPastStops.back().routeIndex = stop.edge - myRoute->begin();
+        myPastStops.back().routeIndex = (int)(stop.edge - myRoute->begin());
         myStops.pop_front();
         myStopDist = std::numeric_limits<double>::max();
         // do not count the stopping time towards gridlock time.