fix #14375

eclipse-sumo · Feb 21, 2024 · 33f5cfd · 33f5cfd
1 parent 3b533ba
commit 33f5cfd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/src/netimport/NIImporter_SUMO.cpp b/src/netimport/NIImporter_SUMO.cpp
@@ -88,6 +88,7 @@ NIImporter_SUMO::NIImporter_SUMO(NBNetBuilder& nb)
       myGeomAvoidOverlap(true),
       myJunctionsHigherSpeed(false),
       myInternalJunctionsVehicleWidth(OptionsCont::getOptions().getFloat("internal-junctions.vehicle-width")),
+      myJunctionsMinimalShape(OptionsCont::getOptions().getBool("junctions.minimal-shape")),
       myJunctionsEndpointShape(OptionsCont::getOptions().getBool("junctions.endpoint-shape"))
 {
 }
@@ -343,6 +344,9 @@ NIImporter_SUMO::_loadNetwork(OptionsCont& oc) {
     if (oc.isWriteable("internal-junctions.vehicle-width") && oc.getFloat("internal-junctions.vehicle-width") != myInternalJunctionsVehicleWidth) {
         oc.set("internal-junctions.vehicle-width", toString(myInternalJunctionsVehicleWidth));
     }
+    if (oc.isWriteable("junctions.minimal-shape") && oc.getBool("junctions.minimal-shape") != myJunctionsMinimalShape) {
+        oc.set("junctions.minimal-shape", toString(myJunctionsMinimalShape));
+    }
     if (oc.isWriteable("junctions.endpoint-shape") && oc.getBool("junctions.endpoint-shape") != myJunctionsEndpointShape) {
         oc.set("junctions.endpoint-shape", toString(myJunctionsEndpointShape));
     }
@@ -450,6 +454,7 @@ NIImporter_SUMO::myStartElement(int element,
             myGeomAvoidOverlap = attrs.getOpt<bool>(SUMO_ATTR_AVOID_OVERLAP, nullptr, ok, myGeomAvoidOverlap);
             myJunctionsHigherSpeed = attrs.getOpt<bool>(SUMO_ATTR_HIGHER_SPEED, nullptr, ok, myJunctionsHigherSpeed);
             myInternalJunctionsVehicleWidth = attrs.getOpt<double>(SUMO_ATTR_INTERNAL_JUNCTIONS_VEHICLE_WIDTH, nullptr, ok, myInternalJunctionsVehicleWidth);
+            myJunctionsMinimalShape = attrs.getOpt<bool>(SUMO_ATTR_JUNCTIONS_MINIMAL_SHAPE, nullptr, ok, myJunctionsMinimalShape);
             myJunctionsEndpointShape = attrs.getOpt<bool>(SUMO_ATTR_JUNCTIONS_ENDPOINT_SHAPE, nullptr, ok, myJunctionsEndpointShape);
             // derived
             const OptionsCont& oc = OptionsCont::getOptions();

diff --git a/src/netimport/NIImporter_SUMO.h b/src/netimport/NIImporter_SUMO.h
@@ -427,6 +427,7 @@ class NIImporter_SUMO : public SUMOSAXHandler {
     /// @brief custom settings for internal junction computation
     double myInternalJunctionsVehicleWidth;
     /// @brief custom settings for junction shape computation
+    bool myJunctionsMinimalShape;
     bool myJunctionsEndpointShape;
 
     /// @brief loaded roundabout edges

diff --git a/src/netwrite/NWWriter_SUMO.cpp b/src/netwrite/NWWriter_SUMO.cpp
@@ -107,6 +107,9 @@ NWWriter_SUMO::writeNetwork(const OptionsCont& oc, NBNetBuilder& nb) {
     if (oc.exists("internal-junctions.vehicle-width") && !oc.isDefault("internal-junctions.vehicle-width")) {
         attrs[SUMO_ATTR_INTERNAL_JUNCTIONS_VEHICLE_WIDTH] = toString(oc.getFloat("internal-junctions.vehicle-width"));
     }
+    if (!oc.isDefault("junctions.minimal-shape")) {
+        attrs[SUMO_ATTR_JUNCTIONS_MINIMAL_SHAPE] = toString(oc.getBool("junctions.minimal-shape"));
+    }
     if (!oc.isDefault("junctions.endpoint-shape")) {
         attrs[SUMO_ATTR_JUNCTIONS_ENDPOINT_SHAPE] = toString(oc.getBool("junctions.endpoint-shape"));
     }

diff --git a/src/utils/xml/SUMOXMLDefinitions.cpp b/src/utils/xml/SUMOXMLDefinitions.cpp
@@ -959,6 +959,7 @@ StringBijection<int>::Entry SUMOXMLDefinitions::attrs[] = {
     { "avoidOverlap",           SUMO_ATTR_AVOID_OVERLAP },
     { "junctionHigherSpeed",    SUMO_ATTR_HIGHER_SPEED },
     { "internalJunctionsVehicleWidth", SUMO_ATTR_INTERNAL_JUNCTIONS_VEHICLE_WIDTH },
+    { "junctionsMinimalShape",  SUMO_ATTR_JUNCTIONS_MINIMAL_SHAPE },
     { "junctionsEndpointShape", SUMO_ATTR_JUNCTIONS_ENDPOINT_SHAPE },
 
     { "actorConfig",            SUMO_ATTR_ACTORCONFIG },

diff --git a/src/utils/xml/SUMOXMLDefinitions.h b/src/utils/xml/SUMOXMLDefinitions.h
@@ -1334,6 +1334,7 @@ enum SumoXMLAttr {
     SUMO_ATTR_AVOID_OVERLAP,
     SUMO_ATTR_HIGHER_SPEED,
     SUMO_ATTR_INTERNAL_JUNCTIONS_VEHICLE_WIDTH,
+    SUMO_ATTR_JUNCTIONS_MINIMAL_SHAPE,
     SUMO_ATTR_JUNCTIONS_ENDPOINT_SHAPE,
     SUMO_ATTR_COMMAND,