Add missing arrive instructions to time tests.
This commit is contained in:
		
							parent
							
								
									52af0a615d
								
							
						
					
					
						commit
						0a12aab97b
					
				@ -27,15 +27,15 @@ Feature: Estimation of travel time
 | 
			
		||||
            | xh    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time   |
 | 
			
		||||
            | x    | a  | xa    | 1s +-1 |
 | 
			
		||||
            | x    | b  | xb    | 1s +-1 |
 | 
			
		||||
            | x    | c  | xc    | 1s +-1 |
 | 
			
		||||
            | x    | d  | xd    | 1s +-1 |
 | 
			
		||||
            | x    | e  | xe    | 1s +-1 |
 | 
			
		||||
            | x    | f  | xf    | 1s +-1 |
 | 
			
		||||
            | x    | g  | xg    | 1s +-1 |
 | 
			
		||||
            | x    | h  | xh    | 1s +-1 |
 | 
			
		||||
            | from | to | route    | time   |
 | 
			
		||||
            | x    | a  | xa,xa    | 1s +-1 |
 | 
			
		||||
            | x    | b  | xb,xb    | 1s +-1 |
 | 
			
		||||
            | x    | c  | xc,xc    | 1s +-1 |
 | 
			
		||||
            | x    | d  | xd,xd    | 1s +-1 |
 | 
			
		||||
            | x    | e  | xe,xe    | 1s +-1 |
 | 
			
		||||
            | x    | f  | xf,xf    | 1s +-1 |
 | 
			
		||||
            | x    | g  | xg,xg    | 1s +-1 |
 | 
			
		||||
            | x    | h  | xh,xh    | 1s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Basic travel time, 100m scale
 | 
			
		||||
        Given a grid size of 100 meters
 | 
			
		||||
@ -56,15 +56,15 @@ Feature: Estimation of travel time
 | 
			
		||||
            | xh    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time    |
 | 
			
		||||
            | x    | a  | xa    | 10s +-1 |
 | 
			
		||||
            | x    | b  | xb    | 14s +-1 |
 | 
			
		||||
            | x    | c  | xc    | 10s +-1 |
 | 
			
		||||
            | x    | d  | xd    | 14s +-1 |
 | 
			
		||||
            | x    | e  | xe    | 10s +-1 |
 | 
			
		||||
            | x    | f  | xf    | 14s +-1 |
 | 
			
		||||
            | x    | g  | xg    | 10s +-1 |
 | 
			
		||||
            | x    | h  | xh    | 14s +-1 |
 | 
			
		||||
            | from | to | route    | time    |
 | 
			
		||||
            | x    | a  | xa,xa    | 10s +-1 |
 | 
			
		||||
            | x    | b  | xb,xb    | 14s +-1 |
 | 
			
		||||
            | x    | c  | xc,xc    | 10s +-1 |
 | 
			
		||||
            | x    | d  | xd,xd    | 14s +-1 |
 | 
			
		||||
            | x    | e  | xe,xe    | 10s +-1 |
 | 
			
		||||
            | x    | f  | xf,xf    | 14s +-1 |
 | 
			
		||||
            | x    | g  | xg,xg    | 10s +-1 |
 | 
			
		||||
            | x    | h  | xh,xh    | 14s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Basic travel time, 1km scale
 | 
			
		||||
        Given a grid size of 1000 meters
 | 
			
		||||
@ -85,15 +85,15 @@ Feature: Estimation of travel time
 | 
			
		||||
            | xh    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time     |
 | 
			
		||||
            | x    | a  | xa    | 100s +-1 |
 | 
			
		||||
            | x    | b  | xb    | 141s +-1 |
 | 
			
		||||
            | x    | c  | xc    | 100s +-1 |
 | 
			
		||||
            | x    | d  | xd    | 141s +-1 |
 | 
			
		||||
            | x    | e  | xe    | 100s +-1 |
 | 
			
		||||
            | x    | f  | xf    | 141s +-1 |
 | 
			
		||||
            | x    | g  | xg    | 100s +-1 |
 | 
			
		||||
            | x    | h  | xh    | 141s +-1 |
 | 
			
		||||
            | from | to | route    | time     |
 | 
			
		||||
            | x    | a  | xa,xa    | 100s +-1 |
 | 
			
		||||
            | x    | b  | xb,xb    | 141s +-1 |
 | 
			
		||||
            | x    | c  | xc,xc    | 100s +-1 |
 | 
			
		||||
            | x    | d  | xd,xd    | 141s +-1 |
 | 
			
		||||
            | x    | e  | xe,xe    | 100s +-1 |
 | 
			
		||||
            | x    | f  | xf,xf    | 141s +-1 |
 | 
			
		||||
            | x    | g  | xg,xg    | 100s +-1 |
 | 
			
		||||
            | x    | h  | xh,xh    | 141s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Basic travel time, 10km scale
 | 
			
		||||
        Given a grid size of 10000 meters
 | 
			
		||||
