Adapt test cases to output of way points
- waypoints are now announced in the route guidance - implements #584
This commit is contained in:
		
							parent
							
								
									d54a55c12b
								
							
						
					
					
						commit
						5add28410f
					
				@ -74,5 +74,5 @@ Feature: Avoid weird loops caused by rounding errors
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route             | turns                                      |
 | 
					            | waypoints | route             | turns                                      |
 | 
				
			||||||
            | a,2,d     | ab,be,ef,cf,cd | head,left,right,right,left,destination |
 | 
					            | a,2,d     | ab,be,ef,ef,cf,cd | head,left,right,via,right,left,destination |
 | 
				
			||||||
            | a,1,d     | ab,be,ef,cf,cd | head,left,right,right,left,destination |
 | 
					            | a,1,d     | ab,be,ef,ef,cf,cd | head,left,right,via,right,left,destination |
 | 
				
			||||||
 | 
				
			|||||||
@ -21,7 +21,7 @@ Feature: U-turns at via points
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route             | turns                                          |
 | 
					            | waypoints | route             | turns                                          |
 | 
				
			||||||
            | a,e,c     | ab,be,ef,fg,dg,cd | head,right,left,straight,left,left,destination |
 | 
					            | a,e,c     | ab,be,be,ef,fg,dg,cd | head,right,via,left,straight,left,left,destination |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    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
 | 
				
			||||||
@ -43,7 +43,7 @@ Feature: U-turns at via points
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route       |
 | 
					            | waypoints | route       |
 | 
				
			||||||
            | a,e,c     | ab,be,bc |
 | 
					            | a,e,c     | ab,be,be,bc |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @todo
 | 
					    @todo
 | 
				
			||||||
    Scenario: Instructions at via points at u-turns
 | 
					    Scenario: Instructions at via points at u-turns
 | 
				
			||||||
 | 
				
			|||||||
@ -14,8 +14,8 @@ Feature: Via points
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route   |
 | 
					            | waypoints | route   |
 | 
				
			||||||
            | a,b,c     | abc   |
 | 
					            | a,b,c     | abc,abc |
 | 
				
			||||||
            | c,b,a     | abc   |
 | 
					            | c,b,a     | abc,abc |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Via point at a dead end
 | 
					    Scenario: Via point at a dead end
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
@ -29,8 +29,8 @@ Feature: Via points
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route            |
 | 
					            | waypoints | route            |
 | 
				
			||||||
            | a,d,c     | abc,bd,bd,abc |
 | 
					            | a,d,c     | abc,bd,bd,bd,abc |
 | 
				
			||||||
            | c,d,a     | abc,bd,bd,abc |
 | 
					            | c,d,a     | abc,bd,bd,bd,abc |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Multiple via points
 | 
					    Scenario: Multiple via points
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
@ -49,8 +49,8 @@ Feature: Via points
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | waypoints | route                    |
 | 
					            | waypoints | route                    |
 | 
				
			||||||
            | a,c,f     | ab,bcd,de,efg    |
 | 
					            | a,c,f     | ab,bcd,bcd,de,efg        |
 | 
				
			||||||
            | a,c,f,h   | ab,bcd,de,efg,gh |
 | 
					            | a,c,f,h   | ab,bcd,bcd,de,efg,efg,gh |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    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
 | 
				
			||||||
@ -73,9 +73,9 @@ Feature: Via points
 | 
				
			|||||||
            | 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 | head,straight,straight,destination                                  |
 | 
				
			||||||
            | 3,1       | cd,de,ef,fa,ab             | 1000m +-1 | head,right,right,right,right,destination                            |
 | 
					            | 3,1       | cd,de,ef,fa,ab             | 1000m +-1 | head,right,right,right,right,destination                            |
 | 
				
			||||||
            | 1,2,3     | ab,bc,cd                   |  400m +-1 | head,straight,straight,destination                                  |
 | 
					            | 1,2,3     | ab,bc,bc,cd                |  400m +-1 | head,straight,via,straight,destination                              |
 | 
				
			||||||
            | 1,3,2     | ab,bc,cd,de,ef,fa,ab,bc    | 1600m +-1 | head,straight,straight,right,right,right,right,straight,destination |
 | 
					            | 1,3,2     | ab,bc,cd,cd,de,ef,fa,ab,bc | 1600m +-1 | head,straight,straight,via,right,right,right,right,straight,destination |
 | 
				
			||||||
            | 3,2,1     | cd,de,ef,fa,ab,bc,cd,de,ef,fa,ab | 2400m +-1 | head,right,right,right,right,straight,straight,right,right,right,right,destination |
 | 
					            | 3,2,1     | cd,de,ef,fa,ab,bc,bc,cd,de,ef,fa,ab | 2400m +-1 | head,right,right,right,right,straight,via,straight,right,right,right,right,destination |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @bug
 | 
					    @bug
 | 
				
			||||||
    Scenario: Via points on ring on the same oneway
 | 
					    Scenario: Via points on ring on the same oneway
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user