Update car features to reflect not cutting off arrival instruction
This commit is contained in:
		
							parent
							
								
									f45daad6ca
								
							
						
					
					
						commit
						1a8097f810
					
				| @ -17,8 +17,8 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | a    | b  | ab    | 47 km/h +- 1 | |             | a    | b  | ab,ab | 47 km/h +- 1 | | ||||||
|             | b    | c  | bc    | 47 km/h +- 1 | |             | b    | c  | bc,bc | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Advisory speed overwrites forward maxspeed |     Scenario: Car - Advisory speed overwrites forward maxspeed | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -31,8 +31,8 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | a    | b  | ab    | 47 km/h +- 1 | |             | a    | b  | ab,ab | 47 km/h +- 1 | | ||||||
|             | b    | c  | bc    | 47 km/h +- 1 | |             | b    | c  | bc,bc | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|     @mokob @2162 |     @mokob @2162 | ||||||
|     Scenario: Car - Advisory speed overwrites backwards maxspeed |     Scenario: Car - Advisory speed overwrites backwards maxspeed | ||||||
| @ -46,8 +46,8 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | b    | a  | ab    | 47 km/h +- 1 | |             | b    | a  | ab,ab | 47 km/h +- 1 | | ||||||
|             | c    | b  | bc    | 47 km/h +- 1 | |             | c    | b  | bc,bc | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|     @mokob @2162 @deleteme |     @mokob @2162 @deleteme | ||||||
|     Scenario: Car - Advisory speed overwrites backwards maxspeed |     Scenario: Car - Advisory speed overwrites backwards maxspeed | ||||||
| @ -62,8 +62,8 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | c    | b  | bc    | 47 km/h +- 1 | |             | c    | b  | bc,bc | 47 km/h +- 1 | | ||||||
|             | d    | c  | cd    | 47 km/h +- 1 | |             | d    | c  | cd,cd | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
|     @mokob @2162 |     @mokob @2162 | ||||||
|     Scenario: Car - Directional advisory speeds play nice with eachother |     Scenario: Car - Directional advisory speeds play nice with eachother | ||||||
| @ -77,9 +77,9 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | a    | b  | ab    | 47 km/h +- 1 | |             | a    | b  | ab,ab | 47 km/h +- 1 | | ||||||
|             | b    | a  | ab    | 59 km/h +- 1 | |             | b    | a  | ab,ab | 59 km/h +- 1 | | ||||||
|             | b    | c  | bc    | 59 km/h +- 1 | |             | b    | c  | bc,bc | 59 km/h +- 1 | | ||||||
|             | c    | b  | bc    | 47 km/h +- 1 | |             | c    | b  | bc,bc | 47 km/h +- 1 | | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -17,15 +17,15 @@ Feature: Car - Handle movable bridge | |||||||
|             | efg   | primary |         |         | |             | efg   | primary |         |         | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route       | modes | |             | from | to | route           | modes                                  | | ||||||
|             | a    | g  | abc,cde,efg | driving,movable bridge,driving | |             | a    | g  | abc,cde,efg,efg | driving,movable bridge,driving,driving | | ||||||
|             | b    | f  | abc,cde,efg | driving,movable bridge,driving | |             | b    | f  | abc,cde,efg,efg | driving,movable bridge,driving,driving | | ||||||
|             | e    | c  | cde         | movable bridge                 | |             | e    | c  | cde,cde         | movable bridge,movable bridge          | | ||||||
|             | e    | b  | cde,abc     | movable bridge,driving         | |             | e    | b  | cde,abc,abc     | movable bridge,driving,driving         | | ||||||
|             | e    | a  | cde,abc     | movable bridge,driving         | |             | e    | a  | cde,abc,abc     | movable bridge,driving,driving         | | ||||||
|             | c    | e  | cde         | movable bridge                 | |             | c    | e  | cde,cde         | movable bridge,movable bridge          | | ||||||
|             | c    | f  | cde,efg     | movable bridge,driving         | |             | c    | f  | cde,efg,efg     | movable bridge,driving,driving         | | ||||||
|             | c    | g  | cde,efg     | movable bridge,driving         | |             | c    | g  | cde,efg,efg     | movable bridge,driving,driving         | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Properly handle durations |     Scenario: Car - Properly handle durations | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -40,8 +40,8 @@ Feature: Car - Handle movable bridge | |||||||
|             | efg   | primary |         |          | |             | efg   | primary |         |          | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route       | modes                          | speed  | |             | from | to | route           | modes                                  | speed  | | ||||||
|             | a    | g  | abc,cde,efg | driving,movable bridge,driving | 7 km/h | |             | a    | g  | abc,cde,efg,efg | driving,movable bridge,driving,driving | 7 km/h | | ||||||
|             | b    | f  | abc,cde,efg | driving,movable bridge,driving | 5 km/h | |             | b    | f  | abc,cde,efg,efg | driving,movable bridge,driving,driving | 5 km/h | | ||||||
|             | c    | e  | cde         | movable bridge                 | 2 km/h | |             | c    | e  | cde,cde         | movable bridge,movable bridge          | 2 km/h | | ||||||
|             | e    | c  | cde         | movable bridge                 | 2 km/h | |             | e    | c  | cde,cde         | movable bridge,movable bridge          | 2 km/h | | ||||||
|  | |||||||
| @ -17,15 +17,15 @@ Feature: Car - Handle ferry routes | |||||||
|             | efg   | primary |       |         | |             | efg   | primary |       |         | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route       | modes                 | |             | from | to | route           | modes                         | | ||||||
|             | a    | g  | abc,cde,efg | driving,ferry,driving | |             | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | | ||||||
|             | b    | f  | abc,cde,efg | driving,ferry,driving | |             | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | | ||||||
|             | e    | c  | cde         | ferry                 | |             | e    | c  | cde,cde         | ferry,ferry                   | | ||||||
|             | e    | b  | cde,abc     | ferry,driving         | |             | e    | b  | cde,abc,abc     | ferry,driving,driving         | | ||||||
|             | e    | a  | cde,abc     | ferry,driving         | |             | e    | a  | cde,abc,abc     | ferry,driving,driving         | | ||||||
|             | c    | e  | cde         | ferry                 | |             | c    | e  | cde,cde         | ferry,ferry                   | | ||||||
|             | c    | f  | cde,efg     | ferry,driving         | |             | c    | f  | cde,efg,efg     | ferry,driving,driving         | | ||||||
|             | c    | g  | cde,efg     | ferry,driving         | |             | c    | g  | cde,efg,efg     | ferry,driving,driving         | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Properly handle simple durations |     Scenario: Car - Properly handle simple durations | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -40,11 +40,11 @@ Feature: Car - Handle ferry routes | |||||||
|             | efg   | primary |       |          | |             | efg   | primary |       |          | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route       | modes                 | speed   | |             | from | to | route           | modes                         | speed   | | ||||||
|             | a    | g  | abc,cde,efg | driving,ferry,driving | 25 km/h | |             | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h | | ||||||
|             | b    | f  | abc,cde,efg | driving,ferry,driving | 20 km/h | |             | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h | | ||||||
|             | c    | e  | cde         | ferry                 | 12 km/h | |             | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h | | ||||||
|             | e    | c  | cde         | ferry                 | 12 km/h | |             | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Properly handle ISO 8601 durations |     Scenario: Car - Properly handle ISO 8601 durations | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -59,8 +59,8 @@ Feature: Car - Handle ferry routes | |||||||
|             | efg   | primary |       |          | |             | efg   | primary |       |          | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route       | modes                 | speed   | |             | from | to | route           | modes                         | speed   | | ||||||
|             | a    | g  | abc,cde,efg | driving,ferry,driving | 25 km/h | |             | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h | | ||||||
|             | b    | f  | abc,cde,efg | driving,ferry,driving | 20 km/h | |             | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h | | ||||||
|             | c    | e  | cde         | ferry                 | 12 km/h | |             | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h | | ||||||
|             | e    | c  | cde         | ferry                 | 12 km/h | |             | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h | | ||||||
|  | |||||||
| @ -24,9 +24,9 @@ Feature: Car - Speed on links | |||||||
|             | dy    | unclassified  | |             | dy    | unclassified  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route          | |             | from | to | route             | | ||||||
|             | x    | y  | xa,ae,ef,fd,dy | |             | x    | y  | xa,ae,ef,fd,dy,dy | | ||||||
|             | b    | c  | bc             | |             | b    | c  | bc,bc             | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Use trunk_link when reasonable |     Scenario: Car - Use trunk_link when reasonable | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -44,9 +44,9 @@ Feature: Car - Speed on links | |||||||
|             | fd    | trunk        | |             | fd    | trunk        | | ||||||
|             | dy    | unclassified | |             | dy    | unclassified | | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route          | |             | from | to | route             | | ||||||
|             | x    | y  | xa,ae,ef,fd,dy | |             | x    | y  | xa,ae,ef,fd,dy,dy | | ||||||
|             | b    | c  | bc             | |             | b    | c  | bc,bc             | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Use primary_link when reasonable |     Scenario: Car - Use primary_link when reasonable | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -64,9 +64,9 @@ Feature: Car - Speed on links | |||||||
|             | fd    | primary        | |             | fd    | primary        | | ||||||
|             | dy    | unclassified | |             | dy    | unclassified | | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route          | |             | from | to | route             | | ||||||
|             | x    | y  | xa,ae,ef,fd,dy | |             | x    | y  | xa,ae,ef,fd,dy,dy | | ||||||
|             | b    | c  | bc             | |             | b    | c  | bc,bc             | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Use secondary_link when reasonable |     Scenario: Car - Use secondary_link when reasonable | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -85,9 +85,9 @@ Feature: Car - Speed on links | |||||||
|             | dy    | unclassified     | |             | dy    | unclassified     | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route          | |             | from | to | route             | | ||||||
|             | x    | y  | xa,ae,ef,fd,dy | |             | x    | y  | xa,ae,ef,fd,dy,dy | | ||||||
|             | b    | c  | bc             | |             | b    | c  | bc,bc             | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Use tertiary_link when reasonable |     Scenario: Car - Use tertiary_link when reasonable | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -106,6 +106,6 @@ Feature: Car - Speed on links | |||||||
|             | dy    | unclassified    | |             | dy    | unclassified    | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route          | |             | from | to | route             | | ||||||
|             | x    | y  | xa,ae,ef,fd,dy | |             | x    | y  | xa,ae,ef,fd,dy,dy | | ||||||
|             | b    | c  | bc             | |             | b    | c  | bc,bc             | | ||||||
|  | |||||||
| @ -21,12 +21,12 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed         | |             | from | to | route | speed         | | ||||||
|             | a    | b  | ab    |  79 km/h      | |             | a    | b  | ab,ab |  79 km/h      | | ||||||
|             | b    | c  | bc    |  59 km/h +- 1 | |             | b    | c  | bc,bc |  59 km/h +- 1 | | ||||||
|             | c    | d  | cd    |  51 km/h      | |             | c    | d  | cd,cd |  51 km/h      | | ||||||
|             | d    | e  | de    |  75 km/h      | |             | d    | e  | de,de |  75 km/h      | | ||||||
|             | e    | f  | ef    |  91 km/h      | |             | e    | f  | ef,ef |  91 km/h      | | ||||||
|             | f    | g  | fg    | 107 km/h      | |             | f    | g  | fg,fg | 107 km/h      | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Do not ignore maxspeed when higher than way speed |     Scenario: Car - Do not ignore maxspeed when higher than way speed | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -40,9 +40,9 @@ OSRM will use 4/5 of the projected free-flow speed. | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | speed        | |             | from | to | route | speed        | | ||||||
|             | a    | b  | ab    | 31 km/h      | |             | a    | b  | ab,ab | 31 km/h      | | ||||||
|             | b    | c  | bc    | 83 km/h +- 1 | |             | b    | c  | bc,bc | 83 km/h +- 1 | | ||||||
|             | c    | d  | cd    | 51 km/h      | |             | c    | d  | cd,cd | 51 km/h      | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Forward/backward maxspeed |     Scenario: Car - Forward/backward maxspeed | ||||||
|         Given a grid size of 100 meters |         Given a grid size of 100 meters | ||||||
|  | |||||||
| @ -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 | depart,right,left,arrive | driving,ferry,driving | |             | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | driving,ferry,driving,driving | | ||||||
|             | d    | a  | cd,bc,ab | depart,right,left,arrive | driving,ferry,driving | |             | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | driving,ferry,driving,driving | | ||||||
|             | c    | a  | bc,ab    | depart,left,arrive       | ferry,driving         | |             | c    | a  | bc,ab,ab    | depart,left,arrive       | ferry,driving,driving         | | ||||||
|             | d    | b  | cd,bc    | depart,right,arrive      | driving,ferry         | |             | d    | b  | cd,bc,bc    | depart,right,arrive      | driving,ferry,ferry           | | ||||||
|             | a    | c  | ab,bc    | depart,right,arrive      | driving,ferry         | |             | a    | c  | ab,bc,bc    | depart,right,arrive      | driving,ferry,ferry           | | ||||||
|             | b    | d  | bc,cd    | depart,left,arrive       | ferry,driving         | |             | b    | d  | bc,cd,cd    | depart,left,arrive       | ferry,driving,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  | depart,arrive | ferry       | 600s  | |             | c    | d  | bcde,bcde | depart,arrive | ferry,ferry | 600s  | | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -15,8 +15,8 @@ Feature: Car - Street names in instructions | |||||||
|             | bc    | Your Way | A1  | |             | bc    | Your Way | A1  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                | |             | from | to | route                              | | ||||||
|             | a    | c  | My Way,Your Way (A1) | |             | a    | c  | My Way,Your Way (A1),Your Way (A1) | | ||||||
| 
 | 
 | ||||||
