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

Fixes failing cucumber test features/ferry.feature:4

Browse Source 
Scenario: Use a ferry route
This commit is contained in:
DennisOSRM 2012-09-27 13:49:49 +02:00
parent 9a3735aa21
commit 0d087fcbce
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
profiles/bicycle.lua
View File

@ -28,7 +28,8 @@ speed_profile = {
["pedestrian"] = 5, ["pedestrian"] = 5,
["pier"] = 5, ["pier"] = 5,
["steps"] = 1, ["steps"] = 1,
["default"] = 18 ["default"] = 18,
["ferry"] = 5
} }
@ -100,13 +101,33 @@ function way_function (way, numberOfNodesInWay)
way.name = highway -- if no name exists, use way type way.name = highway -- if no name exists, use way type
end end
-- Set the avg speed on the way if it is accessible by road class -- Handling ferries and piers
if (speed_profile[highway] ~= nil and way.speed == -1 ) then if (speed_profile[route] ~= nil and speed_profile[route] > 0) or
if (0 < maxspeed and not take_minimum_of_speeds) or (maxspeed == 0) then (speed_profile[man_made] ~= nil and speed_profile[man_made] > 0)
maxspeed = math.huge then
end if durationIsValid(duration) then
way.speed = math.min(speed_profile[highway], maxspeed) way.speed = math.max( duration / math.max(1, numberOfNodesInWay-1) );
end 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
print("added "..route.." with speed "..way.speed)
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 -- Set the avg speed on ways that are marked accessible
if access_tag_whitelist[access] and way.speed == -1 then if access_tag_whitelist[access] and way.speed == -1 then