turn off turn restrictions for bicycle and foot, update tests

This commit is contained in:
Emil Tin 2013-02-11 10:05:53 +01:00 committed by DennisOSRM
parent db148741e9
commit 313b93169d
3 changed files with 20 additions and 20 deletions

View File

@ -1,6 +1,6 @@
@routing @bicycle @restrictions @routing @bicycle @restrictions
Feature: Bike - Turn restrictions Feature: Bike - Turn restrictions
Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction Ignore turn restrictions on bicycle, since you always become a temporary pedestrian.
Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
Background: Background:
@ -26,7 +26,7 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | sj,ej | | s | e | sj,ej |
@ -52,7 +52,7 @@ Feature: Bike - Turn restrictions
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | | | s | e | sj,ej |
@no_turning @no_turning
Scenario: Bike - No u-turn Scenario: Bike - No u-turn
@ -74,7 +74,7 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | sj,ej | | s | e | sj,ej |
@ -98,7 +98,7 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | sj,ej | | s | e | sj,ej |
@ -123,8 +123,8 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj |
| s | n | | | s | n | sj,nj |
| s | e | | | s | e | sj,ej |
@only_turning @only_turning
Scenario: Bike - Only right turn Scenario: Bike - Only right turn
@ -146,8 +146,8 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | | | s | n | sj,nj |
| s | e | sj,ej | | s | e | sj,ej |
@only_turning @only_turning
@ -170,9 +170,9 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | | | s | e | sj,ej |
@no_turning @no_turning
Scenario: Bike - Handle any only_* restriction Scenario: Bike - Handle any only_* restriction
@ -194,9 +194,9 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | sj,wj |
| s | n | sj,nj | | s | n | sj,nj |
| s | e | | | s | e | sj,ej |
@except @except
Scenario: Bike - Except tag and on no_ restrictions Scenario: Bike - Except tag and on no_ restrictions
@ -224,8 +224,8 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | a | sj,aj | | s | a | sj,aj |
| s | b | | | s | b | sj,bj |
| s | c | | | s | c | sj,cj |
| s | d | sj,dj | | s | d | sj,dj |
@except @except
@ -281,9 +281,9 @@ Feature: Bike - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | a | | | s | a | sj,ja |
| s | b | sj,jb | | s | b | sj,jb |
| s | c | sj,jc | | s | c | sj,jc |
| s | d | sj,jd | | s | d | sj,jd |
| s | e | | | s | e | sj,je |
| s | f | | | s | f | sj,jf |

View File

@ -72,7 +72,7 @@ use_restrictions = true
ignore_areas = true -- future feature ignore_areas = true -- future feature
traffic_signal_penalty = 2 traffic_signal_penalty = 2
u_turn_penalty = 20 u_turn_penalty = 20
use_turn_restrictions = false
-- End of globals -- End of globals
function get_exceptions(vector) function get_exceptions(vector)

View File

@ -41,7 +41,7 @@ use_restrictions = false
ignore_areas = true -- future feature ignore_areas = true -- future feature
traffic_signal_penalty = 2 traffic_signal_penalty = 2
u_turn_penalty = 2 u_turn_penalty = 2
use_turn_restrictions = false
-- End of globals -- End of globals
function get_exceptions(vector) function get_exceptions(vector)