head/destination -> depart/arrive to reflect guidance API changes; minor fixes for roundabout tests
This commit is contained in:
		
							parent
							
								
									73050c0503
								
							
						
					
					
						commit
						de2205cac7
					
				| @ -16,13 +16,13 @@ Feature: Bike - Mode flag | |||||||
|     	 | cd    | primary |       |          | |     	 | cd    | primary |       |          | | ||||||
| 
 | 
 | ||||||
|     	When I route I should get |     	When I route I should get | ||||||
|     	 | from | to | route    | turns                       | modes                 | |     	 | from | to | route    | turns                    | modes                 | | ||||||
|     	 | a    | d  | ab,bc,cd | head,right,left,destination | cycling,ferry,cycling | |     	 | a    | d  | ab,bc,cd | depart,right,left,arrive | cycling,ferry,cycling | | ||||||
|     	 | d    | a  | cd,bc,ab | head,right,left,destination | cycling,ferry,cycling | |     	 | d    | a  | cd,bc,ab | depart,right,left,arrive | cycling,ferry,cycling | | ||||||
|     	 | c    | a  | bc,ab    | head,left,destination       | ferry,cycling         | |     	 | c    | a  | bc,ab    | depart,left,arrive       | ferry,cycling         | | ||||||
|     	 | d    | b  | cd,bc    | head,right,destination      | cycling,ferry         | |     	 | d    | b  | cd,bc    | depart,right,arrive      | cycling,ferry         | | ||||||
|     	 | a    | c  | ab,bc    | head,right,destination      | cycling,ferry         | |     	 | a    | c  | ab,bc    | depart,right,arrive      | cycling,ferry         | | ||||||
|     	 | b    | d  | bc,cd    | head,left,destination       | ferry,cycling         | |     	 | b    | d  | bc,cd    | depart,left,arrive       | ferry,cycling         | | ||||||
| 
 | 
 | ||||||
|      Scenario: Bike - Mode when using a train |      Scenario: Bike - Mode when using a train | ||||||
|      	Given the node map |      	Given the node map | ||||||
| @ -36,13 +36,13 @@ Feature: Bike - Mode flag | |||||||
|      	 | cd    | primary |         |         | |      	 | cd    | primary |         |         | | ||||||
| 
 | 
 | ||||||
|      	When I route I should get |      	When I route I should get | ||||||
|      	 | from | to | route    | turns                       | modes                 | |      	 | from | to | route    | turns                    | modes                 | | ||||||
|      	 | a    | d  | ab,bc,cd | head,right,left,destination | cycling,train,cycling | |      	 | a    | d  | ab,bc,cd | depart,right,left,arrive | cycling,train,cycling | | ||||||
|      	 | d    | a  | cd,bc,ab | head,right,left,destination | cycling,train,cycling | |      	 | d    | a  | cd,bc,ab | depart,right,left,arrive | cycling,train,cycling | | ||||||
|      	 | c    | a  | bc,ab    | head,left,destination       | train,cycling         | |      	 | c    | a  | bc,ab    | depart,left,arrive       | train,cycling         | | ||||||
|      	 | d    | b  | cd,bc    | head,right,destination      | cycling,train         | |      	 | d    | b  | cd,bc    | depart,right,arrive      | cycling,train         | | ||||||
|      	 | a    | c  | ab,bc    | head,right,destination      | cycling,train         | |      	 | a    | c  | ab,bc    | depart,right,arrive      | cycling,train         | | ||||||
|      	 | b    | d  | bc,cd    | head,left,destination       | train,cycling         | |      	 | b    | d  | bc,cd    | depart,left,arrive       | train,cycling         | | ||||||
| 
 | 
 | ||||||
|      @mokobreview |      @mokobreview | ||||||
|      Scenario: Bike - Mode when pushing bike against oneways |      Scenario: Bike - Mode when pushing bike against oneways | ||||||
| @ -57,13 +57,13 @@ Feature: Bike - Mode flag | |||||||
|      	 | cd    | primary |        | |      	 | cd    | primary |        | | ||||||
| 
 | 
 | ||||||
|      	When I route I should get |      	When I route I should get | ||||||
|      	 | from | to | route    | turns                                      | modes                        | |      	 | from | to | route    | turns                                   | modes                        | | ||||||
|      	 | a    | d  | ab,bc,cd | head,right,left,destination                | cycling,cycling,cycling      | |      	 | a    | d  | ab,bc,cd | depart,right,left,arrive                | cycling,cycling,cycling      | | ||||||
|      	 | d    | a  | cd,bc,ab | head,right,left,destination                | cycling,pushing bike,cycling | |      	 | d    | a  | cd,bc,ab | depart,right,left,arrive                | cycling,pushing bike,cycling | | ||||||
|      	 | c    | a  | bc,ab    | head,left,destination                      | pushing bike,cycling         | |      	 | c    | a  | bc,ab    | depart,left,arrive                      | pushing bike,cycling         | | ||||||
|      	 | d    | b  | cd,bc    | head,right,destination                     | cycling,pushing bike         | |      	 | d    | b  | cd,bc    | depart,right,arrive                     | cycling,pushing bike         | | ||||||
|      	 | a    | c  | ab,bc    | head,right,destination                     | cycling,cycling              | |      	 | a    | c  | ab,bc    | depart,right,arrive                     | cycling,cycling              | | ||||||
|      	 | b    | d  | bc,cd    | head,left,destination                      | cycling,cycling              | |      	 | b    | d  | bc,cd    | depart,left,arrive                      | cycling,cycling              | | ||||||
| 
 | 
 | ||||||
|      Scenario: Bike - Mode when pushing on pedestrain streets |      Scenario: Bike - Mode when pushing on pedestrain streets | ||||||
|      	Given the node map |      	Given the node map | ||||||
| @ -77,13 +77,13 @@ Feature: Bike - Mode flag | |||||||
|      	 | cd    | primary    | |      	 | cd    | primary    | | ||||||
| 
 | 
 | ||||||
|      	When I route I should get |      	When I route I should get | ||||||
|      	 | from | to | route    | turns                       | modes                        | |      	 | from | to | route    | turns                    | modes                        | | ||||||
|      	 | a    | d  | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling | |      	 | a    | d  | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|      	 | d    | a  | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling | |      	 | d    | a  | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|      	 | c    | a  | bc,ab    | head,left,destination       | pushing bike,cycling         | |      	 | c    | a  | bc,ab    | depart,left,arrive       | pushing bike,cycling         | | ||||||
|      	 | d    | b  | cd,bc    | head,right,destination      | cycling,pushing bike         | |      	 | d    | b  | cd,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|      	 | a    | c  | ab,bc    | head,right,destination      | cycling,pushing bike         | |      	 | a    | c  | ab,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|      	 | b    | d  | bc,cd    | head,left,destination       | pushing bike,cycling         | |      	 | b    | d  | bc,cd    | depart,left,arrive       | pushing bike,cycling         | | ||||||
| 
 | 
 | ||||||
|      Scenario: Bike - Mode when pushing on pedestrain areas |      Scenario: Bike - Mode when pushing on pedestrain areas | ||||||
|      	Given the node map |      	Given the node map | ||||||
| @ -117,13 +117,13 @@ Feature: Bike - Mode flag | |||||||
|     	 | cd    | primary | |     	 | cd    | primary | | ||||||
| 
 | 
 | ||||||
|      	When I route I should get |      	When I route I should get | ||||||
|     	 | from | to | route    | turns                       | modes                        | |     	 | from | to | route    | turns                    | modes                        | | ||||||
|     	 | a    | d  | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling | |     	 | a    | d  | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|     	 | d    | a  | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling | |     	 | d    | a  | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|     	 | c    | a  | bc,ab    | head,left,destination       | pushing bike,cycling         | |     	 | c    | a  | bc,ab    | depart,left,arrive       | pushing bike,cycling         | | ||||||
|     	 | d    | b  | cd,bc    | head,right,destination      | cycling,pushing bike         | |     	 | d    | b  | cd,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|     	 | a    | c  | ab,bc    | head,right,destination      | cycling,pushing bike         | |     	 | a    | c  | ab,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|     	 | b    | d  | bc,cd    | head,left,destination       | pushing bike,cycling         | |     	 | b    | d  | bc,cd    | depart,left,arrive       | pushing bike,cycling         | | ||||||
| 
 | 
 | ||||||
