Spelling: Hierachy vs Hierarchy

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
+3 -3
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_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
+3 -3
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_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
+3 -3
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_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
+2 -2
View File
@@ -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