From c70d138eb9863e9007caa8299d1787a2578b9d28 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Mon, 4 Apr 2016 11:09:13 +0200 Subject: [PATCH] Spelling: Hierachy vs Hierarchy --- features/bicycle/access.feature | 2 +- features/bicycle/access_node.feature | 2 +- features/car/access.feature | 4 ++-- features/foot/access.feature | 2 +- features/foot/access_node.feature | 2 +- profiles/bicycle.lua | 6 +++--- profiles/car.lua | 6 +++--- profiles/foot.lua | 6 +++--- profiles/lib/access.lua | 4 ++-- src/extractor/restriction_parser.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/features/bicycle/access.feature b/features/bicycle/access.feature index 3a2fffbc0..e324b2ec3 100644 --- a/features/bicycle/access.feature +++ b/features/bicycle/access.feature @@ -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 | diff --git a/features/bicycle/access_node.feature b/features/bicycle/access_node.feature index 05e94feae..61e7c131d 100644 --- a/features/bicycle/access_node.feature +++ b/features/bicycle/access_node.feature @@ -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 | diff --git a/features/car/access.feature b/features/car/access.feature index 8f05ccbca..e98fc59a4 100644 --- a/features/car/access.feature +++ b/features/car/access.feature @@ -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 | @@ -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 | diff --git a/features/foot/access.feature b/features/foot/access.feature index 353076c40..3c8af4121 100644 --- a/features/foot/access.feature +++ b/features/foot/access.feature @@ -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 | diff --git a/features/foot/access_node.feature b/features/foot/access_node.feature index 8519d0564..9c6b1966c 100644 --- a/features/foot/access_node.feature +++ b/features/foot/access_node.feature @@ -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 | diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua index 1ebbffddf..b34dd9320 100644 --- a/profiles/bicycle.lua +++ b/profiles/bicycle.lua @@ -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" } @@ -137,7 +137,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 @@ -186,7 +186,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 diff --git a/profiles/car.lua b/profiles/car.lua index b77325f0d..30faa3646 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -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" } @@ -185,7 +185,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 @@ -242,7 +242,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 diff --git a/profiles/foot.lua b/profiles/foot.lua index 61751e356..8ac147e43 100644 --- a/profiles/foot.lua +++ b/profiles/foot.lua @@ -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" } @@ -81,7 +81,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 @@ -133,7 +133,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 diff --git a/profiles/lib/access.lua b/profiles/lib/access.lua index 3fd4ff605..3433c6568 100644 --- a/profiles/lib/access.lua +++ b/profiles/lib/access.lua @@ -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 diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp index 3f1648563..ce54576b8 100644 --- a/src/extractor/restriction_parser.cpp +++ b/src/extractor/restriction_parser.cpp @@ -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: // 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())