|     @todo |     @todo | ||||||
|     Scenario: Car - Use way type to describe unnamed ways |     Scenario: Car - Use way type to describe unnamed ways | ||||||
| @ -29,5 +29,5 @@ Feature: Car - Street names in instructions | |||||||
|             | bcd   | residential |      | |             | bcd   | residential |      | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                | |             | from | to | route                            | | ||||||
|             | a    | c  | tertiary,residential | |             | a    | c  | tertiary,residential,residential | | ||||||
|  | |||||||
| @ -44,9 +44,9 @@ Feature: Car - Oneway streets | |||||||
|             | da    |        | |             | da    |        | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | |             | from | to | route       | | ||||||
|             | a    | b  | ab       | |             | a    | b  | ab,ab       | | ||||||
|             | b    | a  | bc,cd,da | |             | b    | a  | bc,cd,da,da | | ||||||
| 
 | 
 | ||||||
|     Scenario: Car - Cars should not be affected by bicycle tags |     Scenario: Car - Cars should not be affected by bicycle tags | ||||||
|         Then routability should be |         Then routability should be | ||||||
| @ -75,5 +75,5 @@ Feature: Car - Oneway streets | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | a    | c  | ab,bc | |             | a    | c  | ab,bc,bc | | ||||||
|  | |||||||
| @ -25,10 +25,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | wj     | j        | no_left_turn | |             | restriction | sj       | wj     | j        | no_left_turn | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @no_turning |     @no_turning | ||||||
|     Scenario: Car - No straight on |     Scenario: Car - No straight on | ||||||
| @ -55,8 +55,8 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | bj       | jd     | j        | no_straight_on | |             | restriction | bj       | jd     | j        | no_straight_on | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route             | |             | from | to | route                | | ||||||
|             | a    | e  | av,vw,wx,xy,yz,ze | |             | a    | e  | av,vw,wx,xy,yz,ze,ze | | ||||||
| 
 | 
 | ||||||
