fix #14517

eclipse-sumo · Mar 15, 2024 · 6fb8cf1 · 6fb8cf1
1 parent 89a60b0
commit 6fb8cf1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/src/netbuild/NBEdge.cpp b/src/netbuild/NBEdge.cpp
@@ -3880,9 +3880,7 @@ NBEdge::append(NBEdge* e) {
     myTo = e->myTo;
     myTurnSignTarget = e->myTurnSignTarget;
     myToBorder = e->myToBorder;
-    if (e->hasParameter("origTo")) {
-        setParameter("origTo", e->getParameter("origTo"));
-    }
+    mergeParameters(e->getParametersMap());
     if (e->mySignalPosition != Position::INVALID) {
         mySignalPosition = e->mySignalPosition;
     }

diff --git a/src/utils/common/Parameterised.cpp b/src/utils/common/Parameterised.cpp
@@ -61,6 +61,25 @@ Parameterised::updateParameters(const Parameterised::Map& mapArg) {
 }
 
 
+void
+Parameterised::mergeParameters(const Parameterised::Map& mapArg, const std::string separator, bool uniqueValues) {
+    for (const auto& keyValue : mapArg) {
+        if (hasParameter(keyValue.first)) {
+            bool append = true;
+            if (uniqueValues) {
+                if (getParameter(keyValue.first) == keyValue.second) {
+                    append = false;
+                }
+            }
+            if (append) {
+                setParameter(keyValue.first, getParameter(keyValue.first) + separator + keyValue.second);
+            }
+        } else {
+            setParameter(keyValue.first, keyValue.second);
+        }
+    }
+}
+
 bool
 Parameterised::hasParameter(const std::string& key) const {
     return myMap.find(key) != myMap.end();

diff --git a/src/utils/common/Parameterised.h b/src/utils/common/Parameterised.h
@@ -71,6 +71,11 @@ class Parameterised {
      */
     void updateParameters(const Parameterised::Map& mapArg);
 
+    /**@brief Adds or appends all given parameters from the map
+     * @param[in] mapArg The keys/values to insert
+     */
+    void mergeParameters(const Parameterised::Map& mapArg, const std::string separator = " ", bool uniqueValues = true);
+
     /**@brief Returns whether the parameter is set
      * @param[in] key The key to ask for
      * @return Whether the key is known