added network attribute to persist custom value. refs #4397

eclipse-sumo · Jan 13, 2022 · 2a5dc3f · 2a5dc3f
1 parent 877c741
commit 2a5dc3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/data/xsd/net_file.xsd b/data/xsd/net_file.xsd
@@ -49,6 +49,7 @@
         <xsd:attribute name="spreadType" type="spreadTypeType"/>
         <xsd:attribute name="avoidOverlap" type="boolType"/>
         <xsd:attribute name="junctionHigherSpeed" type="boolType"/>
+        <xsd:attribute name="internalJunctionsVehicleWidth" type="xsd:float"/>
     </xsd:complexType>
 
     <xsd:complexType name="edgeType">

diff --git a/src/netwrite/NWWriter_SUMO.cpp b/src/netwrite/NWWriter_SUMO.cpp
@@ -101,6 +101,9 @@ NWWriter_SUMO::writeNetwork(const OptionsCont& oc, NBNetBuilder& nb) {
     if (oc.exists("junctions.higher-speed") && oc.getBool("junctions.higher-speed")) {
         attrs[SUMO_ATTR_HIGHER_SPEED] = toString(oc.getBool("junctions.higher-speed"));
     }
+    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"));
+    }
     device.writeXMLHeader("net", "net_file.xsd", attrs); // street names may contain non-ascii chars
     device.lf();
     // get involved container

diff --git a/src/utils/xml/SUMOXMLDefinitions.cpp b/src/utils/xml/SUMOXMLDefinitions.cpp
@@ -823,6 +823,7 @@ StringBijection<int>::Entry SUMOXMLDefinitions::attrs[] = {
     { "tlsIgnoreInternalJunctionJam", SUMO_ATTR_TLS_IGNORE_INTERNAL_JUNCTION_JAM },
     { "avoidOverlap",           SUMO_ATTR_AVOID_OVERLAP },
     { "junctionHigherSpeed",    SUMO_ATTR_HIGHER_SPEED },
+    { "internalJunctionsVehicleWidth", SUMO_ATTR_INTERNAL_JUNCTIONS_VEHICLE_WIDTH },
 
     { "actorConfig",            SUMO_ATTR_ACTORCONFIG },
     { "startTime",              SUMO_ATTR_STARTTIME },

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