|     @no_turning |     @no_turning | ||||||
|     Scenario: Car - No right turn |     Scenario: Car - No right turn | ||||||
| @ -77,10 +77,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | ej     | j        | no_right_turn | |             | restriction | sj       | ej     | j        | no_right_turn | | ||||||
| 
 | 
 | ||||||
|         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,wj | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  |       | |             | s    | e  |          | | ||||||
| 
 | 
 | ||||||
|     @no_turning |     @no_turning | ||||||
|     Scenario: Car - No u-turn |     Scenario: Car - No u-turn | ||||||
| @ -101,10 +101,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | wj     | j        | no_u_turn   | |             | restriction | sj       | wj     | j        | no_u_turn   | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @no_turning |     @no_turning | ||||||
|     Scenario: Car - Handle any no_* relation |     Scenario: Car - Handle any no_* relation | ||||||
| @ -125,10 +125,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | wj     | j        | no_weird_zigzags | |             | restriction | sj       | wj     | j        | no_weird_zigzags | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @only_turning |     @only_turning | ||||||
|     Scenario: Car - Only left turn |     Scenario: Car - Only left turn | ||||||
| @ -149,10 +149,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | wj     | j        | only_left_turn | |             | restriction | sj       | wj     | j        | only_left_turn | | ||||||
| 
 | 
 | ||||||
