Update foot features to reflect not cutting off arrive instruction
This commit is contained in:
		
							parent
							
								
									5de8f57549
								
							
						
					
					
						commit
						d3dea9439a
					
				@ -18,14 +18,14 @@ Feature: Foot - Squares and other areas
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route       |
 | 
			
		||||
            | a    | b  | abcda |
 | 
			
		||||
            | a    | d  | abcda |
 | 
			
		||||
            | b    | c  | abcda |
 | 
			
		||||
            | c    | b  | abcda |
 | 
			
		||||
            | c    | d  | abcda |
 | 
			
		||||
            | d    | c  | abcda |
 | 
			
		||||
            | d    | a  | abcda |
 | 
			
		||||
            | a    | d  | abcda |
 | 
			
		||||
            | a    | b  | abcda,abcda |
 | 
			
		||||
            | a    | d  | abcda,abcda |
 | 
			
		||||
            | b    | c  | abcda,abcda |
 | 
			
		||||
            | c    | b  | abcda,abcda |
 | 
			
		||||
            | c    | d  | abcda,abcda |
 | 
			
		||||
            | d    | c  | abcda,abcda |
 | 
			
		||||
            | d    | a  | abcda,abcda |
 | 
			
		||||
            | a    | d  | abcda,abcda |
 | 
			
		||||
 | 
			
		||||
    @building
 | 
			
		||||
    Scenario: Foot - Don't route on buildings
 | 
			
		||||
@ -66,16 +66,16 @@ Feature: Foot - Squares and other areas
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route          |
 | 
			
		||||
            | x    | y  | xa,abcda,by |
 | 
			
		||||
            | y    | x  | by,abcda,xa |
 | 
			
		||||
            | a    | b  | abcda       |
 | 
			
		||||
            | a    | d  | abcda       |
 | 
			
		||||
            | b    | c  | abcda       |
 | 
			
		||||
            | c    | b  | abcda       |
 | 
			
		||||
            | c    | d  | abcda       |
 | 
			
		||||
            | d    | c  | abcda       |
 | 
			
		||||
            | d    | a  | abcda       |
 | 
			
		||||
            | a    | d  | abcda       |
 | 
			
		||||
            | x    | y  | xa,abcda,by,by |
 | 
			
		||||
            | y    | x  | by,abcda,xa,xa |
 | 
			
		||||
            | a    | b  | abcda,abcda    |
 | 
			
		||||
            | a    | d  | abcda,abcda    |
 | 
			
		||||
            | b    | c  | abcda,abcda    |
 | 
			
		||||
            | c    | b  | abcda,abcda    |
 | 
			
		||||
            | c    | d  | abcda,abcda    |
 | 
			
		||||
            | d    | c  | abcda,abcda    |
 | 
			
		||||
            | d    | a  | abcda,abcda    |
 | 
			
		||||
            | a    | d  | abcda,abcda    |
 | 
			
		||||
 | 
			
		||||
    @train @platform
 | 
			
		||||
    Scenario: Foot - railway platforms
 | 
			
		||||
@ -91,13 +91,13 @@ Feature: Foot - Squares and other areas
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route          |
 | 
			
		||||
            | x    | y  | xa,abcda,by |
 | 
			
		||||
            | y    | x  | by,abcda,xa |
 | 
			
		||||
            | a    | b  | abcda       |
 | 
			
		||||
            | a    | d  | abcda       |
 | 
			
		||||
            | b    | c  | abcda       |
 | 
			
		||||
            | c    | b  | abcda       |
 | 
			
		||||
            | c    | d  | abcda       |
 | 
			
		||||
            | d    | c  | abcda       |
 | 
			
		||||
            | d    | a  | abcda       |
 | 
			
		||||
            | a    | d  | abcda       |
 | 
			
		||||
            | x    | y  | xa,abcda,by,by |
 | 
			
		||||
            | y    | x  | by,abcda,xa,xa |
 | 
			
		||||
            | a    | b  | abcda,abcda    |
 | 
			
		||||
            | a    | d  | abcda,abcda    |
 | 
			
		||||
            | b    | c  | abcda,abcda    |
 | 
			
		||||
            | c    | b  | abcda,abcda    |
 | 
			
		||||
            | c    | d  | abcda,abcda    |
 | 
			
		||||
            | d    | c  | abcda,abcda    |
 | 
			
		||||
            | d    | a  | abcda,abcda    |
 | 
			
		||||
            | a    | d  | abcda,abcda    |
 | 
			
		||||
 | 
			
		||||
