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.

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

Spelling: Hierachy vs Hierarchy #2203

Merged
merged 1 commit into from
Apr 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion features/bicycle/access.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Bike - Access tags on ways
Background:
Given the profile "bicycle"

Scenario: Bike - Access tag hierachy on ways
Scenario: Bike - Access tag hierarchy on ways
Then routability should be
| highway | access | vehicle | bicycle | bothw |
| | | | | x |
Expand Down
2 changes: 1 addition & 1 deletion features/bicycle/access_node.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Bike - Access tags on nodes
Background:
Given the profile "bicycle"

Scenario: Bike - Access tag hierachy on nodes
Scenario: Bike - Access tag hierarchy on nodes
Then routability should be
| node/access | node/vehicle | node/bicycle | node/highway | bothw |
| | | | | x |
Expand Down
4 changes: 2 additions & 2 deletions features/car/access.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Car - Restricted access
Background:
Given the profile "car"

Scenario: Car - Access tag hierachy on ways
Scenario: Car - Access tag hierarchy on ways
Then routability should be
| access | vehicle | motor_vehicle | motorcar | bothw |
| | | | | x |
Expand All @@ -30,7 +30,7 @@ Feature: Car - Restricted access
| | | no | yes | x |
| | | yes | no | |

Scenario: Car - Access tag hierachy on nodes
Scenario: Car - Access tag hierarchy on nodes
Then routability should be
| node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
| | | | | x |
Expand Down
2 changes: 1 addition & 1 deletion features/foot/access.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Foot - Access tags on ways
Background:
Given the profile "foot"

Scenario: Foot - Access tag hierachy on ways
Scenario: Foot - Access tag hierarchy on ways
Then routability should be
| highway | access | foot | bothw |
| footway | | | x |
Expand Down
2 changes: 1 addition & 1 deletion features/foot/access_node.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Foot - Access tags on nodes
Background:
Given the profile "foot"

Scenario: Foot - Access tag hierachy on nodes
Scenario: Foot - Access tag hierarchy on nodes
Then routability should be
| node/access | node/foot | bothw |
| | | x |
Expand Down
6 changes: 3 additions & 3 deletions profiles/bicycle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true,
access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = 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 }
service_tag_restricted = { ["parking_aisle"] = true }
restriction_exception_tags = { "bicycle", "vehicle", "access" }
Expand Down Expand Up @@ -131,7 +131,7 @@ function node_function (node, result)
local highway = node:get_value_by_key("highway")
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
-- access restrictions on crossing nodes are not relevant for
-- the traffic on the road
Expand Down Expand Up @@ -180,7 +180,7 @@ function way_function (way, result)
end

-- 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
return
end
Expand Down
6 changes: 3 additions & 3 deletions profiles/car.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true, ["emergency"] = true, ["psv"] = 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 }
restriction_exception_tags = { "motorcar", "motor_vehicle", "vehicle" }

Expand Down Expand Up @@ -180,7 +180,7 @@ end

function node_function (node, result)
-- 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_tag_blacklist[access] then
result.barrier = true
Expand Down Expand Up @@ -237,7 +237,7 @@ function way_function (way, result)
end

-- 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
return
end
Expand Down
6 changes: 3 additions & 3 deletions profiles/foot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "foot", "access" }
access_tags_hierarchy = { "foot", "access" }
service_tag_restricted = { ["parking_aisle"] = true }
ignore_in_grid = { ["ferry"] = true }
restriction_exception_tags = { "foot" }
Expand Down Expand Up @@ -79,7 +79,7 @@ end

function node_function (node, result)
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")

-- flag node if it carries a traffic light
Expand Down Expand Up @@ -131,7 +131,7 @@ function way_function (way, result)
end

-- 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
return
end
Expand Down
4 changes: 2 additions & 2 deletions profiles/lib/access.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ local ipairs = ipairs

local Access = {}

function Access.find_access_tag(source,access_tags_hierachy)
for i,v in ipairs(access_tags_hierachy) do
function Access.find_access_tag(source,access_tags_hierarchy)
for i,v in ipairs(access_tags_hierarchy) do
local tag = source:get_value_by_key(v)
if tag and tag ~= '' then
return tag
Expand Down
2 changes: 1 addition & 1 deletion src/extractor/restriction_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st
// should this restriction be ignored? yes if there's an overlap between:
// a) the list of modes in the except tag of the restriction
// (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]

if (except_tag_string.empty())
Expand Down