|      Scenario: Bike - Mode when bicycle=dismount |      Scenario: Bike - Mode when bicycle=dismount | ||||||
|      	Given the node map |      	Given the node map | ||||||
| @ -137,13 +137,13 @@ Feature: Bike - Mode flag | |||||||
|     	 | cd    | primary |          | |     	 | cd    | primary |          | | ||||||
| 
 | 
 | ||||||
|      	When I route I should get |      	When I route I should get | ||||||
|     	 | from | to | route    | turns                       | modes                        | |     	 | from | to | route    | turns                    | modes                        | | ||||||
|     	 | a    | d  | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling | |     	 | a    | d  | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|     	 | d    | a  | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling | |     	 | d    | a  | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling | | ||||||
|     	 | c    | a  | bc,ab    | head,left,destination       | pushing bike,cycling         | |     	 | c    | a  | bc,ab    | depart,left,arrive       | pushing bike,cycling         | | ||||||
|     	 | d    | b  | cd,bc    | head,right,destination      | cycling,pushing bike         | |     	 | d    | b  | cd,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|     	 | a    | c  | ab,bc    | head,right,destination      | cycling,pushing bike         | |     	 | a    | c  | ab,bc    | depart,right,arrive      | cycling,pushing bike         | | ||||||
|          | b    | d  | bc,cd    | head,left,destination       | pushing bike,cycling         | |          | b    | d  | bc,cd    | depart,left,arrive       | pushing bike,cycling         | | ||||||
| 
 | 
 | ||||||
|     Scenario: Bicycle - Modes when starting on forward oneway |     Scenario: Bicycle - Modes when starting on forward oneway | ||||||
|         Given the node map |         Given the node map | ||||||
|  | |||||||
| @ -98,11 +98,11 @@ Feature: Bike - Accessability of different way types | |||||||
|             | cd    | primary |        | |             | cd    | primary |        | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | turns                                      | |             | from | to | route    | turns                                   | | ||||||
|             | a    | d  | ab,bc,cd | head,straight,straight,destination         | |             | a    | d  | ab,bc,cd | depart,straight,straight,arrive         | | ||||||
|             | d    | a  | cd,bc,ab | head,right,left,destination                | |             | d    | a  | cd,bc,ab | depart,right,left,arrive                | | ||||||
|             | c    | a  | bc,ab    | head,left,destination                      | |             | c    | a  | bc,ab    | depart,left,arrive                      | | ||||||
|             | d    | b  | cd,bc    | head,right,destination                     | |             | d    | b  | cd,bc    | depart,right,arrive                     | | ||||||
| 
 | 
 | ||||||
|     @todo |     @todo | ||||||
|     Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc. |     Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc. | ||||||
| @ -117,8 +117,8 @@ Feature: Bike - Accessability of different way types | |||||||
|             | cd    | primary | |             | cd    | primary | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | turns                       | |             | from | to | route    | turns                    | | ||||||
|             | a    | d  | ab,bc,cd | head,right,left,destination | |             | a    | d  | ab,bc,cd | depart,right,left,arrive | | ||||||
|             | d    | a  | cd,bc,ab | head,right,left,destination | |             | d    | a  | cd,bc,ab | depart,right,left,arrive | | ||||||
|             | c    | a  | bc,ab    | head,left,destination       | |             | c    | a  | bc,ab    | depart,left,arrive       | | ||||||
|             | d    | b  | cd,bc    | head,right,destination      | |             | d    | b  | cd,bc    | depart,right,arrive      | | ||||||
|  | |||||||
| @ -21,10 +21,10 @@ Feature: Roundabout Instructions | |||||||
|             | abcda | roundabout | |             | abcda | roundabout | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                               | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | head,enter_roundabout-1,destination | |             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | | ||||||
|             | s    | u  | sa,uc | head,enter_roundabout-2,destination | |             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | | ||||||
|             | s    | v  | sa,vd | head,enter_roundabout-3,destination | |             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | | ||||||
|             | u    | v  | uc,vd | head,enter_roundabout-1,destination | |             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | | ||||||
|             | u    | s  | uc,sa | head,enter_roundabout-2,destination | |             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | | ||||||
|             | u    | t  | uc,tb | head,enter_roundabout-3,destination | |             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | | ||||||
|  | |||||||
| @ -34,6 +34,7 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
|             | a    | b  | ab    | 47 km/h +- 1 | |             | a    | b  | ab    | 47 km/h +- 1 | | ||||||
|             | b    | c  | bc    | 47 km/h +- 1 | |             | b    | c  | bc    | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|  |     @mokob @2162 | ||||||
|     Scenario: Car - Advisory speed overwrites backwards maxspeed |     Scenario: Car - Advisory speed overwrites backwards maxspeed | ||||||
|         Given the node map |         Given the node map | ||||||
|             | a | b | c | |             | a | b | c | | ||||||
| @ -48,6 +49,23 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
|             | b    | a  | ab    | 47 km/h +- 1 | |             | b    | a  | ab    | 47 km/h +- 1 | | ||||||
|             | c    | b  | bc    | 47 km/h +- 1 | |             | c    | b  | bc    | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|  |     @mokob @2162 @deleteme | ||||||
|  |     Scenario: Car - Advisory speed overwrites backwards maxspeed | ||||||
|  |         Given the node map | ||||||
|  |             | a | b | c | d | | ||||||
|  | 
 | ||||||
|  |         And the ways | ||||||
|  |             | nodes | highway       | maxspeed:backward | maxspeed:advisory:backward | | ||||||
|  |             | ab    | residential   |                   | 45                         | | ||||||
|  |             | bc    | residential   | 90                | 45                         | | ||||||
|  |             | cd    | residential   |                   | 45                         | | ||||||
|  | 
 | ||||||
|  |         When I route I should get | ||||||
|  |             | from | to | route | speed        | | ||||||
|  |             | c    | b  | bc    | 47 km/h +- 1 | | ||||||
|  |             | d    | c  | cd    | 47 km/h +- 1 | | ||||||
|  | 
 | ||||||
