Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM into develop
This commit is contained in:
		
						commit
						fcd63bf9eb
					
				| @ -1,6 +1,8 @@ | ||||
| # config/cucumber.yml | ||||
| ##YAML Template | ||||
| --- | ||||
| default: --require features --tags ~@todo --tag ~@stress | ||||
| verify: --require features --tags ~@todo --tag ~@stress -f progress | ||||
| default: --require features --tags ~@todo --tags ~@bug --tag ~@stress | ||||
| verify: --require features --tags ~@todo --tags ~@bug --tag ~@stress -f progress | ||||
| bugs: --require features --tags @bug | ||||
| todo: --require features --tags @todo | ||||
| all: --require features | ||||
| @ -31,19 +31,3 @@ Feature: Bike - Street names in instructions | ||||
|         When I route I should get | ||||
|             | from | to | route                              | | ||||
|             | a    | d  | {highway:cycleway},{highway:track} | | ||||
| 
 | ||||
|     @area @names @todo | ||||
|     Scenario: Bike - name on streets overlapping an area | ||||
|         Given the node map | ||||
|             | x | a | b | y | | ||||
|             |   | d | c |   | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | highway     | area | | ||||
|             | xaby  | residential |      | | ||||
|             | abcda | residential | yes  | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route | | ||||
|             | x    | y  | xaby  | | ||||
|             | y    | x  | xaby  | | ||||
|  | ||||
| @ -1,10 +1,9 @@ | ||||
| @routing @maxspeed @foot | ||||
| @routing @foot @maxspeed | ||||
| Feature: Foot - Ignore max speed restrictions | ||||
| 
 | ||||
| Background: Use specific speeds | ||||
|     Given the profile "foot" | ||||
| 
 | ||||
|     @todo | ||||
|     Scenario: Foot - Ignore maxspeed | ||||
|         Then routability should be | ||||
|             | highway     | maxspeed  | bothw     | | ||||
|  | ||||
| @ -233,3 +233,21 @@ Feature: Basic Routing | ||||
|             | d    | a  | abcd  | | ||||
|             | a    | m  | aeim  | | ||||
|             | m    | a  | aeim  | | ||||
|      | ||||
|     Scenario: Testbot - Triangle challenge | ||||
|         Given the node map | ||||
|             |   |   |   | d | | ||||
|             | a | b | c |   | | ||||
|             |   |   |   | e | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | highway | oneway | | ||||
|             | abc   | primary |        | | ||||
|             | cd    | primary | yes    | | ||||
|             | ce    | river   |        | | ||||
|             | de    | primary |        | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route | | ||||
|             | d    | c  | de,ce | | ||||
|             | e    | d  | de    | | ||||
|  | ||||
| @ -1,23 +0,0 @@ | ||||
| @routing @testbot @bug @todo | ||||
| Feature: Testbot - Things that looks like bugs | ||||
| 
 | ||||
|     Background: | ||||
|         Given the profile "testbot" | ||||
| 
 | ||||
|     Scenario: Testbot - Triangle problem | ||||
|         Given the node map | ||||
|             |   |   |   | d | | ||||
|             | a | b | c |   | | ||||
|             |   |   |   | e | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | highway | oneway | | ||||
|             | abc   | primary |        | | ||||
|             | cd    | primary | yes    | | ||||
|             | ce    | river   |        | | ||||
|             | de    | primary |        | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route | | ||||
|             | d    | c  | de,ce | | ||||
|             | e    | d  | de    | | ||||
| @ -1,5 +1,5 @@ | ||||
| @routing @weird @todo | ||||
| Feature: Weird routings discovered | ||||
| @routing @testbot @bug | ||||
| Feature: Known bugs | ||||
| 
 | ||||
|     Background: | ||||
|         Given the profile "testbot" | ||||
| @ -41,39 +41,23 @@ Feature: Weird routings discovered | ||||
|             | h    | g  | ha,ab,bc,cd,de,ef,fg | | ||||
|             | a    | h  | ab,bc,cd,de,ef,fg,gh | | ||||
| 
 | ||||
