Handle coils in importOSMEdges and exportEdges

src/dsm/dsm.hpp

@@ -6,7 +6,7 @@
 
 static constexpr uint8_t DSM_VERSION_MAJOR = 2;
 static constexpr uint8_t DSM_VERSION_MINOR = 5;
-static constexpr uint8_t DSM_VERSION_PATCH = 2;
+static constexpr uint8_t DSM_VERSION_PATCH = 3;
 
 static auto const DSM_VERSION =
     std::format("{}.{}.{}", DSM_VERSION_MAJOR, DSM_VERSION_MINOR, DSM_VERSION_PATCH);

src/dsm/headers/Sensors.hpp

@@ -8,16 +8,22 @@
 
 #include <utility>
 
+#include "../utility/Typedef.hpp"
+
 namespace dsm {
   /// @brief The Counter class contains two counters to count input and output.
   class Counter {
   protected:
+    Id m_code;
     std::pair<int, int> m_counters = {0, 0};  // First = in, Second = out
   public:
+    void setCode(Id const code);
     /// @brief Increase the input counter by one
     void increaseInputCounter();
     /// @brief Increase the output counter by one
     void increaseOutputCounter();
+
+    Id code() const;
     /// @brief Get the number of input counts registered
     /// @param reset If true, the counter is reset to 0. Default is true
     int inputCounts(bool reset = true);

src/dsm/sources/RoadNetwork.cpp

@@ -70,6 +70,8 @@
             newStreetId, *street, dynamic_cast<StochasticStreet&>(*street).flowRate());
       } else if (street->isSpire()) {
         addEdge<SpireStreet>(newStreetId, *street);
+        dynamic_cast<SpireStreet&>(*m_edges.at(newStreetId))
+            .setCode(dynamic_cast<SpireStreet&>(*street).code());
       } else {
         addEdge<Street>(newStreetId, *street);
       }
@@ -263,7 +265,7 @@
       // Check if the first line is nodeId;lat;lon
       std::string line;
       std::getline(ifs, line);
-      if (line != "id;lon;lat") {
+      if (line != "id;lon;lat;type") {
         throw std::invalid_argument(
             Logger::buildExceptionMessage("Invalid file format."));
       }
@@ -274,15 +276,21 @@
           continue;
         }
         std::istringstream iss{line};
-        std::string nodeId, lat, lon;
+        std::string nodeId, lat, lon, type;
         std::getline(iss, nodeId, ';');
         std::getline(iss, lon, ';');
-        std::getline(iss, lat, '\n');
+        std::getline(iss, lat, ';');
+        std::getline(iss, type, '\n');
         dLon = lon == "Nan" ? 0. : std::stod(lon);
         dLat = lat == "Nan" ? 0. : std::stod(lat);
         auto const& it{m_nodes.find(std::stoul(nodeId))};
         if (it != m_nodes.cend()) {
           it->second->setCoords(std::make_pair(dLat, dLon));
+          if (type == "traffic_light" && !it->second->isTrafficLight()) {
+            makeTrafficLight(it->first, 60);
+          } else if (type == "roundabout" && !it->second->isRoundabout()) {
+            makeRoundabout(it->first);
+          }
         } else {
           Logger::warning(
               std::format("Node with id {} not found. Skipping coordinates ({}, {}).",
@@ -365,16 +373,18 @@
           continue;
         }
         std::istringstream iss{line};
-        std::string sourceId, targetId, length, lanes, highway, maxspeed, name, geometry;
-        // u;v;length;highway;maxspeed;name;geometry
+        std::string sourceId, targetId, length, lanes, highway, maxspeed, name, geometry,
+            coilcode;
+        // u;v;length;highway;maxspeed;name;geometry;coilcode
         std::getline(iss, sourceId, ';');
         std::getline(iss, targetId, ';');
         std::getline(iss, length, ';');
         std::getline(iss, lanes, ';');
         std::getline(iss, highway, ';');
         std::getline(iss, maxspeed, ';');
         std::getline(iss, name, ';');
-        std::getline(iss, geometry, '\n');
+        std::getline(iss, geometry, ';');
+        std::getline(iss, coilcode, '\n');
         if (maxspeed.empty()) {
           maxspeed = "30";  // Default to 30 km/h if no maxspeed is provided
         } else {
@@ -460,6 +470,11 @@
                         std::stoul(lanes),
                         name,
                         coords);
+        if (!coilcode.empty()) {
+          makeSpireStreet(streetId);
+          auto& coil = edge<SpireStreet>(streetId);
+          coil.setCode(static_cast<Id>(std::stoul(coilcode)));
+        }
       }
     } else {
       throw std::invalid_argument(
@@ -474,14 +489,21 @@
             path.substr(path.find_last_of(".")) == ".csv"));
     std::ofstream file{path};
     // Column names
