parsing mass attribute #13056

eclipse-sumo · Jan 29, 2024 · 83dc638 · 83dc638
1 parent d68d591
commit 83dc638
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/data/xsd/routeTypes.xsd b/data/xsd/routeTypes.xsd
@@ -41,6 +41,7 @@
         <xsd:attribute name="guiShape" type="xsd:string"/>
         <xsd:attribute name="width" type="positiveFloatType"/>
         <xsd:attribute name="height" type="positiveFloatType"/>
+        <xsd:attribute name="mass" type="positiveFloatType"/>
         <xsd:attribute name="color" type="colorType"/>
         <xsd:attribute name="accel" type="positiveFloatType"/>
         <xsd:attribute name="decel" type="positiveFloatType"/>

diff --git a/src/utils/vehicle/SUMOVehicleParserHelper.cpp b/src/utils/vehicle/SUMOVehicleParserHelper.cpp
@@ -841,6 +841,18 @@ SUMOVehicleParserHelper::beginVTypeParsing(const SUMOSAXAttributes& attrs, const
                 return handleVehicleTypeError(hardFail, vType, toString(SUMO_ATTR_EMISSIONCLASS) + " with name '" + parsedEmissionClass + "' doesn't exist.");
             }
         }
+        if (attrs.hasAttribute(SUMO_ATTR_MASS)) {
+            bool ok = true;
+            const double mass = attrs.get<double>(SUMO_ATTR_MASS, vType->id.c_str(), ok);
+            if (!ok) {
+                return handleVehicleTypeError(hardFail, vType);
+            } else if (mass < 0) {
+                return handleVehicleTypeError(hardFail, vType, toString(SUMO_ATTR_MASS) + " must be equal or greater than 0");
+            } else {
+                vType->mass = mass;
+                vType->parametersSet |= VTYPEPARS_MASS_SET;
+            }
+        }
         if (attrs.hasAttribute(SUMO_ATTR_IMPATIENCE)) {
             bool ok = true;
             const std::string impatienceStr = attrs.get<std::string>(SUMO_ATTR_IMPATIENCE, vType->id.c_str(), ok);