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

Spelling: Hierachy vs Hierarchy

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-04-04 11:09:13 +02:00
parent af2a327310
commit c70d138eb9
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/bicycle/access.feature
View File

@ -5,7 +5,7 @@ Feature: Bike - Access tags on ways
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"
Scenario: Bike - Access tag hierachy on ways Scenario: Bike - Access tag hierarchy on ways
Then routability should be Then routability should be
| highway | access | vehicle | bicycle | bothw | | highway | access | vehicle | bicycle | bothw |
| | | | | x | | | | | | x |

2
features/bicycle/access_node.feature
View File

@ -5,7 +5,7 @@ Feature: Bike - Access tags on nodes
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"
Scenario: Bike - Access tag hierachy on nodes Scenario: Bike - Access tag hierarchy on nodes
Then routability should be Then routability should be
| node/access | node/vehicle | node/bicycle | node/highway | bothw | | node/access | node/vehicle | node/bicycle | node/highway | bothw |
| | | | | x | | | | | | x |

4
features/car/access.feature
View File

@ -5,7 +5,7 @@ Feature: Car - Restricted access
Background: Background:
Given the profile "car" Given the profile "car"
Scenario: Car - Access tag hierachy on ways Scenario: Car - Access tag hierarchy on ways
Then routability should be Then routability should be
| access | vehicle | motor_vehicle | motorcar | bothw | | access | vehicle | motor_vehicle | motorcar | bothw |
| | | | | x | | | | | | x |
@ -30,7 +30,7 @@ Feature: Car - Restricted access
| | | no | yes | x | | | | no | yes | x |
| | | yes | no | | | | | yes | no | |
Scenario: Car - Access tag hierachy on nodes Scenario: Car - Access tag hierarchy on nodes
Then routability should be Then routability should be
| node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw | | node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
| | | | | x | | | | | | x |

2
features/foot/access.feature
View File

@ -5,7 +5,7 @@ Feature: Foot - Access tags on ways
Background: Background:
Given the profile "foot" Given the profile "foot"
Scenario: Foot - Access tag hierachy on ways Scenario: Foot - Access tag hierarchy on ways
Then routability should be Then routability should be
| highway | access | foot | bothw | | highway | access | foot | bothw |
| footway | | | x | | footway | | | x |

2
features/foot/access_node.feature
View File

@ -5,7 +5,7 @@ Feature: Foot - Access tags on nodes
Background: Background:
Given the profile "foot" Given the profile "foot"
Scenario: Foot - Access tag hierachy on nodes Scenario: Foot - Access tag hierarchy on nodes
Then routability should be Then routability should be
| node/access | node/foot | bothw | | node/access | node/foot | bothw |
| | | x | | | | x |

6
profiles/bicycle.lua
View File

@ -8,7 +8,7 @@ barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true,
access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true } access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "bicycle", "vehicle", "access" } access_tags_hierarchy = { "bicycle", "vehicle", "access" }
cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true } cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true }
service_tag_restricted = { ["parking_aisle"] = true } service_tag_restricted = { ["parking_aisle"] = true }
restriction_exception_tags = { "bicycle", "vehicle", "access" } restriction_exception_tags = { "bicycle", "vehicle", "access" }
@ -137,7 +137,7 @@ function node_function (node, result)
local highway = node:get_value_by_key("highway") local highway = node:get_value_by_key("highway")
local is_crossing = highway and highway == "crossing" local is_crossing = highway and highway == "crossing"
local access = find_access_tag(node, access_tags_hierachy) local access = find_access_tag(node, access_tags_hierarchy)
if access and access ~= "" then if access and access ~= "" then
-- access restrictions on crossing nodes are not relevant for -- access restrictions on crossing nodes are not relevant for
-- the traffic on the road -- the traffic on the road
@ -186,7 +186,7 @@ function way_function (way, result)
end end
-- access -- access
local access = find_access_tag(way, access_tags_hierachy) local access = find_access_tag(way, access_tags_hierarchy)
if access and access_tag_blacklist[access] then if access and access_tag_blacklist[access] then
return return
end end

