Adapt snapping test to viaroute behaviour

This commit is contained in:
Patrick Niklaus 2015-12-10 17:37:41 +01:00
parent 4ddbd2efb6
commit 9bdc58069b
2 changed files with 37 additions and 17 deletions

View File

@ -16,7 +16,8 @@ Feature: osrm-extract command line options: help
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain 16 lines And stdout should contain "--small-component-size"
And stdout should contain 20 lines
And it should exit with code 0 And it should exit with code 0
Scenario: osrm-extract - Help, short Scenario: osrm-extract - Help, short
@ -31,7 +32,8 @@ Feature: osrm-extract command line options: help
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain 16 lines And stdout should contain "--small-component-size"
And stdout should contain 20 lines
And it should exit with code 0 And it should exit with code 0
Scenario: osrm-extract - Help, long Scenario: osrm-extract - Help, long
@ -46,5 +48,6 @@ Feature: osrm-extract command line options: help
And stdout should contain "--profile" And stdout should contain "--profile"
And stdout should contain "--threads" And stdout should contain "--threads"
And stdout should contain "--generate-edge-lookup" And stdout should contain "--generate-edge-lookup"
And stdout should contain 16 lines And stdout should contain "--small-component-size"
And stdout should contain 20 lines
And it should exit with code 0 And it should exit with code 0

View File

@ -136,15 +136,12 @@ Feature: Basic Distance Matrix
| a | 100 | 200 | 300 | | a | 100 | 200 | 300 |
| b | 0 | 100 | 200 | | b | 0 | 100 | 200 |
# There is a 1100m limit when searching for nearest neighbours Scenario: Testbog - All coordinates are from same small component
# so we set the grid size to something that makes it easy to
# put nodes inside/outside that limit
Scenario: Testbog - Check snapping on on small components
Given a grid size of 300 meters Given a grid size of 300 meters
Given the extract extra arguments "--small-component-size 4" Given the extract extra arguments "--small-component-size 4"
Given the node map Given the node map
| a | b | | | m | | x | | a | b | | f |
| d | e | | | n | | y | | d | e | | g |
And the ways And the ways
| nodes | | nodes |
@ -152,13 +149,33 @@ Feature: Basic Distance Matrix
| be | | be |
| ed | | ed |
| da | | da |
| xy | | fg |
When I request a travel time matrix I should get When I request a travel time matrix I should get
| | a | b | x | y | m | n | | | f | g |
| a | 0 | 300 | | | 300 | 600 | | f | 0 | 300 |
| b | 300 | 0 | | | 0 | 300 | | g | 300 | 0 |
| x | | | 0 | 300 | | |
| y | | | 300 | 0 | | | Scenario: Testbog - Coordinates are from different small component and snap to big CC
| m | 300 | 0 | | | 0 | 300 | Given a grid size of 300 meters
| n | 600 | 300 | | | 300 | 0 | Given the extract extra arguments "--small-component-size 4"
Given the node map
| a | b | | f | h |
| d | e | | g | i |
And the ways
| nodes |
| ab |
| be |
| ed |
| da |
| fg |
| hi |
When I request a travel time matrix I should get
| | f | g | h | i |
| f | 0 | 300 | 0 | 300 |
| g | 300 | 0 | 300 | 0 |
| h | 0 | 300 | 0 | 300 |
| i | 300 | 0 | 300 | 0 |