Update foot features to reflect not cutting off arrive instruction
This commit is contained in:
		
							parent
							
								
									1a8097f810
								
							
						
					
					
						commit
						e5025665fc
					
				@ -17,15 +17,15 @@ Feature: Foot - Squares and other areas
 | 
				
			|||||||
            | abcda | yes  | residential |
 | 
					            | abcda | yes  | residential |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route |
 | 
					            | from | to | route       |
 | 
				
			||||||
            | a    | b  | abcda |
 | 
					            | a    | b  | abcda,abcda |
 | 
				
			||||||
            | a    | d  | abcda |
 | 
					            | a    | d  | abcda,abcda |
 | 
				
			||||||
            | b    | c  | abcda |
 | 
					            | b    | c  | abcda,abcda |
 | 
				
			||||||
            | c    | b  | abcda |
 | 
					            | c    | b  | abcda,abcda |
 | 
				
			||||||
            | c    | d  | abcda |
 | 
					            | c    | d  | abcda,abcda |
 | 
				
			||||||
            | d    | c  | abcda |
 | 
					            | d    | c  | abcda,abcda |
 | 
				
			||||||
            | d    | a  | abcda |
 | 
					            | d    | a  | abcda,abcda |
 | 
				
			||||||
            | a    | d  | abcda |
 | 
					            | a    | d  | abcda,abcda |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @building
 | 
					    @building
 | 
				
			||||||
    Scenario: Foot - Don't route on buildings
 | 
					    Scenario: Foot - Don't route on buildings
 | 
				
			||||||
@ -65,17 +65,17 @@ Feature: Foot - Squares and other areas
 | 
				
			|||||||
            | abcda | (nil)   | parking |
 | 
					            | abcda | (nil)   | parking |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route       |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | x    | y  | xa,abcda,by |
 | 
					            | x    | y  | xa,abcda,by,by |
 | 
				
			||||||
            | y    | x  | by,abcda,xa |
 | 
					            | y    | x  | by,abcda,xa,xa |
 | 
				
			||||||
            | a    | b  | abcda       |
 | 
					            | a    | b  | abcda,abcda    |
 | 
				
			||||||
            | a    | d  | abcda       |
 | 
					            | a    | d  | abcda,abcda    |
 | 
				
			||||||
            | b    | c  | abcda       |
 | 
					            | b    | c  | abcda,abcda    |
 | 
				
			||||||
            | c    | b  | abcda       |
 | 
					            | c    | b  | abcda,abcda    |
 | 
				
			||||||
            | c    | d  | abcda       |
 | 
					            | c    | d  | abcda,abcda    |
 | 
				
			||||||
            | d    | c  | abcda       |
 | 
					            | d    | c  | abcda,abcda    |
 | 
				
			||||||
            | d    | a  | abcda       |
 | 
					            | d    | a  | abcda,abcda    |
 | 
				
			||||||
            | a    | d  | abcda       |
 | 
					            | a    | d  | abcda,abcda    |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @train @platform
 | 
					    @train @platform
 | 
				
			||||||
    Scenario: Foot - railway platforms
 | 
					    Scenario: Foot - railway platforms
 | 
				
			||||||
@ -90,14 +90,14 @@ Feature: Foot - Squares and other areas
 | 
				
			|||||||
            | abcda | (nil)   | platform |
 | 
					            | abcda | (nil)   | platform |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route       |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | x    | y  | xa,abcda,by |
 | 
					            | x    | y  | xa,abcda,by,by |
 | 
				
			||||||
            | y    | x  | by,abcda,xa |
 | 
					            | y    | x  | by,abcda,xa,xa |
 | 
				
			||||||
            | a    | b  | abcda       |
 | 
					            | a    | b  | abcda,abcda    |
 | 
				
			||||||
            | a    | d  | abcda       |
 | 
					            | a    | d  | abcda,abcda    |
 | 
				
			||||||
            | b    | c  | abcda       |
 | 
					            | b    | c  | abcda,abcda    |
 | 
				
			||||||
            | c    | b  | abcda       |
 | 
					            | c    | b  | abcda,abcda    |
 | 
				
			||||||
            | c    | d  | abcda       |
 | 
					            | c    | d  | abcda,abcda    |
 | 
				
			||||||
            | d    | c  | abcda       |
 | 
					            | d    | c  | abcda,abcda    |
 | 
				
			||||||
            | d    | a  | abcda       |
 | 
					            | d    | a  | abcda,abcda    |
 | 
				
			||||||
            | a    | d  | abcda       |
 | 
					            | a    | d  | abcda,abcda    |
 | 
				
			||||||
 | 
				
			|||||||
