diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index c1800488891..ab8e74ad337 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -706,7 +706,12 @@ 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, edge_iterator->result.flags); + 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 index ddbea313ddb..0521ce15f26 100644 --- a/src/extractor/scripting_environment_lua.cpp +++ b/src/extractor/scripting_environment_lua.cpp @@ -471,29 +471,35 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id) -> const ExtractionRelation & { return cont.GetRelationData(rel_id); }); - context.state.new_usertype("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( + "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", "source", @@ -509,7 +515,6 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "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" context.state.new_usertype(