fix ci

Author: MarcelloPerathoner

CHANGELOG.md

@@ -1,7 +1,6 @@
 # Unreleased
   - Changes from 5.27.1
     - Features
-      - ADDED: Add generic support for obstacles [#9999](https://github.com/Project-OSRM/osrm-backend/pull/9999)
       - ADDED: Route pedestrians over highway=platform [#6993](https://github.com/Project-OSRM/osrm-backend/pull/6993)
       - REMOVED: Remove all core-CH left-overs [#6920](https://github.com/Project-OSRM/osrm-backend/pull/6920)
       - ADDED: Add support for a keepalive_timeout flag. [#6674](https://github.com/Project-OSRM/osrm-backend/pull/6674)

include/extractor/obstacles.hpp

@@ -58,6 +58,7 @@ struct Obstacle
     // clang-format off
 
     // The type of an obstacle
+    // Note: must be kept in sync with scripting_environment_lua.cpp
     enum class Type : uint16_t
     {
         None           = 0x0000,
@@ -77,22 +78,8 @@ struct Obstacle
         All            = 0xFFFF
     };
 
-    // Initializer for enum made available to Lua through Sol. Must be kept in sync with the enum above.
-    static constexpr std::initializer_list<std::pair<std::string_view, Obstacle::Type>> SolTypeInitializerList {
-        {"none",            Type::None},
-        {"barrier",         Type::Barrier},
-        {"traffic_signals", Type::TrafficSignals},
-        {"stop",            Type::Stop},
-        {"stop_minor",      Type::StopMinor},
-        {"give_way",        Type::GiveWay},
-        {"crossing",        Type::Crossing},
-        {"traffic_calming", Type::TrafficCalming},
-        {"mini_roundabout", Type::MiniRoundabout},
-        {"turning_loop",    Type::TurningLoop},
-        {"turning_circle",  Type::TurningCircle}
-    };
-
     // The directions in which an obstacle applies.
+    // Note: must be kept in sync with scripting_environment_lua.cpp
     enum class Direction : uint8_t
     {
         None     = 0x0,
@@ -101,14 +88,6 @@ struct Obstacle
         Both     = 0x3
     };
 
-    // Initializer for enum made available to Lua through Sol. Must be kept in sync with the enum above.
-    static constexpr std::initializer_list<std::pair<std::string_view, Obstacle::Direction>> SolDirectionInitializerList {
-        {"none",     Direction::None},
-        {"forward",  Direction::Forward},
-        {"backward", Direction::Backward},
-        {"both",     Direction::Both}
-    };
-
     // clang-format on
 
     // use overloading instead of default arguments for sol::constructors
@@ -143,7 +122,7 @@ class ObstacleMap
     using FromToObstacle = std::tuple<NodeID, NodeID, Obstacle>;
 
   public:
-    ObstacleMap(){};
+    ObstacleMap() {};
 
     // Insert an obstacle using the OSM node id.
     //

src/extractor/extractor_callbacks.cpp

@@ -58,7 +58,7 @@ ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containe
  */
 void ExtractorCallbacks::ProcessNode(const osmium::Node &input_node, const ExtractionNode &)
 {
-    const auto id = static_cast<OSMNodeID>(input_node.id());
+    const auto id = to_alias<OSMNodeID>(input_node.id());
     external_memory.all_nodes_list.push_back(
         QueryNode{util::toFixed(util::UnsafeFloatLongitude{input_node.location().lon()}),
                   util::toFixed(util::UnsafeFloatLatitude{input_node.location().lat()}),

src/extractor/scripting_environment_lua.cpp

@@ -311,9 +311,39 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
                            "direction_reverse",
                            Obstacle::Direction::Backward);
 
-    context.state.new_enum<Obstacle::Type>("obstacle_type", Obstacle::SolTypeInitializerList);
-    context.state.new_enum<Obstacle::Direction>("obstacle_direction",
-                                                Obstacle::SolDirectionInitializerList);
+    context.state.new_enum("obstacle_type",
+                           "none",
+                           Obstacle::Type::None,
+                           "barrier",
+                           Obstacle::Type::Barrier,
+                           "traffic_signals",
+                           Obstacle::Type::TrafficSignals,
+                           "stop",
+                           Obstacle::Type::Stop,
+                           "stop_minor",
+                           Obstacle::Type::StopMinor,
+                           "give_way",
+                           Obstacle::Type::GiveWay,
+                           "crossing",
+                           Obstacle::Type::Crossing,
+                           "traffic_calming",
+                           Obstacle::Type::TrafficCalming,
+                           "mini_roundabout",
+                           Obstacle::Type::MiniRoundabout,
+                           "turning_loop",
+                           Obstacle::Type::TurningLoop,
+                           "turning_circle",
+                           Obstacle::Type::TurningCircle);
+
+    context.state.new_enum("obstacle_direction",
+                           "none",
+                           Obstacle::Direction::None,
+                           "forward",
+                           Obstacle::Direction::Forward,
+                           "backward",
+                           Obstacle::Direction::Backward,
+                           "both",
+                           Obstacle::Direction::Both);
 
     context.state.new_usertype<Obstacle>(
         "Obstacle",
@@ -334,7 +364,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
         "add",
         [](ObstacleMap &obstacles, const osmium::Node &from, Obstacle obstacle)
         {
-            OSMNodeID id = static_cast<OSMNodeID>(from.id());
+            OSMNodeID id = to_alias<OSMNodeID>(from.id());
             obstacles.emplace(id, obstacle);
         },
         "get",
@@ -362,7 +392,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
                 if (obj.is<Obstacle::Direction>())
                 {
                     m_obstacle_map.emplace(
-                        static_cast<OSMNodeID>(node.node->id()),
+                        to_alias<OSMNodeID>(node.node->id()),
                         Obstacle{Obstacle::Type::TrafficSignals,
                                  obj.as<Obstacle::Direction>(),
                                  static_cast<float>(context.properties.GetTrafficSignalPenalty()),
@@ -375,7 +405,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
                     // state to the node
                     // TODO: Make a breaking API change and remove this option.
                     m_obstacle_map.emplace(
-                        static_cast<OSMNodeID>(node.node->id()),
+                        to_alias<OSMNodeID>(node.node->id()),
                         Obstacle{Obstacle::Type::TrafficSignals,
                                  Obstacle::Direction::Both,
                                  static_cast<float>(context.properties.GetTrafficSignalPenalty()),
@@ -390,7 +420,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
                 if (obj.is<bool>() && obj.as<bool>())
                 {
                     m_obstacle_map.emplace(
-                        static_cast<OSMNodeID>(node.node->id()),
+                        to_alias<OSMNodeID>(node.node->id()),
                         Obstacle{Obstacle::Type::Barrier, Obstacle::Direction::Both});
                 }
             }));