@ -17,15 +17,15 @@ Feature: Foot - 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 | walking,ferry,walking |
 | 
					            | a    | g  | abc,cde,efg,efg | walking,ferry,walking,walking |
 | 
				
			||||||
            | b    | f  | abc,cde,efg | walking,ferry,walking |
 | 
					            | b    | f  | abc,cde,efg,efg | walking,ferry,walking,walking |
 | 
				
			||||||
            | e    | c  | cde         | ferry                 |
 | 
					            | e    | c  | cde,cde         | ferry,ferry                   |
 | 
				
			||||||
            | e    | b  | cde,abc     | ferry,walking         |
 | 
					            | e    | b  | cde,abc,abc     | ferry,walking,walking         |
 | 
				
			||||||
            | e    | a  | cde,abc     | ferry,walking         |
 | 
					            | e    | a  | cde,abc,abc     | ferry,walking,walking         |
 | 
				
			||||||
            | c    | e  | cde         | ferry                 |
 | 
					            | c    | e  | cde,cde         | ferry,ferry                   |
 | 
				
			||||||
            | c    | f  | cde,efg     | ferry,walking         |
 | 
					            | c    | f  | cde,efg,efg     | ferry,walking,walking         |
 | 
				
			||||||
            | c    | g  | cde,efg     | ferry,walking         |
 | 
					            | c    | g  | cde,efg,efg     | ferry,walking,walking         |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Foot - Ferry duration, single node
 | 
					    Scenario: Foot - Ferry duration, single node
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
@ -58,6 +58,6 @@ Feature: Foot - Handle ferry routes
 | 
				
			|||||||
            | abcd  |         | ferry | yes  | 1:00     |
 | 
					            | abcd  |         | ferry | yes  | 1:00     |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route | time       |
 | 
					            | from | to | route     | time       |
 | 
				
			||||||
            | a    | d  | abcd  | 3600s +-10 |
 | 
					            | a    | d  | abcd,abcd | 3600s +-10 |
 | 
				
			||||||
            | d    | a  | abcd  | 3600s +-10 |
 | 
					            | d    | a  | abcd,abcd | 3600s +-10 |
 | 
				
			||||||
 | 
				
			|||||||
@ -15,8 +15,8 @@ Feature: Foot - Street names in instructions
 | 
				
			|||||||
            | bc    | Your Way |
 | 
					            | bc    | Your Way |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route           |
 | 
					            | from | to | route                    |
 | 
				
			||||||
            | a    | c  | My Way,Your Way |
 | 
					            | a    | c  | My Way,Your Way,Your Way |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @unnamed
 | 
					    @unnamed
 | 
				
			||||||
    Scenario: Foot - Use way type to describe unnamed ways
 | 
					    Scenario: Foot - Use way type to describe unnamed ways
 | 
				
			||||||
@ -29,5 +29,5 @@ Feature: Foot - Street names in instructions
 | 
				
			|||||||
            | bcd   | track   |      |
 | 
					            | bcd   | track   |      |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route                             |
 | 
					            | from | to | route                                             |
 | 
				
			||||||
            | a    | d  | {highway:footway},{highway:track} |
 | 
					            | a    | d  | {highway:footway},{highway:track},{highway:track} |
 | 
				
			||||||
 | 
				
			|||||||
@ -13,8 +13,8 @@ Feature: Foot - Way ref
 | 
				
			|||||||
            | ab    | Utopia Drive | E7  |
 | 
					            | ab    | Utopia Drive | E7  |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route             |
 | 
					            | from | to | route                               |
 | 
				
			||||||
            | a    | b  | Utopia Drive / E7 |
 | 
					            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Foot - Way with only ref
 | 
					    Scenario: Foot - Way with only ref
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
@ -26,7 +26,7 @@ Feature: Foot - Way ref
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route |
 | 
					            | from | to | route |
 | 
				
			||||||
            | a    | b  | E7    |
 | 
					            | a    | b  | E7,E7 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Foot - Way with only name
 | 
					    Scenario: Foot - Way with only name
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
@ -37,5 +37,5 @@ Feature: Foot - Way ref
 | 
				
			|||||||
            | ab    | Utopia Drive |
 | 
					            | ab    | Utopia Drive |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route        |
 | 
					            | from | to | route                     |
 | 
				
			||||||
            | a    | b  | Utopia Drive |
 | 
					            | a    | b  | Utopia Drive,Utopia Drive |
 | 
				
			||||||
 | 
				
			|||||||