@ -114,15 +114,15 @@ Feature: Estimation of travel time
 | 
			
		||||
            | xh    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time      |
 | 
			
		||||
            | x    | a  | xa    | 1000s +-1 |
 | 
			
		||||
            | x    | b  | xb    | 1414s +-1 |
 | 
			
		||||
            | x    | c  | xc    | 1000s +-1 |
 | 
			
		||||
            | x    | d  | xd    | 1414s +-1 |
 | 
			
		||||
            | x    | e  | xe    | 1000s +-1 |
 | 
			
		||||
            | x    | f  | xf    | 1414s +-1 |
 | 
			
		||||
            | x    | g  | xg    | 1000s +-1 |
 | 
			
		||||
            | x    | h  | xh    | 1414s +-1 |
 | 
			
		||||
            | from | to | route    | time      |
 | 
			
		||||
            | x    | a  | xa,xa    | 1000s +-1 |
 | 
			
		||||
            | x    | b  | xb,xb    | 1414s +-1 |
 | 
			
		||||
            | x    | c  | xc,xc    | 1000s +-1 |
 | 
			
		||||
            | x    | d  | xd,xd    | 1414s +-1 |
 | 
			
		||||
            | x    | e  | xe,xe    | 1000s +-1 |
 | 
			
		||||
            | x    | f  | xf,xf    | 1414s +-1 |
 | 
			
		||||
            | x    | g  | xg,xg    | 1000s +-1 |
 | 
			
		||||
            | x    | h  | xh,xh    | 1414s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Time of travel depending on way type
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -138,10 +138,10 @@ Feature: Estimation of travel time
 | 
			
		||||
            | ace   | something |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time    |
 | 
			
		||||
            | a    | b  | ab    | 10s +-1 |
 | 
			
		||||
            | c    | d  | cd    | 20s +-1 |
 | 
			
		||||
            | e    | f  | ef    | 30s +-1 |
 | 
			
		||||
            | from | to | route    | time    |
 | 
			
		||||
            | a    | b  | ab,ab    | 10s +-1 |
 | 
			
		||||
            | c    | d  | cd,cd    | 20s +-1 |
 | 
			
		||||
            | e    | f  | ef,ef    | 30s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Time of travel on a series of ways
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -155,10 +155,10 @@ Feature: Estimation of travel time
 | 
			
		||||
            | cd    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    | time    |
 | 
			
		||||
            | a    | b  | ab       | 10s +-1 |
 | 
			
		||||
            | a    | c  | ab,bc    | 20s +-1 |
 | 
			
		||||
            | a    | d  | ab,bc,cd | 30s +-1 |
 | 
			
		||||
            | from | to | route       | time    |
 | 
			
		||||
            | a    | b  | ab,ab       | 10s +-1 |
 | 
			
		||||
            | a    | c  | ab,bc,bc    | 20s +-1 |
 | 
			
		||||
            | a    | d  | ab,bc,cd,cd | 30s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Time of travel on a winding way
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -171,10 +171,10 @@ Feature: Estimation of travel time
 | 
			
		||||
            | abcdefghi | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route     | time    |
 | 
			
		||||
            | a    | b  | abcdefghi | 10s +-1 |
 | 
			
		||||
            | a    | e  | abcdefghi | 40s +-1 |
 | 
			
		||||
            | a    | i  | abcdefghi | 80s +-1 |
 | 
			
		||||
            | from | to | route               | time    |
 | 
			
		||||
            | a    | b  | abcdefghi,abcdefghi | 10s +-1 |
 | 
			
		||||
            | a    | e  | abcdefghi,abcdefghi | 40s +-1 |
 | 
			
		||||
            | a    | i  | abcdefghi,abcdefghi | 80s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Time of travel on combination of road types
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -188,11 +188,11 @@ Feature: Estimation of travel time
 | 
			
		||||
            | cde   | tertiary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route   | time    |
 | 
			
		||||
            | b    | c  | abc     | 10s +-1 |
 | 
			
		||||
            | c    | e  | cde     | 60s +-1 |
 | 
			
		||||
            | b    | d  | abc,cde | 40s +-1 |
 | 
			
		||||
            | a    | e  | abc,cde | 80s +-1 |
 | 
			
		||||
            | from | to | route       | time    |
 | 
			
		||||
            | b    | c  | abc,abc     | 10s +-1 |
 | 
			
		||||
            | c    | e  | cde,cde     | 60s +-1 |
 | 
			
		||||
            | b    | d  | abc,cde,cde | 40s +-1 |
 | 
			
		||||
            | a    | e  | abc,cde,cde | 80s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Time of travel on part of a way
 | 
			
		||||
        Given the node map
 | 
			
		||||
