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

Access to location dependent data in Lua via way:get_location_tags()

Browse Source
This commit is contained in:
Michael Krasnyk
2017-09-22 14:03:12 +02:00
parent 2059f7234a
commit 0f498d13f5
8 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/location_dependent_data.cpp
-15
View File
@@ -265,20 +265,5 @@ LocationDependentData::properties_t LocationDependentData::operator()(const poin
return result;
}
LocationDependentData::properties_t LocationDependentData::operator()(const osmium::Way &way) const
{
// 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
const auto &nodes = way.nodes();
// TODO: the next call requires an OSM file preprocessed with a command
// osmium add-locations-to-ways --keep-untagged-nodes
const auto &location = nodes.back().location();
const point_t point(location.lon(), location.lat());
return operator()(point);
}
}
}
src/extractor/scripting_environment_lua.cpp
+37 -35
View File
@@ -42,6 +42,8 @@ namespace osrm
namespace extractor
{
namespace
{
template <class T>
auto get_value_by_key(T const &object, const char *key) -> decltype(object.get_value_by_key(key))
{
@@ -80,6 +82,28 @@ template <class T> double lonToDouble(T const &object)
return static_cast<double>(util::toFloating(object.lon));
}
// boost::variant visitor that inserts a key-value pair in a Lua table
struct table_setter : public boost::static_visitor<>
{
table_setter(sol::table &table, const std::string &key) : table(table), key(key) {}
template <typename T> void operator()(const T &value) const { table.set(key, value); }
void operator()(const boost::blank &) const { /* ignore */}
sol::table &table;
const std::string &key;
};
// Converts a properties map into a Lua table
sol::table toLua(sol::state &state, const LocationDependentData::properties_t &properties)
{
auto table = sol::table(state, sol::create);
std::for_each(properties.begin(), properties.end(), [&table](const auto &property) {
boost::apply_visitor(table_setter(table, property.first), property.second);
});
return table;
}
}
Sol2ScriptingEnvironment::Sol2ScriptingEnvironment(
const std::string &file_name,
const std::vector<boost::filesystem::path> &location_dependent_data_paths)
@@ -285,10 +309,20 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
&get_value_by_key<osmium::Way>,
"id",
&osmium::Way::id,
"version",
&osmium::Way::version,
"get_nodes",
[](const osmium::Way &way) { return sol::as_table(way.nodes()); },
"version",
&osmium::Way::version);
"get_location_tags",
[&context](const osmium::Way &way) {
// 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
const auto &nodes = way.nodes();
const auto &location = nodes.back().location();
return toLua(context.state,
context.location_dependent_data({location.lon(), location.lat()}));
});
context.state.new_usertype<osmium::RelationMember>(
"RelationMember",
@@ -978,30 +1012,6 @@ void LuaScriptingContext::ProcessNode(const osmium::Node &node,
}
}
namespace
{
// boost::variant visitor that inserts a key-value pair in a Lua table
struct table_setter : public boost::static_visitor<>
{
table_setter(sol::table &table, const std::string &key) : table(table), key(key) {}
template <typename T> void operator()(const T &value) const { table.set(key, value); }
void operator()(const boost::blank &) const { /* ignore */}
sol::table &table;
const std::string &key;
};
// Converts a properties map into a Lua table
sol::table toLua(sol::state &state, const LocationDependentData::properties_t properties)
{
auto table = sol::table(state, sol::create);
std::for_each(properties.begin(), properties.end(), [&table](const auto &property) {
boost::apply_visitor(table_setter(table, property.first), property.second);
});
return table;
}
}
void LuaScriptingContext::ProcessWay(const osmium::Way &way,
ExtractionWay &result,
const ExtractionRelationContainer::RelationList &relations)
@@ -1011,15 +1021,7 @@ void LuaScriptingContext::ProcessWay(const osmium::Way &way,
switch (api_version)
{
case 3:
if (location_dependent_data.empty())
{
way_function(profile_table, way, result, relations);
}
else
{
way_function(
profile_table, way, result, relations, toLua(state, location_dependent_data(way)));
}
way_function(profile_table, way, result, relations);
break;
case 2:
way_function(profile_table, way, result);