|     Scenario: Routing on a oneway roundabout | ||||
|         Given the node map | ||||
|             |   | d | c |   | | ||||
|             | e |   |   | b | | ||||
|             | f |   |   | a | | ||||
|             |   | g | h |   | | ||||
|     @726 | ||||
|     Scenario: Weird looping, manual input | ||||
|         Given the node locations | ||||
|             | node | lat       | lon       | | ||||
|             | a    | 55.660778 | 12.573909 | | ||||
|             | b    | 55.660672 | 12.573693 | | ||||
|             | c    | 55.660128 | 12.572546 | | ||||
|             | d    | 55.660015 | 12.572476 | | ||||
|             | e    | 55.660119 | 12.572325 | | ||||
|             | x    | 55.660818 | 12.574051 | | ||||
|             | y    | 55.660073 | 12.574067 | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | oneway | | ||||
|             | ab    | yes    | | ||||
|             | bc    | yes    | | ||||
|             | cd    | yes    | | ||||
|             | de    | yes    | | ||||
|             | ef    | yes    | | ||||
|             | fg    | yes    | | ||||
|             | gh    | yes    | | ||||
|             | ha    | yes    | | ||||
|             | nodes | | ||||
|             | abc   | | ||||
|             | cdec  | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route                | | ||||
|             | a    | b  | ab                   | | ||||
|             | b    | c  | bc                   | | ||||
|             | c    | d  | cd                   | | ||||
|             | d    | e  | de                   | | ||||
|             | e    | f  | ef                   | | ||||
|             | f    | g  | fg                   | | ||||
|             | g    | h  | gh                   | | ||||
|             | h    | a  | ha                   | | ||||
|             | b    | a  | bc,cd,de,ef,fg,gh,ha | | ||||
|             | c    | b  | cd,de,ef,fg,gh,ha,ab | | ||||
|             | d    | c  | de,ef,fg,gh,ha,ab,bc | | ||||
|             | e    | d  | ef,fg,gh,ha,ab,bc,cd | | ||||
|             | f    | e  | fg,gh,ha,ab,bc,cd,de | | ||||
|             | g    | f  | gh,ha,ab,bc,cd,de,ef | | ||||
|             | h    | g  | ha,ab,bc,cd,de,ef,fg | | ||||
|             | a    | h  | ab,bc,cd,de,ef,fg,gh | | ||||
|             | from | to | route | turns            | | ||||
|             | x    | y  | abc   | head,destination | | ||||
							
								
								
									
										39
									
								
								features/testbot/overlap.feature
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								features/testbot/overlap.feature
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,39 @@ | ||||
| @routing @testbot @overlap | ||||
| Feature: Testbot - overlapping ways | ||||
|   | ||||
|     Background: | ||||
|         Given the profile "testbot" | ||||
| 
 | ||||
|     @bug @610 | ||||
|     Scenario: Testbot - multiple way between same nodes  | ||||
|     Note that cb is connecting the same two nodes as bc | ||||
|         Given the node map | ||||
|             | a | b | c | d | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | highway   | | ||||
|             | ab    | primary   | | ||||
|             | bc    | primary   | | ||||
|             | cd    | primary   | | ||||
|             | cb    | secondary | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route    | | ||||
|             | a    | d  | ab,bc,cd | | ||||
|             | d    | a  | cd,bc,ab | | ||||
|      | ||||
|     @bug @610 | ||||
|     Scenario: Testbot - area on top of way | ||||
|         Given the node map | ||||
|             | x | a | b | y | | ||||
|             |   | d | c |   | | ||||
| 
 | ||||
|         And the ways | ||||
|             | nodes | highway   | area | | ||||
|             | xaby  | primary   |      | | ||||
|             | abcda | secondary | yes  | | ||||
| 
 | ||||
|         When I route I should get | ||||
|             | from | to | route | | ||||
|             | x    | y  | xaby  | | ||||
|             | y    | x  | xaby  | | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user