@ -206,13 +206,13 @@ Feature: Estimation of travel time
 | 
			
		||||
            | ab    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route | time    |
 | 
			
		||||
            | 1    | 2  | ab    | 10s +-1 |
 | 
			
		||||
            | 1    | 3  | ab    | 20s +-1 |
 | 
			
		||||
            | 1    | 4  | ab    | 30s +-1 |
 | 
			
		||||
            | 4    | 3  | ab    | 10s +-1 |
 | 
			
		||||
            | 4    | 2  | ab    | 20s +-1 |
 | 
			
		||||
            | 4    | 1  | ab    | 30s +-1 |
 | 
			
		||||
            | from | to | route    | time    |
 | 
			
		||||
            | 1    | 2  | ab,ab    | 10s +-1 |
 | 
			
		||||
            | 1    | 3  | ab,ab    | 20s +-1 |
 | 
			
		||||
            | 1    | 4  | ab,ab    | 30s +-1 |
 | 
			
		||||
            | 4    | 3  | ab,ab    | 10s +-1 |
 | 
			
		||||
            | 4    | 2  | ab,ab    | 20s +-1 |
 | 
			
		||||
            | 4    | 1  | ab,ab    | 30s +-1 |
 | 
			
		||||
 | 
			
		||||
    Scenario: Total travel time should match sum of times of individual ways
 | 
			
		||||
        Given a grid size of 1000 meters
 | 
			
		||||
@ -228,10 +228,10 @@ Feature: Estimation of travel time
 | 
			
		||||
            | cd    | primary |
 | 
			
		||||
 | 
			
		||||
        When I route I should get
 | 
			
		||||
            | from | to | route    | distances             | distance  | times              | time     |
 | 
			
		||||
            | a    | b  | ab       | 1000m +-1             | 1000m +-1 | 100s +-1           | 100s +-1 |
 | 
			
		||||
            | b    | c  | bc       | 2000m +-1             | 2000m +-1 | 200s +-1           | 200s +-1 |
 | 
			
		||||
            | c    | d  | cd       | 3000m +-1             | 3000m +-1 | 300s +-1           | 300s +-1 |
 | 
			
		||||
            | a    | c  | ab,bc    | 1000m,2000m +-1       | 3000m +-1 | 100s,200s +-1      | 300s +-1 |
 | 
			
		||||
            | b    | d  | bc,cd    | 2000m,3000m +-1       | 5000m +-1 | 200s,300s +-1      | 500s +-1 |
 | 
			
		||||
            | a    | d  | ab,bc,cd | 1000m,2000m,3000m +-1 | 6000m +-1 | 100s,200s,300s +-1 | 600s +-1 |
 | 
			
		||||
            | from | to | route       | distances             | distance  | times              | time     |
 | 
			
		||||
            | a    | b  | ab,ab       | 1000m +-1             | 1000m +-1 | 100s +-1           | 100s +-1 |
 | 
			
		||||
            | b    | c  | bc,bc       | 2000m +-1             | 2000m +-1 | 200s +-1           | 200s +-1 |
 | 
			
		||||
            | c    | d  | cd,cd       | 3000m +-1             | 3000m +-1 | 300s +-1           | 300s +-1 |
 | 
			
		||||
            | a    | c  | ab,bc,bc    | 1000m,2000m +-1       | 3000m +-1 | 100s,200s +-1      | 300s +-1 |
 | 
			
		||||
            | b    | d  | bc,cd,cd    | 2000m,3000m +-1       | 5000m +-1 | 200s,300s +-1      | 500s +-1 |
 | 
			
		||||
            | a    | d  | ab,bc,cd,cd | 1000m,2000m,3000m +-1 | 6000m +-1 | 100s,200s,300s +-1 | 600s +-1 |
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user