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

eclipse-sumo · Nov 28, 2024 · df0b0a8 · df0b0a8
2 parents 59188f8 + a747a55
commit df0b0a8
Show file tree

Hide file tree

Showing 680 changed files with 1,407 additions and 355 deletions.
diff --git a/data/po/it_sumo.po b/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-11-04 13:13+0100\n"
-"PO-Revision-Date: 2024-11-12 08:57+0000\n"
+"PO-Revision-Date: 2024-11-28 08:55+0000\n"
 "Last-Translator: Mirko Barthauer <[email protected]>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/eclipse-sumo/"
 "applications/it/>\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.8.2\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #: src/activitygen/AGActivityGen.cpp:46
 msgid "Reading input"
@@ -675,68 +675,80 @@ msgstr ""
 
 #: src/duarouter/RODUAFrame.cpp:142 src/marouter/ROMAFrame.cpp:202
 msgid "Choose a route choice method: gawron, logit, or lohse"
-msgstr ""
+msgstr "Scegli un metodo di scelta di itinerari: gawron, logit o lohse"
 
 #: src/duarouter/RODUAFrame.cpp:145
 msgid "Use c-logit model (deprecated in favor of --route-choice-method logit)"
 msgstr ""
+"Usa il modello c-logit (diventato obsoleto con --route-choice-method logit)"
 
 #: src/duarouter/RODUAFrame.cpp:149
 msgid "Use FLOAT as logit's beta"
-msgstr ""
+msgstr "Usa FLOAT come beta di logit"
 
 #: src/duarouter/RODUAFrame.cpp:153
 msgid "Use FLOAT as logit's gamma"
-msgstr ""
+msgstr "Usa FLOAT come gamma di logit"
 
 #: src/duarouter/RODUAFrame.cpp:157
 msgid "Use FLOAT as logit's theta (negative values mean auto-estimation)"
 msgstr ""
+"Usa FLOAT come theta di logit (valori negativi provocano una estimazione "
+"automatica)"
 
 #: src/duarouter/RODUAFrame.cpp:160 src/microsim/MSFrame.cpp:647
 msgid ""
 "Use FLOAT as a factor on pedestrian maximum speed during intermodal routing"
 msgstr ""
+"Usa FLOAT come fattore della velocità pedonale massima durante "
+"l'instradamento intermodale"
 
 #: src/duarouter/RODUAFrame.cpp:163 src/microsim/MSFrame.cpp:650
 msgid ""
 "Use FLOAT as a factor on walking speed against vehicle traffic direction"
 msgstr ""
+"Usa FLOAT come fattore della velocità pedonale camminando contro la "
+"direzione del traffico veicolare"
 
 #: src/duarouter/RODUAFrame.cpp:170 src/microsim/MSFrame.cpp:657
 msgid "Where taxis can drop off customers ('allJunctions, 'ptStops')"
 msgstr ""
+"Dove i taxi possono far scendere i passeggeri ('allJunctions', 'ptStops')"
 
 #: src/duarouter/RODUAFrame.cpp:173 src/microsim/MSFrame.cpp:660
 msgid "Where taxis can pick up customers ('allJunctions, 'ptStops')"
-msgstr ""
+msgstr "Dove i taxi possono far salire passeggeri ('allJunctions, 'ptStops')"
 
 #: src/duarouter/RODUAFrame.cpp:176 src/microsim/MSFrame.cpp:666
 msgid "Estimated time for taxi pickup"
-msgstr ""
+msgstr "Durata estimata per la salita dei passeggeri sul taxi"
 
 #: src/duarouter/RODUAFrame.cpp:179 src/microsim/MSFrame.cpp:669
 msgid ""
 "Use FLOAT as a maximum train length when initializing the railway router"
 msgstr ""
+"Usa FLOAT come lunghezza massima dei treni nell'avvio dell'instradamento "
+"ferrioviario"
 
 #: src/duarouter/RODUAFrame.cpp:216
 msgid "Routing algorithm '%' does not support weight-attribute '%'."
 msgstr ""
+"L'algoritmo di instradamento '%' non permette l'uso dell'attributo di peso "
+"'%'."
 
 #: src/duarouter/RODUAFrame.cpp:220
 #, c-format
 msgid "Routing algorithm '%' does not support bulk routing."
-msgstr ""
+msgstr "L'algoritmo di instradamento '%' non permette instradamento massivo."
 
 #: src/duarouter/RODUAFrame.cpp:228 src/marouter/ROMAFrame.cpp:243
 msgid "Invalid route choice method '%'."
-msgstr ""
+msgstr "Metodo di scelta di itinerario invalido '%'."
 
 #: src/duarouter/RODUAFrame.cpp:232
 msgid ""
 "The --logit option is deprecated, please use --route-choice-method logit."
