From 10cf41d1389d11a81ee0665a968ad9d7cb1f50bc Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Fri, 2 Nov 2012 09:10:19 +0100 Subject: [PATCH] Fixes issue #493 --- profile.lua | 209 ++++++++++++++++++++++++++++++++++++++++++- profiles/bicycle.lua | 2 +- profiles/car.lua | 2 +- profiles/foot.lua | 2 +- 4 files changed, 211 insertions(+), 4 deletions(-) mode change 120000 => 100644 profile.lua diff --git a/profile.lua b/profile.lua deleted file mode 120000 index bad7e6bb5..000000000 --- a/profile.lua +++ /dev/null @@ -1 +0,0 @@ -profiles/car.lua \ No newline at end of file diff --git a/profile.lua b/profile.lua new file mode 100644 index 000000000..a9f3a455c --- /dev/null +++ b/profile.lua @@ -0,0 +1,208 @@ +-- Begin of globals + +barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true} +access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true } +access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true } +access_tag_restricted = { ["destination"] = true, ["delivery"] = true } +access_tags = { "motorcar", "motor_vehicle", "vehicle" } +access_tags_hierachy = { "motorcar", "motor_vehicle", "vehicle", "access" } +service_tag_restricted = { ["parking_aisle"] = true } +ignore_in_grid = { ["ferry"] = true } + +speed_profile = { + ["motorway"] = 90, + ["motorway_link"] = 75, + ["trunk"] = 85, + ["trunk_link"] = 70, + ["primary"] = 65, + ["primary_link"] = 60, + ["secondary"] = 55, + ["secondary_link"] = 50, + ["tertiary"] = 40, + ["tertiary_link"] = 30, + ["unclassified"] = 25, + ["residential"] = 25, + ["living_street"] = 10, + ["service"] = 15, +-- ["track"] = 5, + ["ferry"] = 5, +-- ["pier"] = 5, + ["default"] = 50 +} + +take_minimum_of_speeds = false +obey_oneway = true +obey_bollards = true +use_restrictions = true +ignore_areas = true -- future feature +traffic_signal_penalty = 2 +u_turn_penalty = 20 + +-- End of globals + +--find first tag in access hierachy which is set +function find_access_tag(source) + for i,v in ipairs(access_tags_hierachy) do + local tag = source.tags:Find(v) + if tag ~= '' then --and tag ~= "" then + return tag + end + end + return nil +end + +function node_function (node) + local barrier = node.tags:Find ("barrier") + local access = find_access_tag(node) + local traffic_signal = node.tags:Find("highway") + + --flag node if it carries a traffic light + + if traffic_signal == "traffic_signals" then + node.traffic_light = true; + end + + -- parse access and barrier tags + if access and access ~= "" then + if access_tag_blacklist[access] then + node.bollard = true + end + elseif barrier and barrier ~= "" then + if barrier_whitelist[barrier] then + return + else + node.bollard = true + end + end + + return 1 +end + + +function way_function (way, numberOfNodesInWay) + + -- A way must have two nodes or more + if(numberOfNodesInWay < 2) then + return 0; + end + + -- First, get the properties of each way that we come across + local highway = way.tags:Find("highway") + local name = way.tags:Find("name") + local ref = way.tags:Find("ref") + local junction = way.tags:Find("junction") + local route = way.tags:Find("route") + local maxspeed = parseMaxspeed(way.tags:Find ( "maxspeed") ) + --local man_made = way.tags:Find("man_made") + local barrier = way.tags:Find("barrier") + local oneway = way.tags:Find("oneway") + local cycleway = way.tags:Find("cycleway") + local duration = way.tags:Find("duration") + local service = way.tags:Find("service") + local area = way.tags:Find("area") + local access = find_access_tag(way) + + -- Second, parse the way according to these properties + + if ignore_areas and ("yes" == area) then + return 0 + end + + -- Check if we are allowed to access the way + if access_tag_blacklist[access] then + return 0 + end + + + -- Check if our vehicle types are forbidden +-- for i,v in ipairs(access_tags) do +-- local mode_value = way.tags:Find(v) +-- if nil ~= mode_value and "no" == mode_value then +-- return 0; +-- end +-- end + + + -- Set the name that will be used for instructions + if "" ~= ref then + way.name = ref + elseif "" ~= name then + way.name = name +-- else +-- way.name = highway -- if no name exists, use way type + end + + if "roundabout" == junction then + way.roundabout = true; + end + + -- Handling ferries and piers + + if (speed_profile[route] ~= nil and speed_profile[route] > 0) --or + --(speed_profile[man_made] ~= nil and speed_profile[man_made] > 0) + then + if durationIsValid(duration) then + way.speed = math.max( parseDuration(duration) / math.max(1, numberOfNodesInWay-1) ); + way.is_duration_set = true; + end + way.direction = Way.bidirectional; + if speed_profile[route] ~= nil then + highway = route; + --elseif speed_profile[man_made] ~= nil then + -- highway = man_made; + end + if not way.is_duration_set then + way.speed = speed_profile[highway] + end + + end + + -- Set the avg speed on the way if it is accessible by road class + if (speed_profile[highway] ~= nil and way.speed == -1 ) then + if (0 < maxspeed and not take_minimum_of_speeds) or (maxspeed == 0) then + maxspeed = math.huge + end + way.speed = math.min(speed_profile[highway], maxspeed) + end + + -- Set the avg speed on ways that are marked accessible + if "" ~= highway and access_tag_whitelist[access] and way.speed == -1 then + if (0 < maxspeed and not take_minimum_of_speeds) or maxspeed == 0 then + maxspeed = math.huge + end + way.speed = math.min(speed_profile["default"], maxspeed) + end + + -- Set access restriction flag if access is allowed under certain restrictions only + if access ~= "" and access_tag_restricted[access] then + way.is_access_restricted = true + end + + -- Set access restriction flag if service is allowed under certain restrictions only + if service ~= "" and service_tag_restricted[service] then + way.is_access_restricted = true + end + + -- Set direction according to tags on way + if obey_oneway then + if oneway == "no" or oneway == "0" or oneway == "false" then + way.direction = Way.bidirectional + elseif oneway == "-1" then + way.direction = Way.opposite + elseif oneway == "yes" or oneway == "1" or oneway == "true" or junction == "roundabout" or highway == "motorway_link" or highway == "motorway" then + way.direction = Way.oneway + else + way.direction = Way.bidirectional + end + else + way.direction = Way.bidirectional + end + + -- Override general direction settings of there is a specific one for our mode of travel + + if ignore_in_grid[highway] ~= nil and ignore_in_grid[highway] then + way.ignore_in_grid = true + end + way.type = 1 + return 1 +end diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua index 8f24d791e..d2372afe6 100644 --- a/profiles/bicycle.lua +++ b/profiles/bicycle.lua @@ -1,5 +1,5 @@ -- Begin of globals -barrier_whitelist = { [""] = true, ["bollard"] = true, ["entrance"] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["no"] = true, ["sally_port"] = true, ["gate"] = true} +barrier_whitelist = { [""] = true, ["bollard"] = true, ["entrance"] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true} access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true } diff --git a/profiles/car.lua b/profiles/car.lua index 046259f78..a9f3a455c 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -1,6 +1,6 @@ -- Begin of globals -barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["no"] = true, ["sally_port"] = true, ["gate"] = true} +barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true} access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true } diff --git a/profiles/foot.lua b/profiles/foot.lua index 5cac51111..596917aa5 100644 --- a/profiles/foot.lua +++ b/profiles/foot.lua @@ -2,7 +2,7 @@ -- Begin of globals -bollards_whitelist = { [""] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["no"] = true, ["sally_port"] = true, ["gate"] = true} +bollards_whitelist = { [""] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true} access_tag_whitelist = { ["yes"] = true, ["foot"] = true, ["permissive"] = true, ["designated"] = true } access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true } access_tag_restricted = { ["destination"] = true, ["delivery"] = true }