don't push against oneway flow on roundabout. fixes #591

This commit is contained in:
Emil Tin 2013-02-15 17:02:49 +01:00
parent cad0069be2
commit 9a44f16846
2 changed files with 14 additions and 6 deletions

View File

@ -79,3 +79,9 @@ Feature: Bike - Accessability of different way types
| construction | | | |
| construction | yes | | |
| construction | | yes | |
@roundabout
Scenario: Bike - Don't push bikes against oneway flow on roundabouts
Then routability should be
| junction | forw | backw |
| roundabout | x | |

View File

@ -263,12 +263,14 @@ function way_function (way, numberOfNodesInWay)
-- pushing bikes
if bicycle_speeds[highway] or pedestrian_speeds[highway] then
if foot ~= 'no' then
if way.direction == Way.oneway then
way.backward_speed = walking_speed
elseif way.direction == Way.opposite then
way.backward_speed = walking_speed
way.speed = way.speed
end
if junction ~= "roundabout" then
if way.direction == Way.oneway then
way.backward_speed = walking_speed
elseif way.direction == Way.opposite then
way.backward_speed = walking_speed
way.speed = way.speed
end
end
end
if way.backward_speed == way.speed then
-- TODO: no way yet to mark a way as pedestrian mode if forward/backward speeds are equal