rerouter position #14198

eclipse-sumo · Jan 17, 2024 · ab58c98 · ab58c98
1 parent eede07d
commit ab58c98
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 12 deletions.
diff --git a/src/guinetload/GUITriggerBuilder.cpp b/src/guinetload/GUITriggerBuilder.cpp
@@ -59,8 +59,8 @@ GUITriggerBuilder::buildLaneSpeedTrigger(MSNet& net,
 MSTriggeredRerouter*
 GUITriggerBuilder::buildRerouter(MSNet& net, const std::string& id,
                                  MSEdgeVector& edges, double prob, bool off, bool optional,
-                                 SUMOTime timeThreshold, const std::string& vTypes) {
-    GUITriggeredRerouter* rr = new GUITriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes,
+                                 SUMOTime timeThreshold, const std::string& vTypes, const Position& pos) {
+    GUITriggeredRerouter* rr = new GUITriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes, pos,
             dynamic_cast<GUINet&>(net).getVisualisationSpeedUp());
     return rr;
 }

diff --git a/src/guinetload/GUITriggerBuilder.h b/src/guinetload/GUITriggerBuilder.h
@@ -91,7 +91,7 @@ class GUITriggerBuilder : public NLTriggerBuilder {
     virtual MSTriggeredRerouter* buildRerouter(MSNet& net,
             const std::string& id, MSEdgeVector& edges,
             double prob, bool off, bool optional, SUMOTime timeThreshold,
-            const std::string& vTypes) override;
+            const std::string& vTypes, const Position& pos) override;
 
 
     /** @brief Builds a bus stop

diff --git a/src/guisim/GUIEdge.cpp b/src/guisim/GUIEdge.cpp
@@ -628,7 +628,7 @@ void
 GUIEdge::addRerouter() {
     MSEdgeVector edges;
     edges.push_back(this);
-    GUITriggeredRerouter* rr = new GUITriggeredRerouter(getID() + "_dynamic_rerouter", edges, 1, false, false, 0, "",
+    GUITriggeredRerouter* rr = new GUITriggeredRerouter(getID() + "_dynamic_rerouter", edges, 1, false, false, 0, "", Position::INVALID,
             GUINet::getGUIInstance()->getVisualisationSpeedUp());
 
     MSTriggeredRerouter::RerouteInterval ri;

diff --git a/src/guisim/GUITriggeredRerouter.cpp b/src/guisim/GUITriggeredRerouter.cpp
@@ -232,8 +232,8 @@ GUITriggeredRerouter::GUITriggeredRerouterPopupMenu::onCmdOpenManip(FXObject*,
 // -------------------------------------------------------------------------
 
 GUITriggeredRerouter::GUITriggeredRerouter(const std::string& id, const MSEdgeVector& edges, double prob,
-        bool off, bool optional, SUMOTime timeThreshold, const std::string& vTypes, SUMORTree& rtree) :
-    MSTriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes),
+        bool off, bool optional, SUMOTime timeThreshold, const std::string& vTypes, const Position& pos, SUMORTree& rtree) :
+    MSTriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes, pos),
     GUIGlObject_AbstractAdd(GLO_REROUTER, id, GUIIconSubSys::getIcon(GUIIcon::REROUTER)),
     myShiftProbDistIndex(0) {
     // add visualisation objects for edges which trigger the rerouter

diff --git a/src/guisim/GUITriggeredRerouter.h b/src/guisim/GUITriggeredRerouter.h
@@ -56,7 +56,7 @@ class GUITriggeredRerouter
      * @param[in] off Whether the rerouter is off (not working) initially
      */
     GUITriggeredRerouter(const std::string& id, const MSEdgeVector& edges, double prob,
-                         bool off, bool optional, SUMOTime timeThreshold, const std::string& vTypes,
+                         bool off, bool optional, SUMOTime timeThreshold, const std::string& vTypes, const Position& pos,
                          SUMORTree& rtree);
 
 

diff --git a/src/microsim/trigger/MSTriggeredRerouter.h b/src/microsim/trigger/MSTriggeredRerouter.h
@@ -71,7 +71,7 @@ class MSTriggeredRerouter :
      */
     MSTriggeredRerouter(const std::string& id, const MSEdgeVector& edges,
                         double prob, bool off, bool optional, SUMOTime timeThreshold,
-                        const std::string& vTypes, const Position& pos=Position::INVALID);
+                        const std::string& vTypes, const Position& pos);
 
 
     /** @brief Destructor */

diff --git a/src/netload/NLTriggerBuilder.cpp b/src/netload/NLTriggerBuilder.cpp
@@ -703,10 +703,23 @@ NLTriggerBuilder::parseAndBuildRerouter(MSNet& net, const SUMOSAXAttributes& att
     const SUMOTime timeThreshold = TIME2STEPS(attrs.getOpt<double>(SUMO_ATTR_HALTING_TIME_THRESHOLD, id.c_str(), ok, 0));
     const std::string vTypes = attrs.getOpt<std::string>(SUMO_ATTR_VTYPES, id.c_str(), ok, "");
     const std::string pos = attrs.getOpt<std::string>(SUMO_ATTR_POSITION, id.c_str(), ok, "");
+    Position p = Position::INVALID;
+    if (pos != "") {
+        const std::vector<std::string> posSplit = StringTokenizer(pos, ",").getVector();
+        if (posSplit.size() == 1) {
+            p = edges.front()->getLanes()[0]->geometryPositionAtOffset(StringUtils::toDouble(posSplit[0]));
+        } else if (posSplit.size() == 2) {
+            p = Position(StringUtils::toDouble(posSplit[0]), StringUtils::toDouble(posSplit[1]));
+        } else if (posSplit.size() == 3) {
+            p = Position(StringUtils::toDouble(posSplit[0]), StringUtils::toDouble(posSplit[1]), StringUtils::toDouble(posSplit[2]));
+        } else {
+            throw InvalidArgument("Invalid position for rerouter '" + id + "'.");
+        }
+    }
     if (!ok) {
         throw InvalidArgument("Could not parse rerouter '" + id + "'.");
     }
-    MSTriggeredRerouter* trigger = buildRerouter(net, id, edges, prob, off, optional, timeThreshold, vTypes);
+    MSTriggeredRerouter* trigger = buildRerouter(net, id, edges, prob, off, optional, timeThreshold, vTypes, p);
     // read in the trigger description
     trigger->registerParent(SUMO_TAG_REROUTER, myHandler);
 }
@@ -755,8 +768,8 @@ NLTriggerBuilder::buildCalibrator(MSNet& /*net*/, const std::string& id,
 MSTriggeredRerouter*
 NLTriggerBuilder::buildRerouter(MSNet&, const std::string& id,
                                 MSEdgeVector& edges, double prob, bool off, bool optional,
-                                SUMOTime timeThreshold, const std::string& vTypes) {
-    return new MSTriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes);
+                                SUMOTime timeThreshold, const std::string& vTypes, const Position& pos) {
+    return new MSTriggeredRerouter(id, edges, prob, off, optional, timeThreshold, vTypes, pos);
 }
 
 

diff --git a/src/netload/NLTriggerBuilder.h b/src/netload/NLTriggerBuilder.h
@@ -426,7 +426,7 @@ class NLTriggerBuilder {
     virtual MSTriggeredRerouter* buildRerouter(MSNet& net,
             const std::string& id, MSEdgeVector& edges,
             double prob, bool off, bool optional, SUMOTime timeThreshold,
-            const std::string& vTypes);
+            const std::string& vTypes, const Position& pos);
     //@}