Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

clang-format changed file

Browse Source
This commit is contained in:
Desone Burns II 2020-11-23 17:12:13 -07:00
parent b1646622e6
commit 24d0af6faf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/extractor/scripting_environment_lua.cpp
View File

@ -37,7 +37,7 @@ template <> struct is_container<osmium::Way> : std::false_type
template <> struct is_container<osmium::Relation> : std::false_type template <> struct is_container<osmium::Relation> : std::false_type
{ {
}; };
} } // namespace sol
namespace osrm namespace osrm
{ {
@ -91,7 +91,7 @@ struct to_lua_object : public boost::static_visitor<sol::object>
auto operator()(boost::blank &) const { return sol::nil; } auto operator()(boost::blank &) const { return sol::nil; }
sol::state &state; sol::state &state;
}; };
} } // namespace
Sol2ScriptingEnvironment::Sol2ScriptingEnvironment( Sol2ScriptingEnvironment::Sol2ScriptingEnvironment(
const std::string &file_name, const std::string &file_name,
@ -424,8 +424,8 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
"get_relations", "get_relations",
[&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj) [&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj)
-> const ExtractionRelationContainer::RelationIDList & { -> const ExtractionRelationContainer::RelationIDList & {
return cont.GetRelations(getTypedRefBySol(obj)); return cont.GetRelations(getTypedRefBySol(obj));
}, },
"relation", "relation",
[](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id) [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id)
-> const ExtractionRelation & { return cont.GetRelationData(rel_id); }); -> const ExtractionRelation & { return cont.GetRelationData(rel_id); });
@ -589,7 +589,6 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
}; };
auto initialize_V3_extraction_turn = [&]() { auto initialize_V3_extraction_turn = [&]() {
context.state.new_usertype<ExtractionTurn>( context.state.new_usertype<ExtractionTurn>(
"ExtractionTurn", "ExtractionTurn",
"angle", "angle",
@ -944,8 +943,9 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
auto &context = GetSol2Context(); auto &context = GetSol2Context();
BOOST_ASSERT(context.state.lua_state() != nullptr); BOOST_ASSERT(context.state.lua_state() != nullptr);
std::vector<std::string> strings; std::vector<std::string> strings;
if(context.profile_table[table_name] == sol::nil){ if (context.profile_table[table_name] == sol::nil)
return strings; {
return strings;
} }
sol::table table = context.profile_table[table_name]; sol::table table = context.profile_table[table_name];
if (table.valid()) if (table.valid())
@ -965,8 +965,9 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name)
auto &context = GetSol2Context(); auto &context = GetSol2Context();
BOOST_ASSERT(context.state.lua_state() != nullptr); BOOST_ASSERT(context.state.lua_state() != nullptr);
if(context.profile_table[table_name] == sol::nil){ if (context.profile_table[table_name] == sol::nil)
return string_lists; {
return string_lists;
} }
sol::table table = context.profile_table[table_name]; sol::table table = context.profile_table[table_name];
if (!table.valid()) if (!table.valid())