-msgstr ""
+msgstr "L'opzione --logit è obsoleta, va usato --route-choice-method logit."
 
 #: src/duarouter/RODUAFrame.cpp:244
 msgid "Cannot derive file name for alternatives output, skipping it."
@@ -755,11 +767,11 @@ msgstr ""
 
 #: src/duarouter/duarouter_main.cpp:152 src/marouter/marouter_main.cpp:180
 msgid "Unknown routing Algorithm '%'!"
-msgstr ""
+msgstr "Algoritmo di instradamento sconosciuto '%'!"
 
 #: src/duarouter/duarouter_main.cpp:179 src/marouter/marouter_main.cpp:210
 msgid "No weight data was loaded for attribute '%'."
-msgstr ""
+msgstr "I dati di peso non sono stati caricati per l'attributo '%'."
 
 #: src/duarouter/duarouter_main.cpp:216
 msgid ""
@@ -770,35 +782,35 @@ msgstr ""
 #: src/jtrrouter/ROJTREdge.cpp:64
 #, c-format
 msgid "The edges '%' and '%' are not connected."
-msgstr ""
+msgstr "Gli archi '%' e '%' non sono connessi."
 
 #: src/jtrrouter/ROJTRFrame.cpp:59
 msgid "Read turning ratios from FILE(s)"
-msgstr ""
+msgstr "Leggi quote di svolta da uno o più FILE"
 
 #: src/jtrrouter/ROJTRFrame.cpp:69
 msgid "Use STR[] as default turn definition"
-msgstr ""
+msgstr "Usa STR[] come definizione di svolta standard"
 
 #: src/jtrrouter/ROJTRFrame.cpp:73
 msgid "Use STR[] as list of sink edges"
-msgstr ""
+msgstr "Usa STR[] come elenco di archi di scarico"
 
 #: src/jtrrouter/ROJTRFrame.cpp:76
 msgid "Whether all edges are allowed as sink edges"
-msgstr ""
+msgstr "Se tutti gli archi possono essere usati come scarico"
 
 #: src/jtrrouter/ROJTRFrame.cpp:79
 msgid "Ignore road restrictions based on vehicle class"
-msgstr ""
+msgstr "Ignora restrizioni basate su la classe di veicolo"
 
 #: src/jtrrouter/ROJTRFrame.cpp:82
 msgid "Allow to re-use a road"
-msgstr ""
+msgstr "Permetti di riutilizzare una via"
 
 #: src/jtrrouter/ROJTRFrame.cpp:85
 msgid "Use all source edges as sink edges."
-msgstr ""
+msgstr "Utilizza tutti gli archi di sorgente anche come archi di scarico."
 
 #: src/jtrrouter/ROJTRFrame.cpp:88
 msgid ""
@@ -5522,19 +5534,21 @@ msgstr ""
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:381
 msgid "Found % bidirectional rail edges"
-msgstr ""
+msgstr "Trovati % archi ferroviari bidirezionali"
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:407
 msgid "Found % railway edges and % railway nodes (% signals)."
-msgstr ""
+msgstr "Trovati % archi ferroviari e % nodi ferrovioari (% segnali)."
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:524
 msgid "Added % bidi-edges as extension of existing bidi edges."
 msgstr ""
+"% archi bidirezionali sono stati aggiunti come estensione di archi "
+"bidirezionali preesistenti."
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:535
 msgid "Could not find bidi-edge for edge '%'"
-msgstr ""
+msgstr "Non ho potuto trovare l'arco bidirezionale per l'arco '%'"
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:640
 msgid "Found % reversible edge sequences between broken rail nodes"
@@ -5603,7 +5617,7 @@ msgstr "% segnali ferroviari sono stati aggiunti a % fermate."
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:1496
 msgid "Could not straighten corridor %."
-msgstr ""
+msgstr "Non ho potuto appianare il corridoio %."
 
 #: src/netbuild/NBAlgorithms_Railway.cpp:1501
 msgid "Moved % rail junctions for straightening % corridors."
@@ -11478,20 +11492,21 @@ msgstr "Inizia il generatore di numeri casuali con il valore dato"
 #: src/utils/common/SUMOVehicleClass.cpp:199
 msgid "Simultaneous specification of vClasses and exceptions is not allowed"
 msgstr ""
+"Non si possono specificare classi di veicoli e eccezioni allo stesso tempo"
 
 #: src/utils/common/SUMOVehicleClass.cpp:203
 msgid "StopOffset requires an offset value"
