From a4055091ddefa874a1be33d260ca75860341f6e3 Mon Sep 17 00:00:00 2001 From: Matt Bhagat-Conway Date: Fri, 3 Mar 2023 09:19:49 -0500 Subject: [PATCH] revert format changes --- src/extractor/scripting_environment_lua.cpp | 81 +++++++++------------ 1 file changed, 35 insertions(+), 46 deletions(-) diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp index 2461f9e3c..2ffa22bfa 100644 --- a/src/extractor/scripting_environment_lua.cpp +++ b/src/extractor/scripting_environment_lua.cpp @@ -245,8 +245,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "valid", &osmium::Location::valid); - auto get_location_tag = [](auto &context, const auto &location, const char *key) - { + auto get_location_tag = [](auto &context, const auto &location, const char *key) { if (context.location_dependent_data.empty()) return sol::object(context.state); @@ -273,8 +272,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "get_nodes", [](const osmium::Way &way) { return sol::as_table(&way.nodes()); }, "get_location_tag", - [&context, &get_location_tag](const osmium::Way &way, const char *key) - { + [&context, &get_location_tag](const osmium::Way &way, const char *key) { // HEURISTIC: use a single node (last) of the way to localize the way // For more complicated scenarios a proper merging of multiple tags // at one or many locations must be provided @@ -294,8 +292,9 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "version", &osmium::Node::version, "get_location_tag", - [&context, &get_location_tag](const osmium::Node &node, const char *key) - { return get_location_tag(context, node.location(), key); }); + [&context, &get_location_tag](const osmium::Node &node, const char *key) { + return get_location_tag(context, node.location(), key); + }); context.state.new_enum("traffic_lights", "none", @@ -311,8 +310,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "ResultNode", "traffic_lights", sol::property([](const ExtractionNode &node) { return node.traffic_lights; }, - [](ExtractionNode &node, const sol::object &obj) - { + [](ExtractionNode &node, const sol::object &obj) { if (obj.is()) { // The old approach of assigning a boolean traffic light @@ -363,8 +361,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) sol::property(&ExtractionWay::GetName, &ExtractionWay::SetName), "ref", // backward compatibility sol::property(&ExtractionWay::GetForwardRef, - [](ExtractionWay &way, const char *ref) - { + [](ExtractionWay &way, const char *ref) { way.SetForwardRef(ref); way.SetBackwardRef(ref); }), @@ -423,8 +420,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) sol::property([](const ExtractionWay &way) { return way.access_turn_classification; }, [](ExtractionWay &way, int flag) { way.access_turn_classification = flag; })); - auto getTypedRefBySol = [](const sol::object &obj) -> ExtractionRelation::OsmIDTyped - { + auto getTypedRefBySol = [](const sol::object &obj) -> ExtractionRelation::OsmIDTyped { if (obj.is()) { osmium::Way *way = obj.as(); @@ -460,19 +456,20 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) "get_value_by_key", [](ExtractionRelation &rel, const char *key) -> const char * { return rel.GetAttr(key); }, "get_role", - [&getTypedRefBySol](ExtractionRelation &rel, const sol::object &obj) -> const char * - { return rel.GetRole(getTypedRefBySol(obj)); }); + [&getTypedRefBySol](ExtractionRelation &rel, const sol::object &obj) -> const char * { + return rel.GetRole(getTypedRefBySol(obj)); + }); context.state.new_usertype( "ExtractionRelationContainer", "get_relations", [&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj) - -> const ExtractionRelationContainer::RelationIDList & - { return cont.GetRelations(getTypedRefBySol(obj)); }, + -> const ExtractionRelationContainer::RelationIDList & { + return cont.GetRelations(getTypedRefBySol(obj)); + }, "relation", - [](ExtractionRelationContainer &cont, - const ExtractionRelation::OsmIDTyped &rel_id) -> const ExtractionRelation & - { return cont.GetRelationData(rel_id); }); + [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id) + -> const ExtractionRelation & { return cont.GetRelationData(rel_id); }); context.state.new_usertype("ExtractionSegment", "source", @@ -488,12 +485,10 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) // 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("NodeRef", - "id", - &osmium::NodeRef::ref, - "location", - [](const osmium::NodeRef &nref) - { return nref.location(); }); + context.state.new_usertype( + "NodeRef", "id", &osmium::NodeRef::ref, "location", [](const osmium::NodeRef &nref) { + return nref.location(); + }); context.state.new_usertype("EdgeSource", "source_coordinate", @@ -549,8 +544,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) util::Log() << "Using profile api version " << context.api_version; // version-dependent parts of the api - auto initV2Context = [&]() - { + auto initV2Context = [&]() { // clear global not used in v2 context.state["properties"] = sol::nullopt; @@ -641,31 +635,26 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context) } }; - auto initialize_V3_extraction_turn = [&]() - { + auto initialize_V3_extraction_turn = [&]() { context.state.new_usertype( "ExtractionTurn", "angle", &ExtractionTurn::angle, "turn_type", - sol::property( - [](const ExtractionTurn &turn) - { - if (turn.number_of_roads > 2 || turn.source_mode != turn.target_mode || - turn.is_u_turn) - return osrm::guidance::TurnType::Turn; - else - return osrm::guidance::TurnType::NoTurn; - }), + sol::property([](const ExtractionTurn &turn) { + if (turn.number_of_roads > 2 || turn.source_mode != turn.target_mode || + turn.is_u_turn) + return osrm::guidance::TurnType::Turn; + else + return osrm::guidance::TurnType::NoTurn; + }), "direction_modifier", - sol::property( - [](const ExtractionTurn &turn) - { - if (turn.is_u_turn) - return osrm::guidance::DirectionModifier::UTurn; - else - return osrm::guidance::DirectionModifier::Straight; - }), + sol::property([](const ExtractionTurn &turn) { + if (turn.is_u_turn) + return osrm::guidance::DirectionModifier::UTurn; + else + return osrm::guidance::DirectionModifier::Straight; + }), "has_traffic_light", &ExtractionTurn::has_traffic_light, "weight",