@ -18,14 +18,14 @@ Feature: Foot - Handle ferry routes
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route           | modes                         |
 | 
			
		||||
            | a    | g  | abc,cde,efg | walking,ferry,walking |
 | 
			
		||||
            | b    | f  | abc,cde,efg | walking,ferry,walking |
 | 
			
		||||
            | e    | c  | cde         | ferry                 |
 | 
			
		||||
            | e    | b  | cde,abc     | ferry,walking         |
 | 
			
		||||
            | e    | a  | cde,abc     | ferry,walking         |
 | 
			
		||||
            | c    | e  | cde         | ferry                 |
 | 
			
		||||
            | c    | f  | cde,efg     | ferry,walking         |
 | 
			
		||||
            | c    | g  | cde,efg     | ferry,walking         |
 | 
			
		||||
            | a    | g  | abc,cde,efg,efg | walking,ferry,walking,walking |
 | 
			
		||||
            | b    | f  | abc,cde,efg,efg | walking,ferry,walking,walking |
 | 
			
		||||
            | e    | c  | cde,cde         | ferry,ferry                   |
 | 
			
		||||
            | e    | b  | cde,abc,abc     | ferry,walking,walking         |
 | 
			
		||||
            | e    | a  | cde,abc,abc     | ferry,walking,walking         |
 | 
			
		||||
            | c    | e  | cde,cde         | ferry,ferry                   |
 | 
			
		||||
            | c    | f  | cde,efg,efg     | ferry,walking,walking         |
 | 
			
		||||
            | c    | g  | cde,efg,efg     | ferry,walking,walking         |
 | 
			
		||||
 | 
			
		||||
    Scenario: Foot - Ferry duration, single node
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -59,5 +59,5 @@ Feature: Foot - Handle ferry routes
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route     | time       |
 | 
			
		||||
            | a    | d  | abcd  | 3600s +-10 |
 | 
			
		||||
            | d    | a  | abcd  | 3600s +-10 |
 | 
			
		||||
            | a    | d  | abcd,abcd | 3600s +-10 |
 | 
			
		||||
            | d    | a  | abcd,abcd | 3600s +-10 |
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@ Feature: Foot - Street names in instructions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route                    |
 | 
			
		||||
            | a    | c  | My Way,Your Way |
 | 
			
		||||
            | a    | c  | My Way,Your Way,Your Way |
 | 
			
		||||
 | 
			
		||||
    @unnamed
 | 
			
		||||
    Scenario: Foot - Use way type to describe unnamed ways
 | 
			
		||||
@ -30,4 +30,4 @@ Feature: Foot - Street names in instructions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route                                             |
 | 
			
		||||
            | a    | d  | {highway:footway},{highway:track} |
 | 
			
		||||
            | a    | d  | {highway:footway},{highway:track},{highway:track} |
 | 
			
		||||
 | 
			
		||||
@ -14,7 +14,7 @@ Feature: Foot - Way ref
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route                               |
 | 
			
		||||
            | a    | b  | Utopia Drive / E7 |
 | 
			
		||||
            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Foot - Way with only ref
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -26,7 +26,7 @@ Feature: Foot - Way ref
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route |
 | 
			
		||||
            | a    | b  | E7    |
 | 
			
		||||
            | a    | b  | E7,E7 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Foot - Way with only name
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -38,4 +38,4 @@ Feature: Foot - Way ref
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route                     |
 | 
			
		||||
            | a    | b  | Utopia Drive |
 | 
			
		||||
            | a    | b  | Utopia Drive,Utopia Drive |
 | 
			
		||||
 | 
			
		||||