|         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,wj | | ||||||
|             | s    | n  |       | |             | s    | n  |          | | ||||||
|             | s    | e  |       | |             | s    | e  |          | | ||||||
| 
 | 
 | ||||||
|     @only_turning |     @only_turning | ||||||
|     Scenario: Car - Only right turn |     Scenario: Car - Only right turn | ||||||
| @ -173,10 +173,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | ej     | j        | only_right_turn | |             | restriction | sj       | ej     | j        | only_right_turn | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  |       | |             | s    | n  |          | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @only_turning |     @only_turning | ||||||
|     Scenario: Car - Only straight on |     Scenario: Car - Only straight on | ||||||
| @ -197,10 +197,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | nj     | j        | only_straight_on | |             | restriction | sj       | nj     | j        | only_straight_on | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  |       | |             | s    | e  |          | | ||||||
| 
 | 
 | ||||||
|     @no_turning |     @no_turning | ||||||
|     Scenario: Car - Handle any only_* restriction |     Scenario: Car - Handle any only_* restriction | ||||||
| @ -221,10 +221,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | nj     | j        | only_weird_zigzags | |             | restriction | sj       | nj     | j        | only_weird_zigzags | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | |             | from | to | route    | | ||||||
|             | s    | w  |       | |             | s    | w  |          | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  |       | |             | s    | e  |          | | ||||||
| 
 | 
 | ||||||
