port bicycle profile

This commit is contained in:
Dennis Luxen 2014-08-27 18:38:30 +02:00
parent bdc611b23a
commit 27c255c874
2 changed files with 120 additions and 119 deletions

View File

@ -125,42 +125,42 @@ function get_exceptions(vector)
end end
end end
function node_function (node) function node_function (node, result)
local barrier = node.tags:Find ("barrier") local barrier = node:get_value_by_key("barrier")
local access = Access.find_access_tag(node, access_tags_hierachy) local access = Access.find_access_tag(node, access_tags_hierachy)
local traffic_signal = node.tags:Find("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
if traffic_signal == "traffic_signals" then if traffic_signal and traffic_signal == "traffic_signals" then
node.traffic_light = true result.traffic_lights = true
end end
-- parse access and barrier tags -- parse access and barrier tags
if access and access ~= "" then if access and access ~= "" then
if access_tag_blacklist[access] then if access_tag_blacklist[access] then
node.bollard = true io.write("node access: " .. access .. "\n")
result.barrier = true
else else
node.bollard = false result.barrier = false
end end
elseif barrier and barrier ~= "" then elseif barrier and barrier ~= "" then
if barrier_whitelist[barrier] then if barrier_whitelist[barrier] then
node.bollard = false result.barrier = false
else else
node.bollard = true io.write("barrier access: " .. barrier .. "\n")
result.barrier = true
end end
end end
-- return 1
end end
function way_function (way) function way_function (way, result)
-- initial routability check, filters out buildings, boundaries, etc -- initial routability check, filters out buildings, boundaries, etc
local highway = way.tags:Find("highway") local highway = way:get_value_by_key("highway")
local route = way.tags:Find("route") local route = way:get_value_by_key("route")
local man_made = way.tags:Find("man_made") local man_made = way:get_value_by_key("man_made")
local railway = way.tags:Find("railway") local railway = way:get_value_by_key("railway")
local amenity = way.tags:Find("amenity") local amenity = way:get_value_by_key("amenity")
local public_transport = way.tags:Find("public_transport") local public_transport = way:get_value_by_key("public_transport")
if (not highway or highway == '') and if (not highway or highway == '') and
(not route or route == '') and (not route or route == '') and
(not railway or railway=='') and (not railway or railway=='') and
@ -178,117 +178,118 @@ function way_function (way)
-- access -- access
local access = Access.find_access_tag(way, access_tags_hierachy) local access = Access.find_access_tag(way, access_tags_hierachy)
if access_tag_blacklist[access] then if access and access_tag_blacklist[access] then
io.write("skipping " .. access .. "\n")
return return
end end
-- other tags -- other tags
local name = way.tags:Find("name") local name = way:get_value_by_key("name")
local ref = way.tags:Find("ref") local ref = way:get_value_by_key("ref")
local junction = way.tags:Find("junction") local junction = way:get_value_by_key("junction")
local maxspeed = parse_maxspeed(way.tags:Find ( "maxspeed") ) local maxspeed = parse_maxspeed(way:get_value_by_key ( "maxspeed") )
local maxspeed_forward = parse_maxspeed(way.tags:Find( "maxspeed:forward")) local maxspeed_forward = parse_maxspeed(way:get_value_by_key( "maxspeed:forward"))
local maxspeed_backward = parse_maxspeed(way.tags:Find( "maxspeed:backward")) local maxspeed_backward = parse_maxspeed(way:get_value_by_key( "maxspeed:backward"))
local barrier = way.tags:Find("barrier") local barrier = way:get_value_by_key("barrier")
local oneway = way.tags:Find("oneway") local oneway = way:get_value_by_key("oneway")
local onewayClass = way.tags:Find("oneway:bicycle") local onewayClass = way:get_value_by_key("oneway:bicycle")
local cycleway = way.tags:Find("cycleway") local cycleway = way:get_value_by_key("cycleway")
local cycleway_left = way.tags:Find("cycleway:left") local cycleway_left = way:get_value_by_key("cycleway:left")
local cycleway_right = way.tags:Find("cycleway:right") local cycleway_right = way:get_value_by_key("cycleway:right")
local duration = way.tags:Find("duration") local duration = way:get_value_by_key("duration")
local service = way.tags:Find("service") local service = way:get_value_by_key("service")
local area = way.tags:Find("area") local area = way:get_value_by_key("area")
local foot = way.tags:Find("foot") local foot = way:get_value_by_key("foot")
local surface = way.tags:Find("surface") local surface = way:get_value_by_key("surface")
local bicycle = way.tags:Find("bicycle") local bicycle = way:get_value_by_key("bicycle")
-- name -- name
if "" ~= ref and "" ~= name then if ref and "" ~= ref and name and "" ~= name then
way.name = name .. ' / ' .. ref result.name = name .. ' / ' .. ref
elseif "" ~= ref then elseif ref and "" ~= ref then
way.name = ref result.name = ref
elseif "" ~= name then elseif name and "" ~= name then
way.name = name result.name = name
else elseif highway then
-- if no name exists, use way type -- if no name exists, use way type
-- this encoding scheme is excepted to be a temporary solution -- this encoding scheme is excepted to be a temporary solution
way.name = "{highway:"..highway.."}" result.name = "{highway:"..highway.."}"
end end
-- roundabout handling -- roundabout handling
if "roundabout" == junction then if junction and "roundabout" == junction then
way.roundabout = true; result.roundabout = true;
end end
-- speed -- speed
if route_speeds[route] then if route_speeds[route] then
-- ferries (doesn't cover routes tagged using relations) -- ferries (doesn't cover routes tagged using relations)
way.forward_mode = mode_ferry result.forward_mode = mode_ferry
way.backward_mode = mode_ferry result.backward_mode = mode_ferry
way.ignore_in_grid = true result.ignore_in_grid = true
if durationIsValid(duration) then if duration and durationIsValid(duration) then
way.duration = math.max( 1, parseDuration(duration) ) result.duration = math.max( 1, parseDuration(duration) )
else else
way.forward_speed = route_speeds[route] result.forward_speed = route_speeds[route]
way.backward_speed = route_speeds[route] result.backward_speed = route_speeds[route]
end end
elseif railway and platform_speeds[railway] then elseif railway and platform_speeds[railway] then
-- railway platforms (old tagging scheme) -- railway platforms (old tagging scheme)
way.forward_speed = platform_speeds[railway] result.forward_speed = platform_speeds[railway]
way.backward_speed = platform_speeds[railway] result.backward_speed = platform_speeds[railway]
elseif platform_speeds[public_transport] then elseif platform_speeds[public_transport] then
-- public_transport platforms (new tagging platform) -- public_transport platforms (new tagging platform)
way.forward_speed = platform_speeds[public_transport] result.forward_speed = platform_speeds[public_transport]
way.backward_speed = platform_speeds[public_transport] result.backward_speed = platform_speeds[public_transport]
elseif railway and railway_speeds[railway] then elseif railway and railway_speeds[railway] then
way.forward_mode = mode_train result.forward_mode = mode_train
way.backward_mode = mode_train result.backward_mode = mode_train
-- railways -- railways
if access and access_tag_whitelist[access] then if access and access_tag_whitelist[access] then
way.forward_speed = railway_speeds[railway] result.forward_speed = railway_speeds[railway]
way.backward_speed = railway_speeds[railway] result.backward_speed = railway_speeds[railway]
end end
elseif amenity and amenity_speeds[amenity] then elseif amenity and amenity_speeds[amenity] then
-- parking areas -- parking areas
way.forward_speed = amenity_speeds[amenity] result.forward_speed = amenity_speeds[amenity]
way.backward_speed = amenity_speeds[amenity] result.backward_speed = amenity_speeds[amenity]
elseif bicycle_speeds[highway] then elseif bicycle_speeds[highway] then
-- regular ways -- regular ways
way.forward_speed = bicycle_speeds[highway] result.forward_speed = bicycle_speeds[highway]
way.backward_speed = bicycle_speeds[highway] result.backward_speed = bicycle_speeds[highway]
elseif access and access_tag_whitelist[access] then elseif access and access_tag_whitelist[access] then
-- unknown way, but valid access tag -- unknown way, but valid access tag
way.forward_speed = default_speed result.forward_speed = default_speed
way.backward_speed = default_speed result.backward_speed = default_speed
else else
-- biking not allowed, maybe we can push our bike? -- biking not allowed, maybe we can push our bike?
-- essentially requires pedestrian profiling, for example foot=no mean we can't push a bike -- essentially requires pedestrian profiling, for example foot=no mean we can't push a bike
if foot ~= 'no' and junction ~= "roundabout" then if foot ~= 'no' and junction ~= "roundabout" then
if pedestrian_speeds[highway] then if pedestrian_speeds[highway] then
-- pedestrian-only ways and areas -- pedestrian-only ways and areas
way.forward_speed = pedestrian_speeds[highway] result.forward_speed = pedestrian_speeds[highway]
way.backward_speed = pedestrian_speeds[highway] result.backward_speed = pedestrian_speeds[highway]
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
elseif man_made and man_made_speeds[man_made] then elseif man_made and man_made_speeds[man_made] then
-- man made structures -- man made structures
way.forward_speed = man_made_speeds[man_made] result.forward_speed = man_made_speeds[man_made]
way.backward_speed = man_made_speeds[man_made] result.backward_speed = man_made_speeds[man_made]
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
elseif foot == 'yes' then elseif foot == 'yes' then
way.forward_speed = walking_speed result.forward_speed = walking_speed
way.backward_speed = walking_speed result.backward_speed = walking_speed
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
elseif foot_forward == 'yes' then elseif foot_forward == 'yes' then
way.forward_speed = walking_speed result.forward_speed = walking_speed
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
way.backward_mode = 0 result.backward_mode = 0
elseif foot_backward == 'yes' then elseif foot_backward == 'yes' then
way.forward_speed = walking_speed result.forward_speed = walking_speed
way.forward_mode = 0 result.forward_mode = 0
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
end end
end end
end end
@ -300,84 +301,84 @@ function way_function (way)
end end
if onewayClass == "yes" or onewayClass == "1" or onewayClass == "true" then if onewayClass == "yes" or onewayClass == "1" or onewayClass == "true" then
way.backward_mode = 0 result.backward_mode = 0
elseif onewayClass == "no" or onewayClass == "0" or onewayClass == "false" then elseif onewayClass == "no" or onewayClass == "0" or onewayClass == "false" then
-- prevent implied oneway -- prevent implied oneway
elseif onewayClass == "-1" then elseif onewayClass == "-1" then
way.forward_mode = 0 result.forward_mode = 0
elseif oneway == "no" or oneway == "0" or oneway == "false" then elseif oneway == "no" or oneway == "0" or oneway == "false" then
-- prevent implied oneway -- prevent implied oneway
elseif cycleway and string.find(cycleway, "opposite") == 1 then elseif cycleway and string.find(cycleway, "opposite") == 1 then
if impliedOneway then if impliedOneway then
way.forward_mode = 0 result.forward_mode = 0
way.backward_mode = mode_normal result.backward_mode = mode_normal
way.backward_speed = bicycle_speeds["cycleway"] result.backward_speed = bicycle_speeds["cycleway"]
end end
elseif cycleway_left and cycleway_tags[cycleway_left] and cycleway_right and cycleway_tags[cycleway_right] then elseif cycleway_left and cycleway_tags[cycleway_left] and cycleway_right and cycleway_tags[cycleway_right] then
-- prevent implied -- prevent implied
elseif cycleway_left and cycleway_tags[cycleway_left] then elseif cycleway_left and cycleway_tags[cycleway_left] then
if impliedOneway then if impliedOneway then
way.forward_mode = 0 result.forward_mode = 0
way.backward_mode = mode_normal result.backward_mode = mode_normal
way.backward_speed = bicycle_speeds["cycleway"] result.backward_speed = bicycle_speeds["cycleway"]
end end
elseif cycleway_right and cycleway_tags[cycleway_right] then elseif cycleway_right and cycleway_tags[cycleway_right] then
if impliedOneway then if impliedOneway then
way.forward_mode = mode_normal result.forward_mode = mode_normal
way.backward_speed = bicycle_speeds["cycleway"] result.backward_speed = bicycle_speeds["cycleway"]
way.backward_mode = 0 result.backward_mode = 0
end end
elseif oneway == "-1" then elseif oneway == "-1" then
way.forward_mode = 0 result.forward_mode = 0
elseif oneway == "yes" or oneway == "1" or oneway == "true" or impliedOneway then elseif oneway == "yes" or oneway == "1" or oneway == "true" or impliedOneway then
way.backward_mode = 0 result.backward_mode = 0
end end
-- pushing bikes -- pushing bikes
if bicycle_speeds[highway] or pedestrian_speeds[highway] then if bicycle_speeds[highway] or pedestrian_speeds[highway] then
if foot ~= "no" and junction ~= "roundabout" then if foot ~= "no" and junction ~= "roundabout" then
if way.backward_mode == 0 then if result.backward_mode == 0 then
way.backward_speed = walking_speed result.backward_speed = walking_speed
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
elseif way.forward_mode == 0 then elseif result.forward_mode == 0 then
way.forward_speed = walking_speed result.forward_speed = walking_speed
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
end end
end end
end end
-- cycleways -- cycleways
if cycleway and cycleway_tags[cycleway] then if cycleway and cycleway_tags[cycleway] then
way.forward_speed = bicycle_speeds["cycleway"] result.forward_speed = bicycle_speeds["cycleway"]
elseif cycleway_left and cycleway_tags[cycleway_left] then elseif cycleway_left and cycleway_tags[cycleway_left] then
way.forward_speed = bicycle_speeds["cycleway"] result.forward_speed = bicycle_speeds["cycleway"]
elseif cycleway_right and cycleway_tags[cycleway_right] then elseif cycleway_right and cycleway_tags[cycleway_right] then
way.forward_speed = bicycle_speeds["cycleway"] result.forward_speed = bicycle_speeds["cycleway"]
end end
-- dismount -- dismount
if bicycle == "dismount" then if bicycle == "dismount" then
way.forward_mode = mode_pushing result.forward_mode = mode_pushing
way.backward_mode = mode_pushing result.backward_mode = mode_pushing
way.forward_speed = walking_speed result.forward_speed = walking_speed
way.backward_speed = walking_speed result.backward_speed = walking_speed
end end
-- surfaces -- surfaces
if surface then if surface then
surface_speed = surface_speeds[surface] surface_speed = surface_speeds[surface]
if surface_speed then if surface_speed then
if way.forward_speed > 0 then if result.forward_speed > 0 then
way.forward_speed = surface_speed result.forward_speed = surface_speed
end end
if way.backward_speed > 0 then if result.backward_speed > 0 then
way.backward_speed = surface_speed result.backward_speed = surface_speed
end end
end end
end end
-- maxspeed -- maxspeed
MaxSpeed.limit( way, maxspeed, maxspeed_forward, maxspeed_backward ) MaxSpeed.limit( result, maxspeed, maxspeed_forward, maxspeed_backward )
end end
function turn_function (angle) function turn_function (angle)

View File

@ -5,7 +5,7 @@ module "Access"
function find_access_tag(source,access_tags_hierachy) function find_access_tag(source,access_tags_hierachy)
for i,v in ipairs(access_tags_hierachy) do for i,v in ipairs(access_tags_hierachy) do
local tag = source:get_value_by_key(v) local tag = source:get_value_by_key(v)
if tag ~= '' then if tag and tag ~= '' then
return tag return tag
end end
end end