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

Review fixes

Browse Source
This commit is contained in:
Denis Koronchik
2017-09-08 14:51:10 +03:00
committed by Michael Krasnyk
parent 84cb7865ab
commit ff3b398e23
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/scripting_environment_lua.cpp
+21 -3
View File
@@ -353,7 +353,25 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
osmium::item_type GetItemType() const { return item_type; }
osmium::object_id_type GetId() const { return id; }
util::OsmIDTyped ref() const { return util::OsmIDTyped(id, std::uint8_t(item_type)); }
util::OsmIDTyped ref() const
{
switch (item_type)
{
case osmium::item_type::node:
return util::OsmIDTyped(id, util::OsmIDTyped::Type::Node);
case osmium::item_type::way:
return util::OsmIDTyped(id, util::OsmIDTyped::Type::Way);
case osmium::item_type::relation:
return util::OsmIDTyped(id, util::OsmIDTyped::Type::Relation);
default:
break;
}
return util::OsmIDTyped(id, util::OsmIDTyped::Type::Unknown);
}
std::string role;
osmium::item_type item_type;
@@ -804,7 +822,7 @@ void Sol2ScriptingEnvironment::ProcessElements(
local_context.properties.call_tagless_node_function))
{
const osmium::Node &node = static_cast<const osmium::Node &>(*entity);
const util::OsmIDTyped id(node.id(), std::uint8_t(node.type()));
const util::OsmIDTyped id(node.id(), util::OsmIDTyped::Type::Node);
local_context.ProcessNode(node, result_node, relations.Get(id));
}
resulting_nodes.push_back(std::pair<const osmium::Node &, ExtractionNode>(
@@ -815,7 +833,7 @@ void Sol2ScriptingEnvironment::ProcessElements(
if (local_context.has_way_function)
{
const osmium::Way &way = static_cast<const osmium::Way &>(*entity);
const util::OsmIDTyped id(way.id(), std::uint8_t(way.type()));
const util::OsmIDTyped id(way.id(), util::OsmIDTyped::Type::Way);
local_context.ProcessWay(way, result_way, relations.Get(id));
}
resulting_ways.push_back(std::pair<const osmium::Way &, ExtractionWay>(