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

eclipse-sumo · Jan 27, 2025 · 669a24e · 669a24e
2 parents 254249c + b036265
commit 669a24e
Show file tree

Hide file tree

Showing 13 changed files with 401 additions and 394 deletions.
diff --git a/docs/web/docs/Simulation/Routing.md b/docs/web/docs/Simulation/Routing.md
@@ -155,8 +155,7 @@ also be set using *traci.edge.setEffort*.
 !!! caution
     The default effort value is 0 which causes detour routes to be preferred when not loading sensible effort values.
 
-The applications [duarouter](../duarouter.md) and [marouter](../marouter.md) also support the options **--weight-file** and **--weight-attribute** but they can only be used with one of the weight attributes "CO", "CO2", "PMx", "HC", "NOx", "fuel", "electricity", "noise". However, they will still work as expected when the user loads custom effort values for these attributes.
-
+The applications [duarouter](../duarouter.md) and [marouter](../marouter.md) also support the options **--weight-file** and **--weight-attribute** and this may be used to ready any edge attribute value in the given file.
 
 # Routing by *distance*
 

diff --git a/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp b/src/microsim/traffic_lights/MSActuatedTrafficLightLogic.cpp
@@ -41,6 +41,7 @@
 
 //#define DEBUG_DETECTORS
 //#define DEBUG_PHASE_SELECTION
+//#define DEBUG_PHASE_SELECTION_CUSTOM
 #define DEBUG_COND (getID()=="C")
 
 // ===========================================================================
@@ -1173,7 +1174,12 @@ MSActuatedTrafficLightLogic::decideNextPhaseCustom(bool mustSwitch) {
     for (int next : getCurrentPhaseDef().nextPhases) {
         const MSPhaseDefinition* phase = myPhases[next];
         const std::string& condition = mustSwitch ? phase->finalTarget : phase->earlyTarget;
-        //std::cout << SIMTIME << " mustSwitch=" << mustSwitch << " condition=" << condition << "\n";
+#ifdef DEBUG_PHASE_SELECTION_CUSTOM
+        if (DEBUG_COND) {
+            std::cout << SIMTIME << " mustSwitch=" << mustSwitch << " cur=" << myStep << " next=" << next << " condition=" << condition
+                << " eval=" << (condition == "" ? NAN : evalExpression(condition)) << "\n";
+        }
+#endif
         if (condition != "") {
             // backward compatibility if a user redefined DEFAULT_CONDITION
             if (condition == DEFAULT_CONDITION && myConditions.count(DEFAULT_CONDITION) == 0) {

diff --git a/src/netedit/elements/additional/GNEAdditionalHandler.cpp b/src/netedit/elements/additional/GNEAdditionalHandler.cpp
diff --git a/src/netedit/elements/additional/GNEAdditionalHandler.h b/src/netedit/elements/additional/GNEAdditionalHandler.h
@@ -699,13 +699,16 @@ class GNEAdditionalHandler : public AdditionalHandler {
     GNEAdditional* getRerouterIntervalParent(const CommonXMLStructure::SumoBaseObject* sumoBaseObject) const;
 
     /// @brief parse edges
-    std::vector<GNEEdge*> parseEdges(const SumoXMLTag tag, const std::string &id, const std::vector<std::string>& edgeIDs);
+    std::vector<GNEEdge*> parseEdges(const SumoXMLTag tag, const std::string& id, const std::vector<std::string>& edgeIDs);
 
     /// @brief parse lanes
-    std::vector<GNELane*> parseLanes(const SumoXMLTag tag, const std::string &id, const std::vector<std::string>& laneIDs);
+    std::vector<GNELane*> parseLanes(const SumoXMLTag tag, const std::string& id, const std::vector<std::string>& laneIDs);
 
-    /// @brief check if given ID correspond to a duplicated additional
-    bool checkDuplicatedAdditional(const SumoXMLTag tag, const std::vector<SumoXMLTag> tags, const std::string& id);
+    /// @brief get element by ID
+    GNEAdditional* retrieveAdditionalElement(const std::vector<SumoXMLTag> tags, const std::string& id);
+
+    /// @brief check if element exist, and if overwritte
+    bool checkElement(const SumoXMLTag tag, GNEAdditional* additional);
 
     /// @brief struct for Netedit parameters
     struct NeteditParameters {

diff --git a/src/netedit/elements/data/GNEDataHandler.cpp b/src/netedit/elements/data/GNEDataHandler.cpp
@@ -273,13 +273,13 @@ GNEDataHandler::checkDuplicatedDataSet(const std::string& id) {
     if (dataSet) {
         if (!myAllowUndoRedo) {
             // only overwrite if allow undo-redo
-            return writeErrorDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
+            return writeWarningDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
         } else if (myOverwrite) {
             // delete demand element (and all of their childrens)
             myNet->deleteDataSet(dataSet, myNet->getViewNet()->getUndoList());
         } else {
             // duplicated dataSet
-            return writeErrorDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
+            return writeWarningDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
         }
     }
     return true;

diff --git a/src/netedit/elements/data/GNEMeanDataHandler.cpp b/src/netedit/elements/data/GNEMeanDataHandler.cpp
@@ -191,13 +191,13 @@ GNEMeanDataHandler::checkDuplicatedMeanDataElement(const SumoXMLTag tag, const s
     if (meanDataElement) {
         if (!myAllowUndoRedo) {
             // only overwrite if allow undo-redo
-            return writeErrorDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
+            return writeWarningDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
         } else if (myOverwrite) {
             // delete meanData element (and all of their childrens)
             myNet->deleteMeanData(meanDataElement, myNet->getViewNet()->getUndoList());
         } else {
             // duplicated demand
-            return writeErrorDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
+            return writeWarningDuplicated(SUMO_TAG_DATASET, id, SUMO_TAG_DATASET);
         }
     }
     return true;