From 313b93169dc4a15bb9f6e03187dca0227a51423b Mon Sep 17 00:00:00 2001
From: Emil Tin <emil.tin@tmf.kk.dk>
Date: Mon, 11 Feb 2013 10:05:53 +0100
Subject: [PATCH] turn off turn restrictions for bicycle and foot, update tests

---
 features/bicycle/restrictions.feature | 36 +++++++++++++--------------
 profiles/bicycle.lua                  |  2 +-
 profiles/foot.lua                     |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/features/bicycle/restrictions.feature b/features/bicycle/restrictions.feature
index 27c5c353e..2d5fa40c5 100644
--- a/features/bicycle/restrictions.feature
+++ b/features/bicycle/restrictions.feature
@@ -1,6 +1,6 @@
 @routing @bicycle @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.
 	
 	Background:
@@ -26,7 +26,7 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
+		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
 		 | s    | e  | sj,ej |
 
@@ -52,7 +52,7 @@ Feature: Bike - Turn restrictions
 		 | from | to | route |
 		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
-		 | s    | e  |       |
+		 | s    | e  | sj,ej |
 
 	@no_turning
 	Scenario: Bike - No u-turn
@@ -74,7 +74,7 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
+		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
 		 | s    | e  | sj,ej |
 
@@ -98,7 +98,7 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
+		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
 		 | s    | e  | sj,ej |
 
@@ -123,8 +123,8 @@ Feature: Bike - Turn restrictions
 		When I route I should get
 		 | from | to | route |
 		 | s    | w  | sj,wj |
-		 | s    | n  |       |
-		 | s    | e  |       |
+		 | s    | n  | sj,nj |
+		 | s    | e  | sj,ej |
 
 	@only_turning
 	Scenario: Bike - Only right turn
@@ -146,8 +146,8 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
-		 | s    | n  |       |
+		 | s    | w  | sj,wj |
+		 | s    | n  | sj,nj |
 		 | s    | e  | sj,ej |
 	
 	@only_turning
@@ -170,9 +170,9 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
+		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
-		 | s    | e  |       |
+		 | s    | e  | sj,ej |
 
 	@no_turning
 	Scenario: Bike - Handle any only_* restriction
@@ -194,9 +194,9 @@ Feature: Bike - Turn restrictions
 
 		When I route I should get
 		 | from | to | route |
-		 | s    | w  |       |
+		 | s    | w  | sj,wj |
 		 | s    | n  | sj,nj |
-		 | s    | e  |       |
+		 | s    | e  | sj,ej |
 
  	@except
  	Scenario: Bike - Except tag and on no_ restrictions
@@ -224,8 +224,8 @@ Feature: Bike - Turn restrictions
  		When I route I should get
  		 | from | to | route |
  		 | s    | a  | sj,aj |
- 		 | s    | b  |       |
- 		 | s    | c  |       |
+ 		 | s    | b  | sj,bj |
+ 		 | s    | c  | sj,cj |
  		 | s    | d  | sj,dj |
 
   	@except
@@ -281,9 +281,9 @@ Feature: Bike - Turn restrictions
 
   		When I route I should get
   		 | from | to | route |
-  		 | s    | a  |       |
+  		 | s    | a  | sj,ja |
   		 | s    | b  | sj,jb |
   		 | s    | c  | sj,jc |
   		 | s    | d  | sj,jd |
-  		 | s    | e  |       |
-  		 | s    | f  |       |
+  		 | s    | e  | sj,je |
+  		 | s    | f  | sj,jf |
diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index cb07ea6fb..9e122c354 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -72,7 +72,7 @@ use_restrictions 		= true
 ignore_areas 			= true -- future feature
 traffic_signal_penalty 	= 2
 u_turn_penalty 			= 20
-
+use_turn_restrictions   = false
 -- End of globals
 
 function get_exceptions(vector)
diff --git a/profiles/foot.lua b/profiles/foot.lua
index e85cc2fd0..fb0dee8db 100644
--- a/profiles/foot.lua
+++ b/profiles/foot.lua
@@ -41,7 +41,7 @@ use_restrictions 		= false
 ignore_areas 			= true -- future feature
 traffic_signal_penalty 	= 2
 u_turn_penalty 			= 2
-
+use_turn_restrictions   = false
 -- End of globals
 
 function get_exceptions(vector)