|     @specific |     @specific | ||||||
|     Scenario: Car - :hgv-qualified on a standard turn restriction |     Scenario: Car - :hgv-qualified on a standard turn restriction | ||||||
| @ -245,10 +245,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | nj     | j        | no_straight_on  | |             | restriction | sj       | nj     | j        | no_straight_on  | | ||||||
| 
 | 
 | ||||||
|         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,wj | | ||||||
|             | s    | n  | sj,nj | |             | s    | n  | sj,nj,nj | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @specific |     @specific | ||||||
|     Scenario: Car - :motorcar-qualified on a standard turn restriction |     Scenario: Car - :motorcar-qualified on a standard turn restriction | ||||||
| @ -269,10 +269,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | nj     | j        | no_straight_on       | |             | restriction | sj       | nj     | j        | no_straight_on       | | ||||||
| 
 | 
 | ||||||
|         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,wj | | ||||||
|             | s    | n  |       | |             | s    | n  |          | | ||||||
|             | s    | e  | sj,ej | |             | s    | e  | sj,ej,ej | | ||||||
| 
 | 
 | ||||||
|     @except |     @except | ||||||
|     Scenario: Car - Except tag and on no_ restrictions |     Scenario: Car - Except tag and on no_ restrictions | ||||||
| @ -298,11 +298,11 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | dj     | j        | no_right_turn | motorcar | |             | restriction | sj       | dj     | j        | no_right_turn | motorcar | | ||||||
| 
 | 
 | ||||||
|         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,aj | | ||||||
|             | s    | b  |       | |             | s    | b  |          | | ||||||
|             | s    | c  |       | |             | s    | c  |          | | ||||||
|             | s    | d  | sj,dj | |             | s    | d  | sj,dj,dj | | ||||||
| 
 | 
 | ||||||
|     @except |     @except | ||||||
|     Scenario: Car - Except tag and on only_ restrictions |     Scenario: Car - Except tag and on only_ restrictions | ||||||
| @ -322,9 +322,9 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | sj       | aj     | j        | only_straight_on | motorcar | |             | restriction | sj       | aj     | j        | only_straight_on | motorcar | | ||||||
| 
 | 
 | ||||||
|         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,aj | | ||||||
|             | s    | b  | sj,bj | |             | s    | b  | sj,bj,bj | | ||||||
| 
 | 
 | ||||||
|     @except |     @except | ||||||
|     Scenario: Car - Several only_ restrictions at the same segment |     Scenario: Car - Several only_ restrictions at the same segment | ||||||
| @ -356,10 +356,10 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | da       | ae     | a        | only_right_turn  | |             | restriction | da       | ae     | a        | only_right_turn  | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route                            | |             | from | to | route                               | | ||||||
|             | e    | f  | ae,xa,bx,fb                      | |             | e    | f  | ae,xa,bx,fb,fb                      | | ||||||
|             | c    | f  | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb | |             | c    | f  | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb | | ||||||
|             | d    | f  | da,ae,ge,hg,hg,ge,ae,xa,bx,fb    | |             | d    | f  | da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb    | | ||||||
| 
 | 
 | ||||||
|     @except |     @except | ||||||
|     Scenario: Car - two only_ restrictions share same to-way |     Scenario: Car - two only_ restrictions share same to-way | ||||||
| @ -391,9 +391,9 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | by       | xy     | y        | only_straight_on | |             | restriction | by       | xy     | y        | only_straight_on | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | |             | from | to | route       | | ||||||
|             | a    | b  | ax,xy,yb | |             | a    | b  | ax,xy,yb,yb | | ||||||
|             | b    | a  | yb,xy,ax | |             | b    | a  | yb,xy,ax,ax | | ||||||
| 
 | 
 | ||||||
