Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly copy way.nodes() into vector to have proper table meta functions #3468

Merged
merged 1 commit into from
Jan 4, 2017
Merged

Explicitly copy way.nodes() into vector to have proper table meta functions #3468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions features/options/extract/lua.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@extract
Feature: osrm-extract lua ways:get_nodes()

Background:
Given the node map
"""
a b
"""
And the ways
| nodes |
| ab |
And the data has been saved to disk

Scenario: osrm-extract - Passing base file
Given the profile file "testbot" extended with
"""
function way_function(way, result)
for _, node in ipairs(way:get_nodes()) do
print('node id ' .. node:id())
end
result.forward_mode = mode.driving
result.forward_speed = 1
end
"""
When I run "osrm-extract --profile {profile_file} {osm_file}"
Then it should exit successfully
And stdout should contain "node id 1"
And stdout should contain "node id 2"
27 changes: 12 additions & 15 deletions src/extractor/scripting_environment_lua.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ template <class T> double lonToDouble(T const &object)
return static_cast<double>(util::toFloating(object.lon));
}

auto get_nodes_for_way(const osmium::Way &way) -> decltype(way.nodes()) { return way.nodes(); }

Sol2ScriptingEnvironment::Sol2ScriptingEnvironment(const std::string &file_name)
: file_name(file_name)
{
Expand Down Expand Up @@ -184,13 +182,14 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
"valid",
&osmium::Location::valid);

context.state.new_usertype<osmium::Way>("Way",
"get_value_by_key",
&get_value_by_key<osmium::Way>,
"id",
&osmium::Way::id,
"get_nodes",
&get_nodes_for_way);
context.state.new_usertype<osmium::Way>(
"Way",
"get_value_by_key",
&get_value_by_key<osmium::Way>,
"id",
&osmium::Way::id,
"get_nodes",
[](const osmium::Way &way) { return sol::as_table(way.nodes()); });

context.state.new_usertype<osmium::Node>("Node",
"location",
Expand Down Expand Up @@ -257,8 +256,6 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
"backward_mode",
sol::property(&ExtractionWay::get_backward_mode, &ExtractionWay::set_backward_mode));

context.state.new_usertype<osmium::WayNodeList>("WayNodeList");

// Keep in mind .location is undefined since we're not using libosmium's location cache
context.state.new_usertype<osmium::NodeRef>("NodeRef", "id", &osmium::NodeRef::ref);

Expand Down Expand Up @@ -308,12 +305,12 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
context.has_segment_function = segment_function.valid();
auto maybe_version = context.state.get<sol::optional<int>>("api_version");
if (maybe_version)
{
context.api_version = *maybe_version;
}
{
context.api_version = *maybe_version;
}

if (context.api_version < SUPPORTED_MIN_API_VERSION ||
context.api_version > SUPPORTED_MAX_API_VERSION )
context.api_version > SUPPORTED_MAX_API_VERSION)
{
throw util::exception("Invalid profile API version " + std::to_string(context.api_version) +
" only versions from " + std::to_string(SUPPORTED_MIN_API_VERSION) +
Expand Down