make link tests less brittle, no overlapping paths
This commit is contained in:
		
							parent
							
								
									1c19796e3e
								
							
						
					
					
						commit
						c7ee402b0e
					
				@ -9,110 +9,103 @@ Feature: Car - Speed on links
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    Scenario: Car - Use motorway_link when reasonable
 | 
					    Scenario: Car - Use motorway_link when reasonable
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
            |   |   |   |   | k | l |   |
 | 
					            |   |   | e |   |   |   | f |   |   |
 | 
				
			||||||
            |   | e | f |   |   |   |   |
 | 
					            | x | a | b |   |   |   | c | d | y |
 | 
				
			||||||
            |   |   |   |   |   |   |   |
 | 
					 | 
				
			||||||
            | a | g | h | b | m | n | c |
 | 
					 | 
				
			||||||
            |   | i | j |   | o | p |   |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        And the ways
 | 
					        And the ways
 | 
				
			||||||
            | nodes | highway       |
 | 
					            | nodes | highway       |
 | 
				
			||||||
            | ag     | motorway      |
 | 
					            | xa    | unclassified  |
 | 
				
			||||||
            | hcm    | motorway      |
 | 
					            | ab    | motorway_link |
 | 
				
			||||||
            | nb     | motorway      |
 | 
					            | bc    | motorway_link |
 | 
				
			||||||
            | gefh   | motorway      |
 | 
					            | cd    | motorway_link |
 | 
				
			||||||
            | mkln   | motorway      |
 | 
					            | ae    | motorway      |
 | 
				
			||||||
            | gijh   | motorway_link |
 | 
					            | ef    | motorway      |
 | 
				
			||||||
            | mopn   | motorway_link |
 | 
					            | fd    | motorway      |
 | 
				
			||||||
 | 
					            | dy    | unclassified  |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route          |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | a    | b  | ag,gefh,hcm,mopn,nb |
 | 
					            | x    | y  | xa,ae,ef,fd,dy |
 | 
				
			||||||
 | 
					            | b    | c  | bc             |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Car - Use trunk_link when reasonable
 | 
					    Scenario: Car - Use trunk_link when reasonable
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
            |   |   |   |   | k | l |   |
 | 
					            |   |   | e |   |   |   | f |   |   |
 | 
				
			||||||
            |   | e | f |   |   |   |   |
 | 
					            | x | a | b |   |   |   | c | d | y |
 | 
				
			||||||
            |   |   |   |   |   |   |   |
 | 
					 | 
				
			||||||
            | a | g | h | b | m | n | c |
 | 
					 | 
				
			||||||
            |   | i | j |   | o | p |   |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        And the ways
 | 
					        And the ways
 | 
				
			||||||
            | nodes | highway      |
 | 
					            | nodes | highway      |
 | 
				
			||||||
            | ag     | trunk      |
 | 
					            | xa    | unclassified |
 | 
				
			||||||
            | hcm    | trunk      |
 | 
					            | ab    | trunk_link   |
 | 
				
			||||||
            | nb     | trunk      |
 | 
					            | bc    | trunk_link   |
 | 
				
			||||||
            | gefh   | trunk      |
 | 
					            | cd    | trunk_link   |
 | 
				
			||||||
            | mkln   | trunk      |
 | 
					            | ae    | trunk        |
 | 
				
			||||||
            | gijh   | trunk_link |
 | 
					            | ef    | trunk        |
 | 
				
			||||||
            | mopn   | trunk_link |
 | 
					            | fd    | trunk        |
 | 
				
			||||||
 | 
					            | dy    | unclassified |
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route          |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | a    | b  | ag,gefh,hcm,mopn,nb |
 | 
					            | x    | y  | xa,ae,ef,fd,dy |
 | 
				
			||||||
 | 
					            | b    | c  | bc             |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Car - Use primary_link when reasonable
 | 
					    Scenario: Car - Use primary_link when reasonable
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
            |   |   |   |   | k | l |   |
 | 
					            |   |   | e |   |   |   | f |   |   |
 | 
				
			||||||
            |   | e | f |   |   |   |   |
 | 
					            | x | a | b |   |   |   | c | d | y |
 | 
				
			||||||
            |   |   |   |   |   |   |   |
 | 
					 | 
				
			||||||
            | a | g | h | b | m | n | c |
 | 
					 | 
				
			||||||
            |   | i | j |   | o | p |   |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        And the ways
 | 
					        And the ways
 | 
				
			||||||
            | nodes | highway        |
 | 
					            | nodes | highway        |
 | 
				
			||||||
            | ag     | primary      |
 | 
					            | xa    | unclassified   |
 | 
				
			||||||
            | hcm    | primary      |
 | 
					            | ab    | primary_link   |
 | 
				
			||||||
            | nb     | primary      |
 | 
					            | bc    | primary_link   |
 | 
				
			||||||
            | gefh   | primary      |
 | 
					            | cd    | primary_link   |
 | 
				
			||||||
            | mkln   | primary      |
 | 
					            | ae    | primary        |
 | 
				
			||||||
            | gijh   | primary_link |
 | 
					            | ef    | primary        |
 | 
				
			||||||
            | mopn   | primary_link |
 | 
					            | fd    | primary        |
 | 
				
			||||||
 | 
					            | dy    | unclassified |
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route          |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | a    | b  | ag,gefh,hcm,mopn,nb |
 | 
					            | x    | y  | xa,ae,ef,fd,dy |
 | 
				
			||||||
 | 
					            | b    | c  | bc             |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Car - Use secondary_link when reasonable
 | 
					    Scenario: Car - Use secondary_link when reasonable
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
            |   |   |   |   | k | l |   |
 | 
					            |   |   | e |   |   |   | f |   |   |
 | 
				
			||||||
            |   | e | f |   |   |   |   |
 | 
					            | x | a | b |   |   |   | c | d | y |
 | 
				
			||||||
            |   |   |   |   |   |   |   |
 | 
					 | 
				
			||||||
            | a | g | h | b | m | n | c |
 | 
					 | 
				
			||||||
            |   | i | j |   | o | p |   |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        And the ways
 | 
					        And the ways
 | 
				
			||||||
            | nodes | highway          |
 | 
					            | nodes | highway          |
 | 
				
			||||||
            | ag     | secondary      |
 | 
					            | xa    | unclassified     |
 | 
				
			||||||
            | hcm    | secondary      |
 | 
					            | ab    | secondary_link   |
 | 
				
			||||||
            | nb     | secondary      |
 | 
					            | bc    | secondary_link   |
 | 
				
			||||||
            | gefh   | secondary      |
 | 
					            | cd    | secondary_link   |
 | 
				
			||||||
            | mkln   | secondary      |
 | 
					            | ae    | secondary        |
 | 
				
			||||||
            | gijh   | secondary_link |
 | 
					            | ef    | secondary        |
 | 
				
			||||||
            | mopn   | secondary_link |
 | 
					            | fd    | secondary        |
 | 
				
			||||||
 | 
					            | dy    | unclassified     |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route          |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | a    | b  | ag,gefh,hcm,mopn,nb |
 | 
					            | x    | y  | xa,ae,ef,fd,dy |
 | 
				
			||||||
 | 
					            | b    | c  | bc             |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Scenario: Car - Use tertiary_link when reasonable
 | 
					    Scenario: Car - Use tertiary_link when reasonable
 | 
				
			||||||
        Given the node map
 | 
					        Given the node map
 | 
				
			||||||
            |   |   |   |   | k | l |   |
 | 
					            |   |   | e |   |   |   | f |   |   |
 | 
				
			||||||
            |   | e | f |   |   |   |   |
 | 
					            | x | a | b |   |   |   | c | d | y |
 | 
				
			||||||
            |   |   |   |   |   |   |   |
 | 
					 | 
				
			||||||
            | a | g | h | b | m | n | c |
 | 
					 | 
				
			||||||
            |   | i | j |   | o | p |   |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        And the ways
 | 
					        And the ways
 | 
				
			||||||
            | nodes | highway         |
 | 
					            | nodes | highway         |
 | 
				
			||||||
            | ag     | tertiary      |
 | 
					            | xa    | unclassified    |
 | 
				
			||||||
            | hcm    | tertiary      |
 | 
					            | ab    | tertiary_link   |
 | 
				
			||||||
            | nb     | tertiary      |
 | 
					            | bc    | tertiary_link   |
 | 
				
			||||||
            | gefh   | tertiary      |
 | 
					            | cd    | tertiary_link   |
 | 
				
			||||||
            | mkln   | tertiary      |
 | 
					            | ae    | tertiary        |
 | 
				
			||||||
            | gijh   | tertiary_link |
 | 
					            | ef    | tertiary        |
 | 
				
			||||||
            | mopn   | tertiary_link |
 | 
					            | fd    | tertiary        |
 | 
				
			||||||
 | 
					            | dy    | unclassified    |
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        When I route I should get
 | 
					        When I route I should get
 | 
				
			||||||
            | from | to | route          |
 | 
					            | from | to | route          |
 | 
				
			||||||
            | a    | b  | ag,gefh,hcm,mopn,nb |
 | 
					            | x    | y  | xa,ae,ef,fd,dy |
 | 
				
			||||||
 | 
					            | b    | c  | bc             |
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user