@ -25,9 +25,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @no_turning
 | 
			
		||||
    Scenario: Foot - No right turn
 | 
			
		||||
@ -49,9 +49,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @no_turning
 | 
			
		||||
    Scenario: Foot - No u-turn
 | 
			
		||||
@ -73,9 +73,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @no_turning
 | 
			
		||||
    Scenario: Foot - Handle any no_* relation
 | 
			
		||||
@ -97,9 +97,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @only_turning
 | 
			
		||||
    Scenario: Foot - Only left turn
 | 
			
		||||
@ -121,9 +121,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @only_turning
 | 
			
		||||
    Scenario: Foot - Only right turn
 | 
			
		||||
@ -145,9 +145,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @only_turning
 | 
			
		||||
    Scenario: Foot - Only straight on
 | 
			
		||||
@ -169,9 +169,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @no_turning
 | 
			
		||||
    Scenario: Foot - Handle any only_* restriction
 | 
			
		||||
@ -193,9 +193,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | w  | sj,wj |
 | 
			
		||||
            | s    | n  | sj,nj |
 | 
			
		||||
            | s    | e  | sj,ej |
 | 
			
		||||
            | s    | w  | sj,wj,wj |
 | 
			
		||||
            | s    | n  | sj,nj,nj |
 | 
			
		||||
            | s    | e  | sj,ej,ej |
 | 
			
		||||
 | 
			
		||||
    @except
 | 
			
		||||
    Scenario: Foot - Except tag and on no_ restrictions
 | 
			
		||||
@ -222,10 +222,10 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | a  | sj,aj |
 | 
			
		||||
            | s    | b  | sj,bj |
 | 
			
		||||
            | s    | c  | sj,cj |
 | 
			
		||||
            | s    | d  | sj,dj |
 | 
			
		||||
            | s    | a  | sj,aj,aj |
 | 
			
		||||
            | s    | b  | sj,bj,bj |
 | 
			
		||||
            | s    | c  | sj,cj,cj |
 | 
			
		||||
            | s    | d  | sj,dj,dj |
 | 
			
		||||
 | 
			
		||||
    @except
 | 
			
		||||
    Scenario: Foot - Except tag and on only_ restrictions
 | 
			
		||||
@ -246,8 +246,8 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | a  | sj,aj |
 | 
			
		||||
            | s    | b  | sj,bj |
 | 
			
		||||
            | s    | a  | sj,aj,aj |
 | 
			
		||||
            | s    | b  | sj,bj,bj |
 | 
			
		||||
 | 
			
		||||
    @except
 | 
			
		||||
    Scenario: Foot - Multiple except tag values
 | 
			
		||||
@ -280,9 +280,9 @@ Feature: Foot - Turn restrictions
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    |
 | 
			
		||||
            | s    | a  | sj,ja |
 | 
			
		||||
            | s    | b  | sj,jb |
 | 
			
		||||
            | s    | c  | sj,jc |
 | 
			
		||||
            | s    | d  | sj,jd |
 | 
			
		||||
            | s    | e  | sj,je |
 | 
			
		||||
            | s    | f  | sj,jf |
 | 
			
		||||
            | s    | a  | sj,ja,ja |
 | 
			
		||||
            | s    | b  | sj,jb,jb |
 | 
			
		||||
            | s    | c  | sj,jc,jc |
 | 
			
		||||
            | s    | d  | sj,jd,jd |
 | 
			
		||||
            | s    | e  | sj,je,je |
 | 
			
		||||
            | s    | f  | sj,jf,jf |
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user