-msgstr ""
+msgstr "StopOffset richiede un valore di spostamento"
 
 #: src/utils/common/SUMOVehicleClass.cpp:354
 #, c-format
 msgid "Unknown vehicle class '%' ignored."
-msgstr ""
+msgstr "Ignorata classe di veicoli sconosciuta '%'."
 
 #: src/utils/common/SUMOVehicleClass.cpp:356
 #, c-format
 msgid "Unknown vehicle class '%' encountered."
-msgstr ""
+msgstr "Incontrata classe di veicoli sconosciuta '%'."
 
 #: src/utils/common/SUMOVehicleClass.cpp:398
 msgid ""
@@ -11502,15 +11517,15 @@ msgstr ""
 #: src/utils/common/SUMOVehicleClass.cpp:438
 #, c-format
 msgid "The vehicle class '%' is deprecated, use '%' instead."
-msgstr ""
+msgstr "La classe di veicoli '%' non si usa più - invece scegli '%'."
 
 #: src/utils/common/SystemFrame.cpp:43
 msgid "Loads the named config on startup"
-msgstr ""
+msgstr "Carica la configurazione indicata all'inizio"
 
 #: src/utils/common/SystemFrame.cpp:48
 msgid "Saves current configuration into FILE"
-msgstr ""
+msgstr "Salva la configurazione attuale in FILE"
 
 #: src/utils/common/SystemFrame.cpp:52
 msgid "Enforce relative paths when saving the configuration"
@@ -12585,18 +12600,20 @@ msgstr ""
 #: src/utils/xml/GenericHandler.cpp:83 src/utils/xml/GenericSAXHandler.cpp:105
 msgid "Found root element '%' in file '%' (expected '%')."
 msgstr ""
+"L'elemento radice '%' è stato trovato nel file '%' (invece di quello "
+"aspettato '%')."
 
 #: src/utils/xml/GenericSAXHandler.cpp:209
 msgid " In file '"
-msgstr ""
+msgstr " In file '"
 
 #: src/utils/xml/GenericSAXHandler.cpp:210
 msgid " At line/column "
-msgstr ""
+msgstr " In linea/colonna "
 
 #: src/utils/xml/SAXWeightsHandler.cpp:145
 msgid "Missing value '%' in edge '%'."
-msgstr ""
+msgstr "Valore mancante '%' nell'arco '%'."
 
 #: src/utils/xml/SUMOSAXReader.cpp:110 src/utils/xml/SUMOSAXReader.cpp:136
 msgid "Cannot read file '%'!"
@@ -12605,7 +12622,7 @@ msgstr ""
 #: src/utils/xml/SUMOSAXReader.cpp:113 src/utils/xml/SUMOSAXReader.cpp:139
 #, c-format
 msgid "File '%' is a directory!"
-msgstr ""
+msgstr "File '%' è una cartella!"
 
 #: src/utils/xml/SUMOSAXReader.cpp:156 src/utils/xml/SUMOSAXReader.cpp:165
 msgid "The XML-parser was not initialized."

diff --git a/docs/web/docs/Developer/HowToRelease.md b/docs/web/docs/Developer/HowToRelease.md
@@ -130,8 +130,7 @@ If everything is fine:
 - make new sumo.dlr.de-release
   - copy the folder from S:\Releases to the releases dir `scp -r /media/S/Releases/x.y.z [email protected]:docs/releases`
 - update the eclipse.dev/sumo website
