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-01 17:15:12 +03:00 committed by Michael Krasnyk
parent c2fd64d3cc
commit 75bdf114be
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/profiles.md
View File

@ -114,7 +114,7 @@ classes | Sequence | Determines the allowed
restrictions | Sequence | Determines which turn restrictions will be used for this profile. restrictions | Sequence | Determines which turn restrictions will be used for this profile.
suffix_list | Set | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES". suffix_list | Set | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES".
### process_node(profile, node, result) ### process_node(profile, node, result, relations)
Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay. Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay.
Argument | Description Argument | Description
@ -122,6 +122,7 @@ Argument | Description
profile | The configuration table you returned in `setup`. profile | The configuration table you returned in `setup`.
node | The input node to process (read-only). node | The input node to process (read-only).
result | The output that you will modify. result | The output that you will modify.
relations| The list of relation attributes passed from `process_relation` function for this node.
The following attributes can be set on `result`: The following attributes can be set on `result`:
@ -130,7 +131,7 @@ Attribute | Type | Notes
barrier | Boolean | Is it an impassable barrier? barrier | Boolean | Is it an impassable barrier?
traffic_lights | Boolean | Is it a traffic light (incurs delay in `process_turn`)? traffic_lights | Boolean | Is it a traffic light (incurs delay in `process_turn`)?
### process_way(profile, way, result) ### process_way(profile, way, result, relations)
Given an OpenStreetMap way, the `process_way` function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash. Given an OpenStreetMap way, the `process_way` function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash.
Argument | Description Argument | Description
@ -138,6 +139,7 @@ Argument | Description
profile | The configuration table you returned in `setup`. profile | The configuration table you returned in `setup`.
node | The input way to process (read-only). node | The input way to process (read-only).
result | The output that you will modify. result | The output that you will modify.
relations| The list of relation attributes passed from `process_relation` function for this way.
Importantly it will set `result.forward_mode` and `result.backward_mode` to indicate the travel mode in each direction, as well as set `result.forward_speed` and `result.backward_speed` to integer values representing the speed for traversing the way. Importantly it will set `result.forward_mode` and `result.backward_mode` to indicate the travel mode in each direction, as well as set `result.forward_speed` and `result.backward_speed` to integer values representing the speed for traversing the way.
@ -215,7 +217,7 @@ function process_relation(profile, relation, result)
local t = relation:get_value_by_key("type") local t = relation:get_value_by_key("type")
if t == "route" then if t == "route" then
for _, m in ipairs(relation:members()) do for _, m in ipairs(relation:members()) do
if m:role() == "north" then if m:role == "north" then
result[m]['direction'] = 'north' result[m]['direction'] = 'north'
print('direction_north') print('direction_north')
end end

6
include/extractor/extraction_relation.hpp
View File

@ -11,12 +11,6 @@ namespace osrm
{ {
namespace extractor namespace extractor
{ {
namespace detail
{
inline const char *checkedString(const char *str) { return str ? str : ""; }
} // namespace detail
struct ExtractionRelation struct ExtractionRelation
{ {

4
src/extractor/scripting_environment_lua.cpp
View File

@ -319,7 +319,9 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
"role", "role",
&RelationMemberWrap::GetRole, &RelationMemberWrap::GetRole,
"item_type", "item_type",
&RelationMemberWrap::GetItemType); &RelationMemberWrap::GetItemType,
"id",
&RelationMemberWrap::GetId);
/** TODO: make better solution with members iteration. /** TODO: make better solution with members iteration.
* For this moment, just make vector of RelationMember wrappers * For this moment, just make vector of RelationMember wrappers