now loading crossing params from .net.xml

eclipse-sumo · Mar 18, 2024 · 4628ba6 · 4628ba6 · namdre · Mar 19, 2024
1 parent 497d025
commit 4628ba6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/netbuild/NBNode.cpp b/src/netbuild/NBNode.cpp
@@ -3657,8 +3657,11 @@ NBNode::isRoundabout() const {
 
 NBNode::Crossing*
 NBNode::addCrossing(EdgeVector edges, double width, bool priority, int tlIndex, int tlIndex2,
-                    const PositionVector& customShape, bool fromSumoNet) {
+                    const PositionVector& customShape, bool fromSumoNet, const Parameterised* params) {
     Crossing* c = new Crossing(this, edges, width, priority, tlIndex, tlIndex2, customShape);
+    if (params != nullptr) {
+        c->updateParameters(params->getParametersMap());
+    }
     myCrossings.push_back(std::unique_ptr<Crossing>(c));
     if (fromSumoNet) {
         myCrossingsLoadedFromSumoNet += 1;

diff --git a/src/netbuild/NBNode.h b/src/netbuild/NBNode.h
@@ -713,7 +713,7 @@ class NBNode : public Named, public Parameterised {
 
     /// @brief add a pedestrian crossing to this node
     NBNode::Crossing* addCrossing(EdgeVector edges, double width, bool priority, int tlIndex = -1, int tlIndex2 = -1,
-                                  const PositionVector& customShape = PositionVector::EMPTY, bool fromSumoNet = false);
+                                  const PositionVector& customShape = PositionVector::EMPTY, bool fromSumoNet = false, const Parameterised* params = nullptr);
 
     /// @brief add custom shape for walkingArea
     void addWalkingAreaShape(EdgeVector edges, const PositionVector& shape, double width);

diff --git a/src/netimport/NIImporter_SUMO.cpp b/src/netimport/NIImporter_SUMO.cpp
@@ -369,7 +369,7 @@ NIImporter_SUMO::_loadNetwork(OptionsCont& oc) {
                 }
                 if (!edges.empty()) {
                     node->addCrossing(edges, crossing.width, crossing.priority,
-                                      crossing.customTLIndex, crossing.customTLIndex2, crossing.customShape, true);
+                                      crossing.customTLIndex, crossing.customTLIndex2, crossing.customShape, true, &crossing);
                 }
             }
         }
@@ -654,6 +654,8 @@ NIImporter_SUMO::addLane(const SUMOSAXAttributes& attrs) {
         std::vector<Crossing>& crossings = myPedestrianCrossings[SUMOXMLDefinitions::getJunctionIDFromInternalEdge(myCurrentEdge->id)];
         assert(crossings.size() > 0);
         crossings.back().width = attrs.get<double>(SUMO_ATTR_WIDTH, id.c_str(), ok);
+        myLastParameterised.pop_back();
+        myLastParameterised.push_back(&crossings.back());
         if (myCurrentLane->customShape) {
             crossings.back().customShape = myCurrentLane->shape;
             NBNetBuilder::transformCoordinates(crossings.back().customShape, true, myLocation);

diff --git a/src/netimport/NIImporter_SUMO.h b/src/netimport/NIImporter_SUMO.h
@@ -308,7 +308,7 @@ class NIImporter_SUMO : public SUMOSAXHandler {
     /** @struct Crossing
      * @brief Describes a pedestrian crossing
      */
-    struct Crossing {
+    struct Crossing : public Parameterised {
         Crossing(const std::string& _edgeID) :
             edgeID(_edgeID), customTLIndex(-1), customTLIndex2(-1) {}