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

bike: surface should never increase speed

Browse Source
This commit is contained in:
Emil Tin 2016-06-25 12:01:50 +02:00
parent e03d132823
commit d21a9a514d
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
features/bicycle/surface.feature
View File

@ -38,3 +38,20 @@ Feature: Bike - Surfaces
| cycleway | | 48s |
| nosense | | |
| nosense | asphalt | |
Scenario: Bicycle - Surfaces should not increase speed when pushing bikes
Given the node map
| a | b |
| c | d |
And the ways
| nodes | highway | oneway | surface |
| ab | primary | yes | asphalt |
| cd | footway | | asphalt |
When I route I should get
| from | to | route | modes | speed |
| a | b | ab,ab | cycling,cycling | 15 km/h |
| b | a | ab,ab | pushing bike,pushing bike | 6 km/h |
| c | d | cd,cd | pushing bike,pushing bike | 6 km/h |
| d | c | cd,cd | pushing bike,pushing bike | 6 km/h |

18
profiles/bicycle.lua
View File

@ -207,7 +207,6 @@ function way_function (way, result)
local foot = way:get_value_by_key("foot")
local foot_forward = way:get_value_by_key("foot:forward")
local foot_backward = way:get_value_by_key("foot:backward")
local surface = way:get_value_by_key("surface")
local bicycle = way:get_value_by_key("bicycle")
-- name
@ -385,17 +384,12 @@ function way_function (way, result)
result.backward_speed = walking_speed
end
-- surfaces
if surface then
surface_speed = surface_speeds[surface]
if surface_speed then
if result.forward_speed > 0 then
result.forward_speed = surface_speed
end
if result.backward_speed > 0 then
result.backward_speed = surface_speed
end
end
-- reduce speed on bad surfaces
local surface = way:get_value_by_key("surface")
if surface and surface_speeds[surface] then
result.forward_speed = math.min(surface_speeds[surface], result.forward_speed)
result.backward_speed = math.min(surface_speeds[surface], result.backward_speed)
end
-- maxspeed