fix #14447

eclipse-sumo · Mar 1, 2024 · 651456d · 651456d
1 parent c5ca904
commit 651456d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/microsim/devices/MSDevice_FCD.cpp b/src/microsim/devices/MSDevice_FCD.cpp
@@ -101,6 +101,7 @@ MSDevice_FCD::getDefaultMask() {
     mask.reset(SUMO_ATTR_ODOMETER);
     mask.reset(SUMO_ATTR_SPEED_LAT);
     mask.reset(SUMO_ATTR_POSITION_LAT);
+    mask.reset(SUMO_ATTR_ARRIVALDELAY);
     return mask;
 }
 
@@ -167,19 +168,18 @@ MSDevice_FCD::initOnce() {
         }
     }
     if (oc.isSet("fcd-output.attributes")) {
-        myWrittenAttributes = 0;
+        myWrittenAttributes.reset();
         for (std::string attrName : oc.getStringVector("fcd-output.attributes")) {
             if (!SUMOXMLDefinitions::Attrs.hasString(attrName)) {
                 if (attrName == "all") {
-                    myWrittenAttributes = ~0;
+                    myWrittenAttributes.set();
                 } else {
                     WRITE_ERRORF(TL("Unknown attribute '%' to write in fcd output."), attrName);
                 }
                 continue;
             }
             int attr = SUMOXMLDefinitions::Attrs.get(attrName);
-            assert(attr <= 63);
-            myWrittenAttributes |= ((long long int)1 << attr);
+            myWrittenAttributes.set(attr);
         }
     }
 

diff --git a/src/microsim/output/MSFCDExport.cpp b/src/microsim/output/MSFCDExport.cpp
@@ -155,6 +155,14 @@ MSFCDExport::write(OutputDevice& of, SUMOTime timestep, bool elevation) {
                         of.writeAttr(StringUtils::escapeXML(key), StringUtils::escapeXML(value));
                     }
                 }
+                if (of.useAttribute(SUMO_ATTR_ARRIVALDELAY, mask)) {
+                    double arrivalDelay = baseVeh->getStopArrivalDelay();
+                    if (arrivalDelay == INVALID_DOUBLE) {
+                        // no upcoming stop also means that there is no delay
+                        arrivalDelay = 0;
+                    }
+                    of.writeOptionalAttr(SUMO_ATTR_ARRIVALDELAY, arrivalDelay, mask);
+                }
                 of.closeTag();
             }
             // write persons and containers

diff --git a/src/microsim/output/MSStopOut.cpp b/src/microsim/output/MSStopOut.cpp
@@ -131,7 +131,7 @@ MSStopOut::stopEnded(const SUMOVehicle* veh, const SUMOVehicleParameter::Stop& s
         myDevice.writeAttr("delay", delay);
     }
     if (stop.arrival >= 0) {
-        myDevice.writeAttr("arrivalDelay", arrivalDelay);
+        myDevice.writeAttr(SUMO_ATTR_ARRIVALDELAY, arrivalDelay);
     }
     myDevice.writeAttr("initialPersons", si.initialNumPersons);
     myDevice.writeAttr("loadedPersons", si.loadedPersons);

diff --git a/src/utils/xml/SUMOXMLDefinitions.cpp b/src/utils/xml/SUMOXMLDefinitions.cpp
@@ -430,6 +430,7 @@ StringBijection<int>::Entry SUMOXMLDefinitions::attrs[] = {
     { "odometer",               SUMO_ATTR_ODOMETER },
     { "posLat",                 SUMO_ATTR_POSITION_LAT },
     { "speedLat",               SUMO_ATTR_SPEED_LAT },
+    { "arrivalDelay",           SUMO_ATTR_ARRIVALDELAY },
 
     // Edge
     { "id",                     SUMO_ATTR_ID },

diff --git a/src/utils/xml/SUMOXMLDefinitions.h b/src/utils/xml/SUMOXMLDefinitions.h
@@ -618,6 +618,10 @@ enum SumoXMLAttr {
     SUMO_ATTR_ODOMETER           = 61,
     SUMO_ATTR_POSITION_LAT       = 62,
     SUMO_ATTR_SPEED_LAT          = 63,
+
+    // only usable with SumoXMLAttrMask
+    SUMO_ATTR_ARRIVALDELAY       = 64,
+
     /// @}
 
     /// @name common attributes