|  |     @mokob @2162 | ||||||
|     Scenario: Car - Directional advisory speeds play nice with eachother |     Scenario: Car - Directional advisory speeds play nice with eachother | ||||||
|         Given the node map |         Given the node map | ||||||
|             | a | b | c | |             | a | b | c | | ||||||
|  | |||||||
| @ -15,13 +15,13 @@ Feature: Car - Mode flag | |||||||
|             | cd    | primary |       |          | |             | cd    | primary |       |          | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | turns                       | modes                 | |             | from | to | route    | turns                    | modes                 | | ||||||
|             | a    | d  | ab,bc,cd | head,right,left,destination | driving,ferry,driving | |             | a    | d  | ab,bc,cd | depart,right,left,arrive | driving,ferry,driving | | ||||||
|             | d    | a  | cd,bc,ab | head,right,left,destination | driving,ferry,driving | |             | d    | a  | cd,bc,ab | depart,right,left,arrive | driving,ferry,driving | | ||||||
|             | c    | a  | bc,ab    | head,left,destination       | ferry,driving         | |             | c    | a  | bc,ab    | depart,left,arrive       | ferry,driving         | | ||||||
|             | d    | b  | cd,bc    | head,right,destination      | driving,ferry         | |             | d    | b  | cd,bc    | depart,right,arrive      | driving,ferry         | | ||||||
|             | a    | c  | ab,bc    | head,right,destination      | driving,ferry         | |             | a    | c  | ab,bc    | depart,right,arrive      | driving,ferry         | | ||||||
|             | b    | d  | bc,cd    | head,left,destination       | ferry,driving         | |             | b    | d  | bc,cd    | depart,left,arrive       | ferry,driving         | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Snapping when using a ferry |     Scenario: Car - Snapping when using a ferry | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -34,7 +34,7 @@ Feature: Car - Mode flag | |||||||
|             | ef    | primary |       |          | |             | ef    | primary |       |          | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns            | modes       | time  | |             | from | to | route | turns         | modes       | time  | | ||||||
|             | c    | d  | bcde  | head,destination | ferry       | 600s  | |             | c    | d  | bcde  | depart,arrive | ferry       | 600s  | | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -21,10 +21,10 @@ Feature: Roundabout Instructions | |||||||
|             | abcda | roundabout | |             | abcda | roundabout | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                               | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | head,enter_roundabout-1,destination | |             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | | ||||||
|             | s    | u  | sa,uc | head,enter_roundabout-2,destination | |             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | | ||||||
|             | s    | v  | sa,vd | head,enter_roundabout-3,destination | |             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | | ||||||
|             | u    | v  | uc,vd | head,enter_roundabout-1,destination | |             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | | ||||||
|             | u    | s  | uc,sa | head,enter_roundabout-2,destination | |             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | | ||||||
|             | u    | t  | uc,tb | head,enter_roundabout-3,destination | |             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | | ||||||
|  | |||||||
| @ -25,10 +25,10 @@ Feature: Roundabout Instructions | |||||||
|             | abcda | roundabout | |             | abcda | roundabout | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                               | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | head,enter_roundabout-1,destination | |             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | | ||||||
|             | s    | u  | sa,uc | head,enter_roundabout-2,destination | |             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | | ||||||
|             | s    | v  | sa,vd | head,enter_roundabout-3,destination | |             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | | ||||||
|             | u    | v  | uc,vd | head,enter_roundabout-1,destination | |             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | | ||||||
|             | u    | s  | uc,sa | head,enter_roundabout-2,destination | |             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | | ||||||
|             | u    | t  | uc,tb | head,enter_roundabout-3,destination | |             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | | ||||||
|  | |||||||
| @ -14,12 +14,12 @@ Feature: Basic Roundabout | |||||||
|             |   |   | f |   |   | |             |   |   | f |   |   | | ||||||
| 
 | 
 | ||||||
|        And the ways |        And the ways | ||||||
|             | nodes  | roundabout | |             | nodes  | junction   | | ||||||
|             | ab     | no         | |             | ab     |            | | ||||||
|             | cd     | no         | |             | cd     |            | | ||||||
|             | ef     | no         | |             | ef     |            | | ||||||
|             | gh     | no         | |             | gh     |            | | ||||||
|             | bcegb  | yes        | |             | bcegb  | roundabout | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|            | waypoints | route    | turns                             | |            | waypoints | route    | turns                             | | ||||||
| @ -45,12 +45,12 @@ Feature: Basic Roundabout | |||||||
|             |   |   | f |   |   | |             |   |   | f |   |   | | ||||||
| 
 | 
 | ||||||
|        And the ways |        And the ways | ||||||
|             | nodes  | roundabout | |             | nodes  | junction   | | ||||||
|             | ab     | no         | |             | ab     |            | | ||||||
|             | cd     | no         | |             | cd     |            | | ||||||
|             | ef     | no         | |             | ef     |            | | ||||||
|             | gh     | no         | |             | gh     |            | | ||||||
|             | bcegb  | yes        | |             | bcegb  | roundabout | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|            | waypoints | route    | turns                            | |            | waypoints | route    | turns                            | | ||||||
| @ -80,12 +80,12 @@ Feature: Basic Roundabout | |||||||
|             |   |   | f |   |   | |             |   |   | f |   |   | | ||||||
| 
 | 
 | ||||||
|        And the ways |        And the ways | ||||||
|             | nodes  | roundabout | |             | nodes  | junction   | | ||||||
|             | ab     | no         | |             | ab     |            | | ||||||
|             | cd     | no         | |             | cd     |            | | ||||||
|             | ef     | no         | |             | ef     |            | | ||||||
|             | gh     | no         | |             | gh     |            | | ||||||
|             | bcegb  | yes        | |             | bcegb  | roundabout | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|            | waypoints | route       | turns                             | |            | waypoints | route       | turns                             | | ||||||
| @ -115,12 +115,12 @@ Feature: Basic Roundabout | |||||||
|             |   |   | f |   |   | |             |   |   | f |   |   | | ||||||
| 
 | 
 | ||||||
|        And the ways |        And the ways | ||||||
|             | nodes  | roundabout | |             | nodes  | junction   | | ||||||
|             | ab     | no         | |             | ab     |            | | ||||||
|             | cd     | no         | |             | cd     |            | | ||||||
|             | ef     | no         | |             | ef     |            | | ||||||
|             | gh     | no         | |             | gh     |            | | ||||||
|             | bcegb  | yes        | |             | bcegb  | roundabout | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|            | waypoints | route       | turns          | |            | waypoints | route       | turns          | | ||||||
| @ -146,12 +146,12 @@ Feature: Basic Roundabout | |||||||
|            |   | i |   | g |   | |            |   | i |   | g |   | | ||||||
| 
 | 
 | ||||||