|     @except |     @except | ||||||
|     Scenario: Car - two only_ restrictions share same from-way |     Scenario: Car - two only_ restrictions share same from-way | ||||||
| @ -425,7 +425,7 @@ Feature: Car - Turn restrictions | |||||||
|             | restriction | xy       | yb     | y        | only_straight_on | |             | restriction | xy       | yb     | y        | only_straight_on | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route    | |             | from | to | route       | | ||||||
|             | a    | b  | ax,xy,yb | |             | a    | b  | ax,xy,yb,yb | | ||||||
|             | b    | a  | yb,xy,ax | |             | b    | a  | yb,xy,ax,ax | | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -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 | depart,roundabout-exit-1,arrive | |             | s    | t  | sa,tb,tb | depart,roundabout-exit-1,arrive | | ||||||
|             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive | |             | s    | u  | sa,uc,uc | depart,roundabout-exit-2,arrive | | ||||||
|             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive | |             | s    | v  | sa,vd,vd | depart,roundabout-exit-3,arrive | | ||||||
|             | u    | v  | uc,vd | depart,roundabout-exit-1,arrive | |             | u    | v  | uc,vd,vd | depart,roundabout-exit-1,arrive | | ||||||
|             | u    | s  | uc,sa | depart,roundabout-exit-2,arrive | |             | u    | s  | uc,sa,sa | depart,roundabout-exit-2,arrive | | ||||||
|             | u    | t  | uc,tb | depart,roundabout-exit-3,arrive | |             | u    | t  | uc,tb,tb | depart,roundabout-exit-3,arrive | | ||||||
|  | |||||||
| @ -19,13 +19,13 @@ Feature: Car - Handle ferryshuttle train routes | |||||||
|             | gh    | primary |               | no      | |             | gh    | primary |               | no      | | ||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route      | |             | from | to | route         | | ||||||
|             | a    | f  | abc,cde,ef | |             | a    | f  | abc,cde,ef,ef | | ||||||
|             | b    | f  | abc,cde,ef | |             | b    | f  | abc,cde,ef,ef | | ||||||
|             | e    | c  | cde        | |             | e    | c  | cde,cde       | | ||||||
|             | e    | b  | cde,abc    | |             | e    | b  | cde,abc,abc   | | ||||||
|             | e    | a  | cde,abc    | |             | e    | a  | cde,abc,abc   | | ||||||
|             | c    | e  | cde        | |             | c    | e  | cde,cde       | | ||||||
|             | c    | f  | cde,ef     | |             | c    | f  | cde,ef,ef     | | ||||||
|             | f    | g  |            | |             | f    | g  |               | | ||||||
|             | g    | h  | gh         | |             | g    | h  | gh,gh         | | ||||||
|  | |||||||
| @ -36,12 +36,12 @@ Feature: Traffic - speeds | |||||||
|         Given the extract extra arguments "--generate-edge-lookup" |         Given the extract extra arguments "--generate-edge-lookup" | ||||||
|         Given the contract extra arguments "--segment-speed-file speeds.csv" |         Given the contract extra arguments "--segment-speed-file speeds.csv" | ||||||
|         And I route I should get |         And I route I should get | ||||||
|             | from | to | route | speed   | |             | from | to | route    | speed   | | ||||||
|             | a    | b  | ab    | 27 km/h | |             | a    | b  | ab,ab    | 27 km/h | | ||||||
|             | a    | c  | ab,bc | 27 km/h | |             | a    | c  | ab,bc,bc | 27 km/h | | ||||||
|             | b    | c  | bc    | 27 km/h | |             | b    | c  | bc,bc    | 27 km/h | | ||||||
|             | a    | d  | ad    | 27 km/h | |             | a    | d  | ad,ad    | 27 km/h | | ||||||
|             | d    | c  | dc    | 36 km/h | |             | d    | c  | dc,dc    | 36 km/h | | ||||||
|             | g    | b  | ab    | 27 km/h | |             | g    | b  | ab,ab    | 27 km/h | | ||||||
|             | a    | g  | ab    | 27 km/h | |             | a    | g  | ab,ab    | 27 km/h | | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user