6
profiles/car.lua
View File

@ -7,7 +7,7 @@ barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["check
access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true, ["destination"] = true } access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true, ["destination"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true, ["emergency"] = true, ["psv"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true, ["emergency"] = true, ["psv"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "motorcar", "motor_vehicle", "vehicle", "access" } access_tags_hierarchy = { "motorcar", "motor_vehicle", "vehicle", "access" }
service_tag_restricted = { ["parking_aisle"] = true } service_tag_restricted = { ["parking_aisle"] = true }
restriction_exception_tags = { "motorcar", "motor_vehicle", "vehicle" } restriction_exception_tags = { "motorcar", "motor_vehicle", "vehicle" }
@ -185,7 +185,7 @@ end
function node_function (node, result) function node_function (node, result)
-- parse access and barrier tags -- parse access and barrier tags
local access = find_access_tag(node, access_tags_hierachy) local access = find_access_tag(node, access_tags_hierarchy)
if access and access ~= "" then if access and access ~= "" then
if access_tag_blacklist[access] then if access_tag_blacklist[access] then
result.barrier = true result.barrier = true
@ -242,7 +242,7 @@ function way_function (way, result)
end end
-- Check if we are allowed to access the way -- Check if we are allowed to access the way
local access = find_access_tag(way, access_tags_hierachy) local access = find_access_tag(way, access_tags_hierarchy)
if access_tag_blacklist[access] then if access_tag_blacklist[access] then
return return
end end

6
profiles/foot.lua
View File

@ -7,7 +7,7 @@ barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true,
access_tag_whitelist = { ["yes"] = true, ["foot"] = true, ["permissive"] = true, ["designated"] = true } access_tag_whitelist = { ["yes"] = true, ["foot"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "foot", "access" } access_tags_hierarchy = { "foot", "access" }
service_tag_restricted = { ["parking_aisle"] = true } service_tag_restricted = { ["parking_aisle"] = true }
ignore_in_grid = { ["ferry"] = true } ignore_in_grid = { ["ferry"] = true }
restriction_exception_tags = { "foot" } restriction_exception_tags = { "foot" }
@ -81,7 +81,7 @@ end
function node_function (node, result) function node_function (node, result)
local barrier = node:get_value_by_key("barrier") local barrier = node:get_value_by_key("barrier")
local access = find_access_tag(node, access_tags_hierachy) local access = find_access_tag(node, access_tags_hierarchy)
local traffic_signal = node:get_value_by_key("highway") local traffic_signal = node:get_value_by_key("highway")
-- flag node if it carries a traffic light -- flag node if it carries a traffic light
@ -133,7 +133,7 @@ function way_function (way, result)
end end
-- access -- access
local access = find_access_tag(way, access_tags_hierachy) local access = find_access_tag(way, access_tags_hierarchy)
if access_tag_blacklist[access] then if access_tag_blacklist[access] then
return return
end end

4
profiles/lib/access.lua
View File

@ -2,8 +2,8 @@ local ipairs = ipairs
local Access = {} local Access = {}
function Access.find_access_tag(source,access_tags_hierachy) function Access.find_access_tag(source,access_tags_hierarchy)
for i,v in ipairs(access_tags_hierachy) do for i,v in ipairs(access_tags_hierarchy) do
local tag = source:get_value_by_key(v) local tag = source:get_value_by_key(v)
if tag and tag ~= '' then if tag and tag ~= '' then
return tag return tag

2
src/extractor/restriction_parser.cpp
View File

@ -207,7 +207,7 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st
// should this restriction be ignored? yes if there's an overlap between: // should this restriction be ignored? yes if there's an overlap between:
// a) the list of modes in the except tag of the restriction // a) the list of modes in the except tag of the restriction
// (except_tag_string), eg: except=bus;bicycle // (except_tag_string), eg: except=bus;bicycle
// b) the lua profile defines a hierachy of modes, // b) the lua profile defines a hierarchy of modes,
// eg: [access, vehicle, bicycle] // eg: [access, vehicle, bicycle]
if (except_tag_string.empty()) if (except_tag_string.empty())