|         And the ways |         And the ways | ||||||
|            | nodes | roundabout | oneway | |            | nodes | junction   | oneway | | ||||||
|            | abc   | no         | yes    | |            | abc   |            | yes    | | ||||||
|            | def   | no         | yes    | |            | def   |            | yes    | | ||||||
|            | ghi   | no         | yes    | |            | ghi   |            | yes    | | ||||||
|            | jkl   | no         | yes    | |            | jkl   |            | yes    | | ||||||
|            | behkb | yes        | yes    | |            | behkb | roundabout | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|            | waypoints | route       | turns                             | |            | waypoints | route       | turns                             | | ||||||
|  | |||||||
| @ -134,7 +134,17 @@ module.exports = function () { | |||||||
| 
 | 
 | ||||||
|     this.turnList = (instructions) => { |     this.turnList = (instructions) => { | ||||||
|         return instructions.legs.reduce((m, v) => m.concat(v.steps), []) |         return instructions.legs.reduce((m, v) => m.concat(v.steps), []) | ||||||
|             .map(v => v.maneuver.type === 'depart' ? 'head' : v.maneuver.type === 'arrive' ? 'destination' : v.maneuver.modifier) |             .map(v => { | ||||||
|  |                 switch (v.maneuver.type) { | ||||||
|  |                     case 'depart': | ||||||
|  |                     case 'arrive': | ||||||
|  |                         return v.maneuver.type; | ||||||
|  |                     case 'roundabout': | ||||||
|  |                         return 'roundabout-exit-' + v.maneuver.exit; | ||||||
|  |                     default: | ||||||
|  |                         return v.maneuver.modifier | ||||||
|  |                 } | ||||||
|  |             }) | ||||||
|             .join(','); |             .join(','); | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -19,5 +19,5 @@ Feature: Support 64bit node IDs | |||||||
|             | cdec  | |             | cdec  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns            | |             | from | to | route | turns         | | ||||||
|             | x    | y  | abc   | head,destination | |             | x    | y  | abc   | depart,arrive | | ||||||
|  | |||||||
| @ -22,5 +22,5 @@ Feature: Fixed bugs, kept to check for regressions | |||||||
|             | cdec  | |             | cdec  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns            | |             | from | to | route | turns         | | ||||||
|             | x    | y  | abc   | head,destination | |             | x    | y  | abc   | depart,arrive | | ||||||
|  | |||||||
| @ -36,5 +36,5 @@ Feature: Basic Routing | |||||||
|             | fy     | last  | |             | fy     | last  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route            | turns                              | |             | from | to | route            | turns                           | | ||||||
|             | x    | y  | first,compr,last | head,straight,straight,destination | |             | x    | y  | first,compr,last | depart,straight,straight,arrive | | ||||||
|  | |||||||
| @ -18,10 +18,10 @@ Feature: Avoid weird loops caused by rounding errors | |||||||
|             | cg     | |             | cg     | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|            | waypoints | route     | turns                | |            | waypoints | route     | turns             | | ||||||
|            | a,1,d     | abcd,abcd | head,via,destination | |            | a,1,d     | abcd,abcd | depart,via,arrive | | ||||||
|            | a,2,d     | abcd,abcd | head,via,destination | |            | a,2,d     | abcd,abcd | depart,via,arrive | | ||||||
|            | a,3,d     | abcd,abcd | head,via,destination | |            | a,3,d     | abcd,abcd | depart,via,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Avoid weird loops 1 |     Scenario: Avoid weird loops 1 | ||||||
|         Given the node locations |         Given the node locations | ||||||
| @ -47,8 +47,8 @@ Feature: Avoid weird loops caused by rounding errors | |||||||
|             | ie    | |             | ie    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns            | |             | from | to | route | turns         | | ||||||
|             | x    | y  | hfgd  | head,destination | |             | x    | y  | hfgd  | depart,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Avoid weird loops 2 |     Scenario: Avoid weird loops 2 | ||||||
|         Given the node locations |         Given the node locations | ||||||
| @ -67,8 +67,8 @@ Feature: Avoid weird loops caused by rounding errors | |||||||
|             | cdec  | |             | cdec  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns            | |             | from | to | route | turns         | | ||||||
|             | x    | y  | abc   | head,destination | |             | x    | y  | abc   | depart,arrive | | ||||||
| 
 | 
 | ||||||
|     @412 |     @412 | ||||||
|     Scenario: Avoid weird loops 3 |     Scenario: Avoid weird loops 3 | ||||||
| @ -92,6 +92,6 @@ Feature: Avoid weird loops caused by rounding errors | |||||||
|             | cf    | primary     | |             | cf    | primary     | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route             | turns                                            | |             | waypoints | route             | turns                                         | | ||||||
|             | a,2,d     | ab,be,ef,ef,cf,cd | head,left,straight,via,straight,left,destination | |             | a,2,d     | ab,be,ef,ef,cf,cd | depart,left,straight,via,straight,left,arrive | | ||||||
|             | a,1,d     | ab,be,ef,ef,cf,cd | head,left,straight,via,straight,left,destination | |             | a,1,d     | ab,be,ef,ef,cf,cd | depart,left,straight,via,straight,left,arrive | | ||||||
|  | |||||||
| @ -26,54 +26,54 @@ Feature: Turn directions/codes | |||||||
|             | xo    | |             | xo    | | ||||||
| 
 | 
 | ||||||
|         When I match I should get |         When I match I should get | ||||||
|             | trace | route | turns                         | matchings | |             | trace | route | turns                      | matchings | | ||||||
|             | im    | xi,xm | head,left,destination         | im        | |             | im    | xi,xm | depart,left,arrive         | im        | | ||||||
|             | io    | xi,xo | head,slight_left,destination  | io        | |             | io    | xi,xo | depart,slight_left,arrive  | io        | | ||||||
|             | ia    | xi,xa | head,straight,destination     | ia        | |             | ia    | xi,xa | depart,straight,arrive     | ia        | | ||||||
|             | ic    | xi,xc | head,slight_right,destination | ic        | |             | ic    | xi,xc | depart,slight_right,arrive | ic        | | ||||||
|             | ie    | xi,xe | head,right,destination        | ie        | |             | ie    | xi,xe | depart,right,arrive        | ie        | | ||||||
| 
 | 
 | ||||||
|             | ko    | xk,xo | head,left,destination         | ko        | |             | ko    | xk,xo | depart,left,arrive         | ko        | | ||||||
|             | ka    | xk,xa | head,slight_left,destination  | ka        | |             | ka    | xk,xa | depart,slight_left,arrive  | ka        | | ||||||
|             | kc    | xk,xc | head,straight,destination     | kc        | |             | kc    | xk,xc | depart,straight,arrive     | kc        | | ||||||
|             | ke    | xk,xe | head,slight_right,destination | ke        | |             | ke    | xk,xe | depart,slight_right,arrive | ke        | | ||||||
|             | kg    | xk,xg | head,right,destination        | kg        | |             | kg    | xk,xg | depart,right,arrive        | kg        | | ||||||
| 
 | 
 | ||||||
|             | ma    | xm,xa | head,left,destination         | ma        | |             | ma    | xm,xa | depart,left,arrive         | ma        | | ||||||
|             | mc    | xm,xc | head,slight_left,destination  | mc        | |             | mc    | xm,xc | depart,slight_left,arrive  | mc        | | ||||||
|             | me    | xm,xe | head,straight,destination     | me        | |             | me    | xm,xe | depart,straight,arrive     | me        | | ||||||
|             | mg    | xm,xg | head,slight_right,destination | mg        | |             | mg    | xm,xg | depart,slight_right,arrive | mg        | | ||||||
|             | mi    | xm,xi | head,right,destination        | mi        | |             | mi    | xm,xi | depart,right,arrive        | mi        | | ||||||
| 
 | 
 | ||||||
|             | oc    | xo,xc | head,left,destination         | oc        | |             | oc    | xo,xc | depart,left,arrive         | oc        | | ||||||
|             | oe    | xo,xe | head,slight_left,destination  | oe        | |             | oe    | xo,xe | depart,slight_left,arrive  | oe        | | ||||||
|             | og    | xo,xg | head,straight,destination     | og        | |             | og    | xo,xg | depart,straight,arrive     | og        | | ||||||
|             | oi    | xo,xi | head,slight_right,destination | oi        | |             | oi    | xo,xi | depart,slight_right,arrive | oi        | | ||||||
|             | ok    | xo,xk | head,right,destination        | ok        | |             | ok    | xo,xk | depart,right,arrive        | ok        | | ||||||
| 
 | 
 | ||||||
|             | ae    | xa,xe | head,left,destination         | ae        | |             | ae    | xa,xe | depart,left,arrive         | ae        | | ||||||
|             | ag    | xa,xg | head,slight_left,destination  | ag        | |             | ag    | xa,xg | depart,slight_left,arrive  | ag        | | ||||||
|             | ai    | xa,xi | head,straight,destination     | ai        | |             | ai    | xa,xi | depart,straight,arrive     | ai        | | ||||||
|             | ak    | xa,xk | head,slight_right,destination | ak        | |             | ak    | xa,xk | depart,slight_right,arrive | ak        | | ||||||
|             | am    | xa,xm | head,right,destination        | am        | |             | am    | xa,xm | depart,right,arrive        | am        | | ||||||
| 
 | 
 | ||||||
|             | cg    | xc,xg | head,left,destination         | cg        | |             | cg    | xc,xg | depart,left,arrive         | cg        | | ||||||
|             | ci    | xc,xi | head,slight_left,destination  | ci        | |             | ci    | xc,xi | depart,slight_left,arrive  | ci        | | ||||||
|             | ck    | xc,xk | head,straight,destination     | ck        | |             | ck    | xc,xk | depart,straight,arrive     | ck        | | ||||||
|             | cm    | xc,xm | head,slight_right,destination | cm        | |             | cm    | xc,xm | depart,slight_right,arrive | cm        | | ||||||
|             | co    | xc,xo | head,right,destination        | co        | |             | co    | xc,xo | depart,right,arrive        | co        | | ||||||
| 
 | 
 | ||||||
|             | ei    | xe,xi | head,left,destination         | ei        | |             | ei    | xe,xi | depart,left,arrive         | ei        | | ||||||
|             | ek    | xe,xk | head,slight_left,destination  | ek        | |             | ek    | xe,xk | depart,slight_left,arrive  | ek        | | ||||||
|             | em    | xe,xm | head,straight,destination     | em        | |             | em    | xe,xm | depart,straight,arrive     | em        | | ||||||
|             | eo    | xe,xo | head,slight_right,destination | eo        | |             | eo    | xe,xo | depart,slight_right,arrive | eo        | | ||||||
|             | ea    | xe,xa | head,right,destination        | ea        | |             | ea    | xe,xa | depart,right,arrive        | ea        | | ||||||
| 
 | 
 | ||||||
|             | gk    | xg,xk | head,left,destination         | gk        | |             | gk    | xg,xk | depart,left,arrive         | gk        | | ||||||
|             | gm    | xg,xm | head,slight_left,destination  | gm        | |             | gm    | xg,xm | depart,slight_left,arrive  | gm        | | ||||||
|             | go    | xg,xo | head,straight,destination     | go        | |             | go    | xg,xo | depart,straight,arrive     | go        | | ||||||
|             | ga    | xg,xa | head,slight_right,destination | ga        | |             | ga    | xg,xa | depart,slight_right,arrive | ga        | | ||||||
|             | gc    | xg,xc | head,right,destination        | gc        | |             | gc    | xg,xc | depart,right,arrive        | gc        | | ||||||
| 
 | 
 | ||||||
|     Scenario: Turn directions |     Scenario: Turn directions | ||||||
|         Given the query options |         Given the query options | ||||||
| @ -97,9 +97,9 @@ Feature: Turn directions/codes | |||||||
|             | xo    | |             | xo    | | ||||||
| 
 | 
 | ||||||
|         When I match I should get |         When I match I should get | ||||||
|             | trace | route | turns                         | matchings | duration | |             | trace | route | turns                      | matchings | duration | | ||||||
|             | im    | xi,xm | head,left,destination         | im        | 80       | |             | im    | xi,xm | depart,left,arrive         | im        | 80       | | ||||||
|             | io    | xi,xo | head,slight_left,destination  | io        | 88       | |             | io    | xi,xo | depart,slight_left,arrive  | io        | 88       | | ||||||
|             | ia    | xi,xa | head,straight,destination     | ia        | 80       | |             | ia    | xi,xa | depart,straight,arrive     | ia        | 80       | | ||||||
|             | ic    | xi,xc | head,slight_right,destination | ic        | 88       | |             | ic    | xi,xc | depart,slight_right,arrive | ic        | 88       | | ||||||
|             | ie    | xi,xe | head,right,destination        | ie        | 60       | |             | ie    | xi,xe | depart,right,arrive        | ie        | 60       | | ||||||
|  | |||||||
| @ -40,9 +40,9 @@ Feature: Testbot - Travel mode | |||||||
|             | efg   | residential | solid  | |             | efg   | residential | solid  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route              | modes                            | turns                              | |             | from | to | route              | modes                            | turns                           | | ||||||
|             | a    | g  | road,liquid,solid  | driving,river downstream,driving | head,straight,straight,destination | |             | a    | g  | road,liquid,solid  | driving,river downstream,driving | depart,straight,straight,arrive | | ||||||
|             | c    | g  | liquid,solid       | river downstream,driving         | head,straight,destination          | |             | c    | g  | liquid,solid       | river downstream,driving         | depart,straight,arrive          | | ||||||
| 
 | 
 | ||||||
|     @mokob @2166 |     @mokob @2166 | ||||||
|     Scenario: Testbot - Modes in each direction, different forward/backward speeds |     Scenario: Testbot - Modes in each direction, different forward/backward speeds | ||||||
| @ -145,9 +145,9 @@ Feature: Testbot - Travel mode | |||||||
|             | ab    | river   | |             | ab    | river   | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route | modes                             | turns                | |             | waypoints | route | modes                             | turns             | | ||||||
|             | a,1,b     | ab,ab | river downstream,river downstream | head,via,destination | |             | a,1,b     | ab,ab | river downstream,river downstream | depart,via,arrive | | ||||||
|             | b,1,a     | ab,ab | river upstream,river upstream     | head,via,destination | |             | b,1,a     | ab,ab | river upstream,river upstream     | depart,via,arrive | | ||||||
| 
 | 
 | ||||||
|     @mokob @2166 |     @mokob @2166 | ||||||
|     Scenario: Testbot - Starting at a tricky node |     Scenario: Testbot - Starting at a tricky node | ||||||
| @ -175,11 +175,11 @@ Feature: Testbot - Travel mode | |||||||
|             | bc    | river   | Avenue | |             | bc    | river   | Avenue | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|             | from | to | route         | modes                    | turns                     | |             | from | to | route         | modes                    | turns                  | | ||||||
|             | a    | c  | Avenue,Avenue | driving,river downstream | head,straight,destination | |             | a    | c  | Avenue,Avenue | driving,river downstream | depart,straight,arrive | | ||||||
|             | c    | a  | Avenue,Avenue | river upstream,driving   | head,straight,destination | |             | c    | a  | Avenue,Avenue | river upstream,driving   | depart,straight,arrive | | ||||||
|             | 1    | 2  | Avenue,Avenue | driving,river downstream | head,straight,destination | |             | 1    | 2  | Avenue,Avenue | driving,river downstream | depart,straight,arrive | | ||||||
|             | 2    | 1  | Avenue,Avenue | river upstream,driving   | head,straight,destination | |             | 2    | 1  | Avenue,Avenue | river upstream,driving   | depart,straight,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Testbot - Mode for routes |     Scenario: Testbot - Mode for routes | ||||||
|        Given the node map |        Given the node map | ||||||
| @ -195,14 +195,14 @@ Feature: Testbot - Travel mode | |||||||
|             | ef    | primary |       |          | |             | ef    | primary |       |          | | ||||||
| 
 | 
 | ||||||
|        When I route I should get |        When I route I should get | ||||||
|             | from | to | route          | turns                                                 | modes                                 | |             | from | to | route          | turns                                              | modes                                 | | ||||||
|             | a    | d  | ab,bc,cd       | head,right,left,destination                           | driving,route,driving                 | |             | a    | d  | ab,bc,cd       | depart,right,left,arrive                           | driving,route,driving                 | | ||||||
|             | d    | a  | cd,bc,ab       | head,right,left,destination                           | driving,route,driving                 | |             | d    | a  | cd,bc,ab       | depart,right,left,arrive                           | driving,route,driving                 | | ||||||
|             | c    | a  | bc,ab          | head,left,destination                                 | route,driving                         | |             | c    | a  | bc,ab          | depart,left,arrive                                 | route,driving                         | | ||||||
|             | d    | b  | cd,bc          | head,right,destination                                | driving,route                         | |             | d    | b  | cd,bc          | depart,right,arrive                                | driving,route                         | | ||||||
|             | a    | c  | ab,bc          | head,right,destination                                | driving,route                         | |             | a    | c  | ab,bc          | depart,right,arrive                                | driving,route                         | | ||||||
|             | b    | d  | bc,cd          | head,left,destination                                 | route,driving                         | |             | b    | d  | bc,cd          | depart,left,arrive                                 | route,driving                         | | ||||||
|             | a    | f  | ab,bc,cd,de,ef | head,right,left,straight,straight,destination         | driving,route,driving,driving,driving | |             | a    | f  | ab,bc,cd,de,ef | depart,right,left,straight,straight,arrive         | driving,route,driving,driving,driving | | ||||||
| 
 | 
 | ||||||
|     @mokob @2166 |     @mokob @2166 | ||||||
|     Scenario: Testbot - Modes, triangle map |     Scenario: Testbot - Modes, triangle map | ||||||
|  | |||||||
| @ -23,11 +23,11 @@ Feature: POST request | |||||||
|             | yz    | |             | yz    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                     | |             | from | to | route | turns                  | | ||||||
|             | a    | c  | ab,bc | head,straight,destination | |             | a    | c  | ab,bc | depart,straight,arrive | | ||||||
|             | c    | a  | bc,ab | head,straight,destination | |             | c    | a  | bc,ab | depart,straight,arrive | | ||||||
|             | x    | z  | xy,yz | head,straight,destination | |             | x    | z  | xy,yz | depart,straight,arrive | | ||||||
|             | z    | x  | yz,xy | head,straight,destination | |             | z    | x  | yz,xy | depart,straight,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Testbot - match POST request |     Scenario: Testbot - match POST request | ||||||
|         Given a grid size of 10 meters |         Given a grid size of 10 meters | ||||||
|  | |||||||
| @ -21,19 +21,19 @@ Feature: Roundabout Instructions | |||||||
|             | abcda | roundabout | |             | abcda | roundabout | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                               | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | head,enter_roundabout-1,destination | |             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | | ||||||
|             | s    | u  | sa,uc | head,enter_roundabout-2,destination | |             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | | ||||||
|             | s    | v  | sa,vd | head,enter_roundabout-3,destination | |             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | | ||||||
|             | t    | u  | tb,uc | head,enter_roundabout-1,destination | |             | t    | u  | tb,uc | depart,enter_roundabout-1,arrive | | ||||||
|             | t    | v  | tb,vd | head,enter_roundabout-2,destination | |             | t    | v  | tb,vd | depart,enter_roundabout-2,arrive | | ||||||
|             | t    | s  | tb,sa | head,enter_roundabout-3,destination | |             | t    | s  | tb,sa | depart,enter_roundabout-3,arrive | | ||||||
|             | u    | v  | uc,vd | head,enter_roundabout-1,destination | |             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | | ||||||
|             | u    | s  | uc,sa | head,enter_roundabout-2,destination | |             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | | ||||||
|             | u    | t  | uc,tb | head,enter_roundabout-3,destination | |             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | | ||||||
|             | v    | s  | vd,sa | head,enter_roundabout-1,destination | |             | v    | s  | vd,sa | depart,enter_roundabout-1,arrive | | ||||||
|             | v    | t  | vd,tb | head,enter_roundabout-2,destination | |             | v    | t  | vd,tb | depart,enter_roundabout-2,arrive | | ||||||
|             | v    | u  | vd,uc | head,enter_roundabout-3,destination | |             | v    | u  | vd,uc | depart,enter_roundabout-3,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Testbot - Roundabout with oneway links |     Scenario: Testbot - Roundabout with oneway links | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -57,20 +57,20 @@ Feature: Roundabout Instructions | |||||||
|             | abcdefgha | roundabout |        | |             | abcdefgha | roundabout |        | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                               | |             | from | to | route | turns                            | | ||||||
|             | j    | k  | jb,ck | head,enter_roundabout-1,destination | |             | j    | k  | jb,ck | depart,enter_roundabout-1,arrive | | ||||||
|             | j    | m  | jb,em | head,enter_roundabout-2,destination | |             | j    | m  | jb,em | depart,enter_roundabout-2,arrive | | ||||||
|             | j    | o  | jb,go | head,enter_roundabout-3,destination | |             | j    | o  | jb,go | depart,enter_roundabout-3,arrive | | ||||||
|             | j    | i  | jb,ai | head,enter_roundabout-4,destination | |             | j    | i  | jb,ai | depart,enter_roundabout-4,arrive | | ||||||
|             | l    | m  | ld,em | head,enter_roundabout-1,destination | |             | l    | m  | ld,em | depart,enter_roundabout-1,arrive | | ||||||
|             | l    | o  | ld,go | head,enter_roundabout-2,destination | |             | l    | o  | ld,go | depart,enter_roundabout-2,arrive | | ||||||
|             | l    | i  | ld,ai | head,enter_roundabout-3,destination | |             | l    | i  | ld,ai | depart,enter_roundabout-3,arrive | | ||||||
|             | l    | k  | ld,ck | head,enter_roundabout-4,destination | |             | l    | k  | ld,ck | depart,enter_roundabout-4,arrive | | ||||||
|             | n    | o  | nf,go | head,enter_roundabout-1,destination | |             | n    | o  | nf,go | depart,enter_roundabout-1,arrive | | ||||||
|             | n    | i  | nf,ai | head,enter_roundabout-2,destination | |             | n    | i  | nf,ai | depart,enter_roundabout-2,arrive | | ||||||
|             | n    | k  | nf,ck | head,enter_roundabout-3,destination | |             | n    | k  | nf,ck | depart,enter_roundabout-3,arrive | | ||||||
|             | n    | m  | nf,em | head,enter_roundabout-4,destination | |             | n    | m  | nf,em | depart,enter_roundabout-4,arrive | | ||||||
|             | p    | i  | ph,ai | head,enter_roundabout-1,destination | |             | p    | i  | ph,ai | depart,enter_roundabout-1,arrive | | ||||||
|             | p    | k  | ph,ck | head,enter_roundabout-2,destination | |             | p    | k  | ph,ck | depart,enter_roundabout-2,arrive | | ||||||
|             | p    | m  | ph,em | head,enter_roundabout-3,destination | |             | p    | m  | ph,em | depart,enter_roundabout-3,arrive | | ||||||
|             | p    | o  | ph,go | head,enter_roundabout-4,destination | |             | p    | o  | ph,go | depart,enter_roundabout-4,arrive | | ||||||
|  | |||||||
| @ -20,8 +20,8 @@ Feature: Via points | |||||||
|             | ehijk   | yes    | |             | ehijk   | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                      | distance  | turns                  | |             | from | to | route                      | distance  | turns               | | ||||||
|             | a    | k  | abcdefg,ehijk              |  34m +-1  | head,right,destination | |             | a    | k  | abcdefg,ehijk              |  34m +-1  | depart,right,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Slight Turn |     Scenario: Slight Turn | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -36,8 +36,8 @@ Feature: Via points | |||||||
|             | ehijk   | yes    | |             | ehijk   | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                      | distance  | turns                         | |             | from | to | route                      | distance  | turns                      | | ||||||
|             | a    | k  | abcdefg,ehijk              |  34m +-1  | head,slight_right,destination | |             | a    | k  | abcdefg,ehijk              |  34m +-1  | depart,slight_right,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Nearly Slight Turn |     Scenario: Nearly Slight Turn | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -53,8 +53,8 @@ Feature: Via points | |||||||
|             | ehijk   | yes    | |             | ehijk   | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                      | distance  | turns                         | |             | from | to | route                      | distance  | turns                      | | ||||||
|             | a    | k  | abcdefg,ehijk              |  37m +-1  | head,right,destination        | |             | a    | k  | abcdefg,ehijk              |  37m +-1  | depart,right,arrive        | | ||||||
| 
 | 
 | ||||||
|     Scenario: Nearly Slight Turn (Variation) |     Scenario: Nearly Slight Turn (Variation) | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -70,5 +70,5 @@ Feature: Via points | |||||||
|             | ehijk   | yes    | |             | ehijk   | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                      | distance  | turns                         | |             | from | to | route                      | distance  | turns                      | | ||||||
|             | a    | k  | abcdefg,ehijk              |  37m +-1  | head,right,destination        | |             | a    | k  | abcdefg,ehijk              |  37m +-1  | depart,right,arrive        | | ||||||
|  | |||||||
| @ -24,70 +24,70 @@ Feature: Turn directions/codes | |||||||
|             | xg    | |             | xg    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                         | |             | from | to | route | turns                      | | ||||||
|             | i    | k  | xi,xk | head,sharp_left,destination   | |             | i    | k  | xi,xk | depart,sharp_left,arrive   | | ||||||
|             | i    | m  | xi,xm | head,left,destination         | |             | i    | m  | xi,xm | depart,left,arrive         | | ||||||
|             | i    | o  | xi,xo | head,slight_left,destination  | |             | i    | o  | xi,xo | depart,slight_left,arrive  | | ||||||
|             | i    | a  | xi,xa | head,straight,destination     | |             | i    | a  | xi,xa | depart,straight,arrive     | | ||||||
|             | i    | c  | xi,xc | head,slight_right,destination | |             | i    | c  | xi,xc | depart,slight_right,arrive | | ||||||
|             | i    | e  | xi,xe | head,right,destination        | |             | i    | e  | xi,xe | depart,right,arrive        | | ||||||
|             | i    | g  | xi,xg | head,sharp_right,destination  | |             | i    | g  | xi,xg | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | k | m | xk,xm | head,sharp_left,destination   | |             | k | m | xk,xm | depart,sharp_left,arrive   | | ||||||
|             | k | o | xk,xo | head,left,destination         | |             | k | o | xk,xo | depart,left,arrive         | | ||||||
|             | k | a | xk,xa | head,slight_left,destination  | |             | k | a | xk,xa | depart,slight_left,arrive  | | ||||||
|             | k | c | xk,xc | head,straight,destination     | |             | k | c | xk,xc | depart,straight,arrive     | | ||||||
|             | k | e | xk,xe | head,slight_right,destination | |             | k | e | xk,xe | depart,slight_right,arrive | | ||||||
|             | k | g | xk,xg | head,right,destination        | |             | k | g | xk,xg | depart,right,arrive        | | ||||||
|             | k | i | xk,xi | head,sharp_right,destination  | |             | k | i | xk,xi | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | m | o | xm,xo | head,sharp_left,destination   | |             | m | o | xm,xo | depart,sharp_left,arrive   | | ||||||
|             | m | a | xm,xa | head,left,destination         | |             | m | a | xm,xa | depart,left,arrive         | | ||||||
|             | m | c | xm,xc | head,slight_left,destination  | |             | m | c | xm,xc | depart,slight_left,arrive  | | ||||||
|             | m | e | xm,xe | head,straight,destination     | |             | m | e | xm,xe | depart,straight,arrive     | | ||||||
|             | m | g | xm,xg | head,slight_right,destination | |             | m | g | xm,xg | depart,slight_right,arrive | | ||||||
|             | m | i | xm,xi | head,right,destination        | |             | m | i | xm,xi | depart,right,arrive        | | ||||||
|             | m | k | xm,xk | head,sharp_right,destination  | |             | m | k | xm,xk | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | o | a | xo,xa | head,sharp_left,destination   | |             | o | a | xo,xa | depart,sharp_left,arrive   | | ||||||
|             | o | c | xo,xc | head,left,destination         | |             | o | c | xo,xc | depart,left,arrive         | | ||||||
|             | o | e | xo,xe | head,slight_left,destination  | |             | o | e | xo,xe | depart,slight_left,arrive  | | ||||||
|             | o | g | xo,xg | head,straight,destination     | |             | o | g | xo,xg | depart,straight,arrive     | | ||||||
|             | o | i | xo,xi | head,slight_right,destination | |             | o | i | xo,xi | depart,slight_right,arrive | | ||||||
|             | o | k | xo,xk | head,right,destination        | |             | o | k | xo,xk | depart,right,arrive        | | ||||||
|             | o | m | xo,xm | head,sharp_right,destination  | |             | o | m | xo,xm | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | a | c | xa,xc | head,sharp_left,destination   | |             | a | c | xa,xc | depart,sharp_left,arrive   | | ||||||
|             | a | e | xa,xe | head,left,destination         | |             | a | e | xa,xe | depart,left,arrive         | | ||||||
|             | a | g | xa,xg | head,slight_left,destination  | |             | a | g | xa,xg | depart,slight_left,arrive  | | ||||||
|             | a | i | xa,xi | head,straight,destination     | |             | a | i | xa,xi | depart,straight,arrive     | | ||||||
|             | a | k | xa,xk | head,slight_right,destination | |             | a | k | xa,xk | depart,slight_right,arrive | | ||||||
|             | a | m | xa,xm | head,right,destination        | |             | a | m | xa,xm | depart,right,arrive        | | ||||||
|             | a | o | xa,xo | head,sharp_right,destination  | |             | a | o | xa,xo | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | c | e | xc,xe | head,sharp_left,destination   | |             | c | e | xc,xe | depart,sharp_left,arrive   | | ||||||
|             | c | g | xc,xg | head,left,destination         | |             | c | g | xc,xg | depart,left,arrive         | | ||||||
|             | c | i | xc,xi | head,slight_left,destination  | |             | c | i | xc,xi | depart,slight_left,arrive  | | ||||||
|             | c | k | xc,xk | head,straight,destination     | |             | c | k | xc,xk | depart,straight,arrive     | | ||||||
|             | c | m | xc,xm | head,slight_right,destination | |             | c | m | xc,xm | depart,slight_right,arrive | | ||||||
|             | c | o | xc,xo | head,right,destination        | |             | c | o | xc,xo | depart,right,arrive        | | ||||||
|             | c | a | xc,xa | head,sharp_right,destination  | |             | c | a | xc,xa | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | e | g | xe,xg | head,sharp_left,destination   | |             | e | g | xe,xg | depart,sharp_left,arrive   | | ||||||
|             | e | i | xe,xi | head,left,destination         | |             | e | i | xe,xi | depart,left,arrive         | | ||||||
|             | e | k | xe,xk | head,slight_left,destination  | |             | e | k | xe,xk | depart,slight_left,arrive  | | ||||||
|             | e | m | xe,xm | head,straight,destination     | |             | e | m | xe,xm | depart,straight,arrive     | | ||||||
|             | e | o | xe,xo | head,slight_right,destination | |             | e | o | xe,xo | depart,slight_right,arrive | | ||||||
|             | e | a | xe,xa | head,right,destination        | |             | e | a | xe,xa | depart,right,arrive        | | ||||||
|             | e | c | xe,xc | head,sharp_right,destination  | |             | e | c | xe,xc | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|             | g | i | xg,xi | head,sharp_left,destination   | |             | g | i | xg,xi | depart,sharp_left,arrive   | | ||||||
|             | g | k | xg,xk | head,left,destination         | |             | g | k | xg,xk | depart,left,arrive         | | ||||||
|             | g | m | xg,xm | head,slight_left,destination  | |             | g | m | xg,xm | depart,slight_left,arrive  | | ||||||
|             | g | o | xg,xo | head,straight,destination     | |             | g | o | xg,xo | depart,straight,arrive     | | ||||||
|             | g | a | xg,xa | head,slight_right,destination | |             | g | a | xg,xa | depart,slight_right,arrive | | ||||||
|             | g | c | xg,xc | head,right,destination        | |             | g | c | xg,xc | depart,right,arrive        | | ||||||
|             | g | e | xg,xe | head,sharp_right,destination  | |             | g | e | xg,xe | depart,sharp_right,arrive  | | ||||||
| 
 | 
 | ||||||
|     Scenario: Turn instructions at high latitude |     Scenario: Turn instructions at high latitude | ||||||
|     # https://github.com/DennisOSRM/Project-OSRM/issues/532 |     # https://github.com/DennisOSRM/Project-OSRM/issues/532 | ||||||
| @ -108,8 +108,8 @@ Feature: Turn directions/codes | |||||||
|             | yz    | |             | yz    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                     | |             | from | to | route | turns                  | | ||||||
|             | a    | c  | ab,bc | head,straight,destination | |             | a    | c  | ab,bc | depart,straight,arrive | | ||||||
|             | c    | a  | bc,ab | head,straight,destination | |             | c    | a  | bc,ab | depart,straight,arrive | | ||||||
|             | x    | z  | xy,yz | head,straight,destination | |             | x    | z  | xy,yz | depart,straight,arrive | | ||||||
|             | z    | x  | yz,xy | head,straight,destination | |             | z    | x  | yz,xy | depart,straight,arrive | | ||||||
|  | |||||||
| @ -20,8 +20,8 @@ Feature: U-turns at via points | |||||||
|             | fg    | |             | fg    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route                | turns                                                          | |             | waypoints | route                | turns                                                       | | ||||||
|             | a,e,c     | ab,be,be,ef,fg,dg,cd | head,right,via,straight,straight,straight,straight,destination | |             | a,e,c     | ab,be,be,ef,fg,dg,cd | depart,right,via,straight,straight,straight,straight,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Query param to allow U-turns at all via points |     Scenario: Query param to allow U-turns at all via points | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -65,8 +65,8 @@ Feature: U-turns at via points | |||||||
|             | fg    | |             | fg    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route       | turns                              | |             | waypoints | route       | turns                           | | ||||||
|             | a,e,c     | ab,be,be,bc | head,right,uturn,right,destination | |             | a,e,c     | ab,be,be,bc | depart,right,uturn,right,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: u-turn mixed with non-uturn vias |     Scenario: u-turn mixed with non-uturn vias | ||||||
|         Given the node map |         Given the node map | ||||||
|  | |||||||
| @ -79,8 +79,8 @@ Feature: Via points | |||||||
|             | ab    | |             | ab    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route | turns                | |             | waypoints | route | turns             | | ||||||
|             | 1,1,4     | ab,ab | head,via,destination | |             | 1,1,4     | ab,ab | depart,via,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Via points on ring of oneways |     Scenario: Via points on ring of oneways | ||||||
|     # xa it to avoid only having a single ring, which cna trigger edge cases |     # xa it to avoid only having a single ring, which cna trigger edge cases | ||||||
| @ -100,12 +100,12 @@ Feature: Via points | |||||||
|             | fa    | yes    | |             | fa    | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route                               | distance  | turns                                                                                                    | |             | waypoints | route                               | distance  | turns                                                                                                 | | ||||||
|             | 1,3       | ab,bc,cd                            |  400m +-1 | head,straight,straight,destination                                                                       | |             | 1,3       | ab,bc,cd                            |  400m +-1 | depart,straight,straight,arrive                                                                       | | ||||||
|             | 3,1       | cd,de,ef,fa,ab                      | 1000m +-1 | head,straight,straight,straight,right,destination                                                        | |             | 3,1       | cd,de,ef,fa,ab                      | 1000m +-1 | depart,straight,straight,straight,right,arrive                                                        | | ||||||
|             | 1,2,3     | ab,bc,bc,cd                         |  400m +-1 | head,straight,via,straight,destination                                                                   | |             | 1,2,3     | ab,bc,bc,cd                         |  400m +-1 | depart,straight,via,straight,arrive                                                                   | | ||||||
|             | 1,3,2     | ab,bc,cd,cd,de,ef,fa,ab,bc          | 1600m +-1 | head,straight,straight,via,straight,straight,straight,right,straight,destination                         | |             | 1,3,2     | ab,bc,cd,cd,de,ef,fa,ab,bc          | 1600m +-1 | depart,straight,straight,via,straight,straight,straight,right,straight,arrive                         | | ||||||
|             | 3,2,1     | cd,de,ef,fa,ab,bc,bc,cd,de,ef,fa,ab | 2400m +-1 | head,straight,straight,straight,right,straight,via,straight,straight,straight,straight,right,destination | |             | 3,2,1     | cd,de,ef,fa,ab,bc,bc,cd,de,ef,fa,ab | 2400m +-1 | depart,straight,straight,straight,right,straight,via,straight,straight,straight,straight,right,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Via points on ring on the same oneway |     Scenario: Via points on ring on the same oneway | ||||||
|     # xa it to avoid only having a single ring, which cna trigger edge cases |     # xa it to avoid only having a single ring, which cna trigger edge cases | ||||||
| @ -123,12 +123,12 @@ Feature: Via points | |||||||
|             | da    | yes    | |             | da    | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route                         | distance  | turns                                                                                  | |             | waypoints | route                         | distance  | turns                                                                               | | ||||||
|             | 1,3       | ab                            | 200m +-1  | head,destination                                                                       | |             | 1,3       | ab                            | 200m +-1  | depart,arrive                                                                       | | ||||||
|             | 3,1       | ab,bc,cd,da,ab                | 800m +-1  | head,straight,straight,straight,right,destination                                      | |             | 3,1       | ab,bc,cd,da,ab                | 800m +-1  | depart,straight,straight,straight,right,arrive                                      | | ||||||
|             | 1,2,3     | ab,ab                         | 200m +-1  | head,via,destination                                                                   | |             | 1,2,3     | ab,ab                         | 200m +-1  | depart,via,arrive                                                                   | | ||||||
|             | 1,3,2     | ab,ab,bc,cd,da,ab             | 1100m +-1 | head,via,straight,straight,straight,right,destination                                  | |             | 1,3,2     | ab,ab,bc,cd,da,ab             | 1100m +-1 | depart,via,straight,straight,straight,right,arrive                                  | | ||||||
|             | 3,2,1     | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 1800m     | head,straight,straight,straight,right,via,straight,straight,straight,right,destination | |             | 3,2,1     | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 1800m     | depart,straight,straight,straight,right,via,straight,straight,straight,right,arrive | | ||||||
| 
 | 
 | ||||||
|     # See issue #1896 |     # See issue #1896 | ||||||
|     Scenario: Via point at a dead end with oneway |     Scenario: Via point at a dead end with oneway | ||||||
| @ -189,11 +189,11 @@ Feature: Via points | |||||||
|             | da    | yes    | |             | da    | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route                      | distance   | turns                                                                        | |             | waypoints | route                      | distance   | turns                                                                     | | ||||||
|             | 2,1       | ab,bc,cd,da,ab             | 1100m +-1  | head,straight,straight,straight,straight,destination                         | |             | 2,1       | ab,bc,cd,da,ab             | 1100m +-1  | depart,straight,straight,straight,straight,arrive                         | | ||||||
|             | 4,3       | bc,cd,da,ab,bc             | 1100m +-1  | head,straight,straight,straight,straight,destination                         | |             | 4,3       | bc,cd,da,ab,bc             | 1100m +-1  | depart,straight,straight,straight,straight,arrive                         | | ||||||
|             | 6,5       | cd,da,ab,bc,cd             | 1100m +-1  | head,straight,straight,straight,straight,destination                         | |             | 6,5       | cd,da,ab,bc,cd             | 1100m +-1  | depart,straight,straight,straight,straight,arrive                         | | ||||||
|             | 8,7       | da,ab,bc,cd,da             | 1100m +-1  | head,straight,straight,straight,straight,destination                         | |             | 8,7       | da,ab,bc,cd,da             | 1100m +-1  | depart,straight,straight,straight,straight,arrive                         | | ||||||
| 
 | 
 | ||||||
|     Scenario: Multiple Via points on ring on the same oneway, forces one of the vertices to be top node |     Scenario: Multiple Via points on ring on the same oneway, forces one of the vertices to be top node | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -211,7 +211,7 @@ Feature: Via points | |||||||
|             | da    | yes    | |             | da    | yes    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | waypoints | route                         | distance     | turns                                                                                        | |             | waypoints | route                         | distance     | turns                                                                                     | | ||||||
|             | 3,2,1     | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 3000m +-1    | head,straight,straight,straight,straight,via,straight,straight,straight,straight,destination | |             | 3,2,1     | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 3000m +-1    | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive | | ||||||
|             | 6,5,4     | bc,cd,da,ab,bc,bc,cd,da,ab,bc | 3000m +-1    | head,straight,straight,straight,straight,via,straight,straight,straight,straight,destination | |             | 6,5,4     | bc,cd,da,ab,bc,bc,cd,da,ab,bc | 3000m +-1    | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive | | ||||||
|             | 9,8,7     | cd,da,ab,bc,cd,cd,da,ab,bc,cd | 3000m +-1    | head,straight,straight,straight,straight,via,straight,straight,straight,straight,destination | |             | 9,8,7     | cd,da,ab,bc,cd,cd,da,ab,bc,cd | 3000m +-1    | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive | | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user