@ -24,10 +24,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @no_turning
 | 
					    @no_turning
 | 
				
			||||||
    Scenario: Foot - No right turn
 | 
					    Scenario: Foot - No right turn
 | 
				
			||||||
@ -48,10 +48,10 @@ Feature: Foot - 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  | sj,ej |
 | 
					            | s    | e  | sj,ej,ej |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @no_turning
 | 
					    @no_turning
 | 
				
			||||||
    Scenario: Foot - No u-turn
 | 
					    Scenario: Foot - No u-turn
 | 
				
			||||||
@ -72,10 +72,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @no_turning
 | 
					    @no_turning
 | 
				
			||||||
    Scenario: Foot - Handle any no_* relation
 | 
					    Scenario: Foot - Handle any no_* relation
 | 
				
			||||||
@ -96,10 +96,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @only_turning
 | 
					    @only_turning
 | 
				
			||||||
    Scenario: Foot - Only left turn
 | 
					    Scenario: Foot - Only left turn
 | 
				
			||||||
@ -120,10 +120,10 @@ Feature: Foot - 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  | sj,nj |
 | 
					            | s    | n  | sj,nj,nj |
 | 
				
			||||||
            | s    | e  | sj,ej |
 | 
					            | s    | e  | sj,ej,ej |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @only_turning
 | 
					    @only_turning
 | 
				
			||||||
    Scenario: Foot - Only right turn
 | 
					    Scenario: Foot - Only right turn
 | 
				
			||||||
@ -144,10 +144,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @only_turning
 | 
					    @only_turning
 | 
				
			||||||
    Scenario: Foot - Only straight on
 | 
					    Scenario: Foot - Only straight on
 | 
				
			||||||
@ -168,10 +168,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @no_turning
 | 
					    @no_turning
 | 
				
			||||||
    Scenario: Foot - Handle any only_* restriction
 | 
					    Scenario: Foot - Handle any only_* restriction
 | 
				
			||||||
@ -192,10 +192,10 @@ Feature: Foot - 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  | 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 |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @except
 | 
					    @except
 | 
				
			||||||
    Scenario: Foot - Except tag and on no_ restrictions
 | 
					    Scenario: Foot - Except tag and on no_ restrictions
 | 
				
			||||||
@ -221,11 +221,11 @@ Feature: Foot - Turn restrictions
 | 
				
			|||||||
            | restriction | sj       | dj     | j        | no_right_turn | foot   |
 | 
					            | restriction | sj       | dj     | j        | no_right_turn | foot   |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        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 |
 | 
				
			||||||
            | s    | c  | sj,cj |
 | 
					            | s    | c  | sj,cj,cj |
 | 
				
			||||||
            | s    | d  | sj,dj |
 | 
					            | s    | d  | sj,dj,dj |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @except
 | 
					    @except
 | 
				
			||||||
    Scenario: Foot - Except tag and on only_ restrictions
 | 
					    Scenario: Foot - Except tag and on only_ restrictions
 | 
				
			||||||
@ -245,9 +245,9 @@ Feature: Foot - Turn restrictions
 | 
				
			|||||||
            | restriction | sj       | aj     | j        | only_straight_on | foot   |
 | 
					            | restriction | sj       | aj     | j        | only_straight_on | foot   |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        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: Foot - Multiple except tag values
 | 
					    Scenario: Foot - Multiple except tag values
 | 
				
			||||||
@ -279,10 +279,10 @@ Feature: Foot - Turn restrictions
 | 
				
			|||||||
            | restriction | sj       | jf     | j        | no_straight_on | foot, bus     |
 | 
					            | restriction | sj       | jf     | j        | no_straight_on | foot, bus     |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route |
 | 
					            | from | to | route    |
 | 
				
			||||||
            | s    | a  | sj,ja |
 | 
					            | s    | a  | sj,ja,ja |
 | 
				
			||||||
            | s    | b  | sj,jb |
 | 
					            | s    | b  | sj,jb,jb |
 | 
				
			||||||
            | s    | c  | sj,jc |
 | 
					            | s    | c  | sj,jc,jc |
 | 
				
			||||||
            | s    | d  | sj,jd |
 | 
					            | s    | d  | sj,jd,jd |
 | 
				
			||||||
            | s    | e  | sj,je |
 | 
					            | s    | e  | sj,je,je |
 | 
				
			||||||
            | s    | f  | sj,jf |
 | 
					            | s    | f  | sj,jf,jf |
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user