-    file << "id;lon;lat\n";
+    file << "id;lon;lat;type\n";
     for (auto const& [nodeId, pNode] : m_nodes) {
       file << nodeId << ';';
       if (pNode->coords().has_value()) {
         file << pNode->coords().value().second << ';' << pNode->coords().value().first;
       } else {
         file << "Nan;Nan";
       }
+      if (pNode->isTrafficLight()) {
+        file << ";traffic_light";
+      } else if (pNode->isRoundabout()) {
+        file << ";roundabout";
+      } else {
+        file << ";intersection";
+      }
       file << '\n';
     }
     file.close();
@@ -492,10 +514,15 @@
             path.substr(path.find_last_of(".")) == ".csv"));
     std::ofstream file{path};
     // Column names
-    file << "id;source_id;target_id;name;geometry\n";
+    file << "id;source_id;target_id;name;coil_code;geometry\n";
     for (auto const& [streetId, pStreet] : m_edges) {
       file << streetId << ';' << pStreet->source() << ';' << pStreet->target() << ';'
            << pStreet->name() << ';';
+      if (pStreet->isSpire()) {
+        file << dynamic_cast<SpireStreet&>(*pStreet).code() << ';';
+      } else {
+        file << ';';
+      }
       if (!pStreet->geometry().empty()) {
         file << "LINESTRING(";
         for (size_t i{0}; i < pStreet->geometry().size(); ++i) {

src/dsm/sources/Sensors.cpp

@@ -1,9 +1,11 @@
 #include "../headers/Sensors.hpp"
 
 namespace dsm {
+  void Counter::setCode(Id const code) { m_code = code; }
   void Counter::increaseInputCounter() { m_counters.first++; }
   void Counter::increaseOutputCounter() { m_counters.second++; }
 
+  Id Counter::code() const { return m_code; }
   int Counter::inputCounts(bool reset) {
     if (reset) {
       int count{0};

src/dsm/utility/Typedef.hpp

@@ -30,6 +30,6 @@ namespace dsm {
     FRECCIAROSSA = 6,  // Frecciarossa
     ES = 7,            // Eurostar
   };
-  enum log_level_t : uint8_t { DEBUG = 0, INFO = 1, WARNING = 2, ERROR = 3 };
+  enum log_level_t : uint8_t { DEBUG = 0, WARNING = 1, INFO = 2, ERROR = 3 };
 
 };  // namespace dsm

test/data/edges.csv

@@ -1,5 +1,5 @@
-id;source_id;target_id;name;geometry
-8;2;2;;LINESTRING(0 2,0 2)
-6;2;0;;LINESTRING(0 2,0 0)
-3;1;0;;LINESTRING(0 1,0 0)
-1;0;1;;LINESTRING(0 0,0 1)
+id;source_id;target_id;name;coil_code;geometry
+8;2;2;;;LINESTRING(0 2,0 2)
+6;2;0;;;LINESTRING(0 2,0 0)
+3;1;0;;;LINESTRING(0 1,0 0)
+1;0;1;;;LINESTRING(0 0,0 1)

test/data/nodes.csv

@@ -1,4 +1,4 @@
-id;lon;lat
-1;0;1
-0;0;0
-2;0;2
+id;lon;lat;type
+1;0;1;intersection
+0;0;0;intersection
+2;0;2;intersection