pass flags into process_segment

Project-OSRM · Nov 29, 2023 · 0008373 · 0008373
1 parent 31e31a6
commit 0008373
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/include/extractor/extraction_segment.hpp b/include/extractor/extraction_segment.hpp
@@ -12,9 +12,10 @@ struct ExtractionSegment
                       const osrm::util::Coordinate target_,
                       double distance_,
                       double weight_,
-                      double duration_)
+                      double duration_,
+                      const osrm::extractor::NodeBasedEdgeClassification flags_)
         : source(source_), target(target_), distance(distance_), weight(weight_),
-          duration(duration_)
+          duration(duration_), flags(flags_)
     {
     }
 
@@ -23,6 +24,7 @@ struct ExtractionSegment
     const double distance;
     double weight;
     double duration;
+    const osrm::extractor::NodeBasedEdgeClassification flags;
 };
 } // namespace osrm::extractor
 

diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
@@ -706,7 +706,7 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
             const auto accurate_distance =
                 util::coordinate_calculation::greatCircleDistance(source_coord, target_coord);
 
-            ExtractionSegment segment(source_coord, target_coord, distance, weight, duration);
+            ExtractionSegment segment(source_coord, target_coord, distance, weight, duration, edge_iterator->result.flags);
             scripting_environment.ProcessSegment(segment);
 
             auto &edge = edge_iterator->result;

diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
@@ -471,6 +471,30 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
         [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id)
             -> const ExtractionRelation & { return cont.GetRelationData(rel_id); });
 
+    context.state.new_usertype<NodeBasedEdgeClassification>("NodeBasedEdgeClassification",
+                                                            "forward",
+                                                            // can't just do &NodeBasedEdgeClassification::forward with bitfields
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.forward; }),
+                                                            "backward",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.backward; }),
+                                                            "is_split",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.is_split; }),
+                                                            "roundabout",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.roundabout; }),
+                                                            "circular",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.circular; }),
+                                                            "startpoint",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.startpoint; }),
+                                                            "restricted",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> bool { return c.restricted; }),
+                                                            "road_classification",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> RoadClassification { return c.road_classification; }),
+                                                            "highway_turn_classification",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> uint8_t { return c.highway_turn_classification; }),
+                                                            "access_turn_classification",
+                                                            sol::property([](NodeBasedEdgeClassification &c) -> uint8_t { return c.access_turn_classification; })
+    );
+
     context.state.new_usertype<ExtractionSegment>("ExtractionSegment",
                                                   "source",
                                                   &ExtractionSegment::source,
@@ -481,7 +505,10 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
                                                   "weight",
                                                   &ExtractionSegment::weight,
                                                   "duration",
-                                                  &ExtractionSegment::duration);
+                                                  &ExtractionSegment::duration,
+                                                  "flags",
+                                                  &ExtractionSegment::flags);
+
 
     // Keep in mind .location is available only if .pbf is preprocessed to set the location with the
     // ref using osmium command "osmium add-locations-to-ways"