-  - modify the version number (Version) and the DOI number (DOI) [in config.yaml](https://github.com/eclipse-sumo/sumo.website/blob/main/src/config/_default/config.yaml) in the **Default Parameters** section
-  - generate the static files `cd src && hugo -d ../` and commit them
+  - modify the version number (Version) and the DOI number (DOI) [in config.yaml](https://github.com/eclipse-sumo/sumo.website/blob/source/config/_default/config.yaml) in the **Default Parameters** section
 - make new sourceforge-release
   - make a new release within the sumo package (named "version x.y.z")
   - add files to the release

diff --git a/docs/web/docs/Simulation/Output/TripInfo.md b/docs/web/docs/Simulation/Output/TripInfo.md
@@ -111,7 +111,7 @@ This adds the following line:
 ```xml
 <tripinfos>
     <tripinfo id="<VEHICLE_ID>" ... vtype="<VEHICLE_TYPE_ID>">
-        <battery depleted="..."/>
+        <battery depleted="..." actualBatteryCapacity="..." totalEnergyConsumed="..." totalEnergyRegenerated="..."/>
     </tripinfo>
     ... information about further vehicles ...
 
@@ -120,9 +120,12 @@ This adds the following line:
 
 with the attributes as following
 
-| Name         | Type | Description                                                                        |
-| ------------ | ---- | ---------------------------------------------------------------------------------- |
-| `depleted`   | -   | The times the vehicle wanted to consume more energy than the battery could provide |
+| Name                      | Type | Description                                                                         |
+| ------------------------- | ---- | ----------------------------------------------------------------------------------- |
+| `depleted`                | -    | The times the vehicle wanted to consume more energy than the battery could provide  |
+| `actualBatteryCapacity`   | Wh   | Battery capacity of the vehicle after completing its route                          |
+| `totalEnergyConsumed`     | Wh   | Cumulative sum of energy consumption after completing the route                     |
+| `totalEnergyRegenerated`  | Wh   | Cumulative sum of regenerated energy after completing the route                     |
 
 
 ## Output for vehicles that have not arrived at simulation end

diff --git a/src/guisim/GUIVehicle.cpp b/src/guisim/GUIVehicle.cpp
@@ -964,7 +964,7 @@ GUIVehicle::getDriveWays() const {
             result.push_back(dw->getID());
         }
     }
-    return joinToStringSorting(result, " ");
+    return StringUtils::wrapText(joinToStringSorting(result, " "), 60);
 }
 
 double

diff --git a/src/microsim/MSLink.cpp b/src/microsim/MSLink.cpp
@@ -939,6 +939,14 @@ MSLink::blockedAtTime(SUMOTime arrivalTime, SUMOTime leaveTime, double arrivalSp
                     || ego->getVehicleType().getParameter().getJMParam(SUMO_ATTR_JM_IGNORE_FOE_PROB, 0) < RandHelper::rand(ego->getRNG()))
                     && !ignoreFoe(ego, it.first)
                     && !((arrivalTime > it.second.leavingTime) || (leaveTime < it.second.arrivalTime))) {
+                if (ego == nullptr) {
+                    // during insertion
+                    if (myJunction->getType() == SumoXMLNodeType::RAIL_CROSSING) {
+                        continue;
+                    } else {
+                        return true;
+                    }
+                }
                 // check whether braking is feasible (ego might have started to accelerate already)
                 const auto& cfm = ego->getVehicleType().getCarFollowModel();
 #ifdef MSLink_DEBUG_OPENED

diff --git a/src/microsim/devices/MSDevice_Battery.cpp b/src/microsim/devices/MSDevice_Battery.cpp
@@ -584,6 +584,9 @@ MSDevice_Battery::generateOutput(OutputDevice* tripinfoOut) const {
     if (tripinfoOut != nullptr) {
         tripinfoOut->openTag("battery");
         tripinfoOut->writeAttr("depleted", toString(myDepletedCount));
+        tripinfoOut->writeAttr("actualBatteryCapacity", toString(myActualBatteryCapacity));
+        tripinfoOut->writeAttr("totalEnergyConsumed", toString(myTotalConsumption));
+        tripinfoOut->writeAttr("totalEnergyRegenerated", toString(myTotalRegenerated));
         tripinfoOut->closeTag();
     }
 }

diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -1144,7 +1144,7 @@ MSDriveWay::findFlankProtection(MSLink* link, MSLink* origLink, std::vector<cons
 #ifdef DEBUG_CHECK_FLANKS
     std::cout << "  findFlankProtection link=" << link->getDescription() << " origLink=" << origLink->getDescription() << "\n";
 #endif
-    if (link->getCorrespondingEntryLink()->getTLLogic() != nullptr) {
+    if (link->getCorrespondingEntryLink()->getTLLogic() != nullptr && link->getJunction()->getType() == SumoXMLNodeType::RAIL_SIGNAL) {
         MSLink* entry = const_cast<MSLink*>(link->getCorrespondingEntryLink());
         // guarded by signal
 #ifdef DEBUG_CHECK_FLANKS
@@ -1178,6 +1178,21 @@ MSDriveWay::findFlankProtection(MSLink* link, MSLink* origLink, std::vector<cons
                 findFlankProtection(predLinks.front(), origLink, flank);
             }
         }
+        // check for insertions
+        if (myDepartureDriveways.count(&lane->getEdge()) != 0) {
+            for (MSDriveWay* foe : myDepartureDriveways[&lane->getEdge()]) {
+                if (flankConflict(*foe)) {
+#ifdef DEBUG_ADD_FOES
+                    std::cout << "  foe " << foe->getID() << " departs on flank=" << lane->getID() << "\n";
+#endif
+                    myFoes.push_back(foe);
+                } else {
+#ifdef DEBUG_ADD_FOES
+                    std::cout << "  cand foe " << foe->getID() << " departs on flank=" << lane->getID() << " rejected\n";
+#endif
+                }
+            }
+        }
     }
 }