Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #443 from ibikecph/move_profiles

Browse Source 
clean up duplicated lua profiles
This commit is contained in:
Project OSRM 2012-09-27 03:12:57 -07:00
commit 8e15a32229
5 changed files with 44 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/support/config.rb
View File

@ -12,7 +12,7 @@ def read_speedprofile profile
end end
def write_speedprofile def write_speedprofile
FileUtils.copy_file "profiles/#{@speedprofile}.lua", "profile.lua" FileUtils.copy_file "../profiles/#{@speedprofile}.lua", "profile.lua"
end end
def write_server_ini def write_server_ini

211
profile.lua
View File

@ -1,211 +0,0 @@
-- Begin of globals
bollards_whitelist = { [""] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["no"] = 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" }
service_tag_restricted = { ["parking_aisle"] = true }
ignore_in_grid = { ["ferry"] = true, ["pier"] = 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 = true
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
function node_function (node)
local barrier = node.tags:Find ("barrier")
local access = node.tags:Find ("access")
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
if access_tag_blacklist[barrier] then
node.bollard = true;
end
if "" ~= barrier then
if obey_bollards then
--flag node as unpassable if it black listed as unpassable
node.bollard = true;
end
--reverse the previous flag if there is an access tag specifying entrance
if node.bollard and bollards_whitelist[barrier] and access_tag_whitelist[barrier] then
node.bollard = false;
return 1
end
-- Check if our vehicle types are allowd to pass the barrier
for i,v in ipairs(access_tags) do
local mode_value = node.tags:Find(v)
if nil ~= mode_value and "yes" == mode_value then
node.bollard = false
return
end
end
else
-- Check if our vehicle types are forbidden to pass the node
for i,v in ipairs(access_tags) do
local mode_value = node.tags:Find(v)
if nil ~= mode_value and "no" == mode_value then
node.bollard = true
return 1
end
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 = way.tags:Find("access")
-- 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] ~=nil and 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
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( 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 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

1
profile.lua Symbolic link
View File

@ -0,0 +1 @@
profiles/car.lua

0
test/profiles/bicycle.lua → profiles/bicycle.lua
View File

65
test/profiles/car.lua → profiles/car.lua
View File

@ -1,5 +1,3 @@
-- Car profile
-- Begin of globals -- 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, ["no"] = true, ["sally_port"] = true, ["gate"] = true}
@ -11,19 +9,18 @@ service_tag_restricted = { ["parking_aisle"] = true }
ignore_in_grid = { ["ferry"] = true, ["pier"] = true } ignore_in_grid = { ["ferry"] = true, ["pier"] = true }
speed_profile = { speed_profile = {
["motorway"] = 100, ["motorway"] = 90,
["motorway_link"] = 90, ["motorway_link"] = 75,
["trunk"] = 90, ["trunk"] = 85,
["trunk_link"] = 90, ["trunk_link"] = 70,
["primary"] = 70, ["primary"] = 65,
["primary_link"] = 60, ["primary_link"] = 60,
["secondary"] = 60, ["secondary"] = 55,
["secondary_link"] = 50, ["secondary_link"] = 50,
["tertiary"] = 50, ["tertiary"] = 40,
["tertiary_link"] = 40, ["tertiary_link"] = 30,
["unclassified"] = 30, ["unclassified"] = 25,
["residential"] = 40, ["residential"] = 25,
["road"] = 40,
["living_street"] = 10, ["living_street"] = 10,
["service"] = 15, ["service"] = 15,
-- ["track"] = 5, -- ["track"] = 5,
@ -32,7 +29,6 @@ speed_profile = {
["default"] = 50 ["default"] = 50
} }
take_minimum_of_speeds = true take_minimum_of_speeds = true
obey_oneway = true obey_oneway = true
obey_bollards = true obey_bollards = true
@ -54,16 +50,37 @@ function node_function (node)
node.traffic_light = true; node.traffic_light = true;
end end
if obey_bollards then if access_tag_blacklist[barrier] then
--flag node as unpassable if it black listed as unpassable node.bollard = true;
if access_tag_blacklist[barrier] then end
node.bollard = true;
end
--reverse the previous flag if there is an access tag specifying entrance if "" ~= barrier then
if node.bollard and not bollards_whitelist[barrier] and not access_tag_whitelist[barrier] then if obey_bollards then
node.bollard = false; --flag node as unpassable if it black listed as unpassable
end node.bollard = true;
end
--reverse the previous flag if there is an access tag specifying entrance
if node.bollard and bollards_whitelist[barrier] and access_tag_whitelist[barrier] then
node.bollard = false;
return 1
end
-- Check if our vehicle types are allowd to pass the barrier
for i,v in ipairs(access_tags) do
local mode_value = node.tags:Find(v)
if nil ~= mode_value and "yes" == mode_value then
node.bollard = false
return
end
end
else
-- Check if our vehicle types are forbidden to pass the node
for i,v in ipairs(access_tags) do
local mode_value = node.tags:Find(v)
if nil ~= mode_value and "no" == mode_value then
node.bollard = true
return 1
end
end
end end
return 1 return 1
end end
@ -128,7 +145,7 @@ function way_function (way, numberOfNodesInWay)
(speed_profile[man_made] ~= nil and speed_profile[man_made] > 0) (speed_profile[man_made] ~= nil and speed_profile[man_made] > 0)
then then
if durationIsValid(duration) then if durationIsValid(duration) then
way.speed = parseDuration / math.max(1, numberOfSegments-1); way.speed = math.max( duration / math.max(1, numberOfNodesInWay-1) );
way.is_duration_set = true; way.is_duration_set = true;
end end
way.direction = Way.bidirectional; way.direction = Way.bidirectional;

0
test/profiles/foot.lua → profiles/foot.lua
View File