Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM into develop
This commit is contained in:
commit
c6dc476704
77
features/bicycle/cycleway.feature
Normal file
77
features/bicycle/cycleway.feature
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
@routing @bicycle @cycleway
|
||||||
|
Feature: Bike - Cycle tracks/lanes
|
||||||
|
Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway
|
||||||
|
|
||||||
|
Background:
|
||||||
|
Given the speedprofile "bicycle"
|
||||||
|
|
||||||
|
Scenario: Bike - Cycle tracks/lanes should enable biking
|
||||||
|
Then routability should be
|
||||||
|
| highway | cycleway | bothw |
|
||||||
|
| motorway | | |
|
||||||
|
| motorway | track | x |
|
||||||
|
| motorway | lane | x |
|
||||||
|
| motorway | shared | x |
|
||||||
|
| motorway | share_busway | x |
|
||||||
|
| motorway | sharrow | x |
|
||||||
|
| some_tag | track | x |
|
||||||
|
| some_tag | lane | x |
|
||||||
|
| some_tag | shared | x |
|
||||||
|
| some_tag | share_busway | x |
|
||||||
|
| some_tag | sharrow | x |
|
||||||
|
| residential | track | x |
|
||||||
|
| residential | lane | x |
|
||||||
|
| residential | shared | x |
|
||||||
|
| residential | share_busway | x |
|
||||||
|
| residential | sharrow | x |
|
||||||
|
|
||||||
|
Scenario: Bike - Left/right side cycleways
|
||||||
|
Then routability should be
|
||||||
|
| highway | cycleway | cycleway:left | cycleway:right | forw | backw |
|
||||||
|
| primary | | | | x | x |
|
||||||
|
| motorway | | | | | |
|
||||||
|
| motorway | track | | | x | x |
|
||||||
|
| motorway | lane | | | x | x |
|
||||||
|
| motorway | oppposite | | | | x |
|
||||||
|
| motorway | opposite_track | | | | x |
|
||||||
|
| motorway | opposite_lane | | | | x |
|
||||||
|
| motorway | | track | | | x |
|
||||||
|
| motorway | | lane | | | x |
|
||||||
|
| motorway | | opposite_track | | x | |
|
||||||
|
| motorway | | opposite_lane | | x | |
|
||||||
|
| motorway | | | track | x | |
|
||||||
|
| motorway | | | lane | x | |
|
||||||
|
| motorway | | | opposite_track | | x |
|
||||||
|
| motorway | | | opposite_lane | | x |
|
||||||
|
| motorway | | track | track | x | x |
|
||||||
|
| motorway | | lane | lane | x | x |
|
||||||
|
| motorway | | opposite_track | opposite_track | x | x |
|
||||||
|
| motorway | | opposite_lane | opposite_lane | x | x |
|
||||||
|
| motorway | | track | opposite_track | | x |
|
||||||
|
| motorway | | lane | opposite_lane | | x |
|
||||||
|
| motorway | | opposite_track | track | x | |
|
||||||
|
| motorway | | opposite_lane | lane | x | |
|
||||||
|
|
||||||
|
Scenario: Bike - Invalid cycleway tags
|
||||||
|
Then routability should be
|
||||||
|
| highway | cycleway | bothw |
|
||||||
|
| primary | | x |
|
||||||
|
| primary | yes | x |
|
||||||
|
| primary | no | x |
|
||||||
|
| primary | some_track | x |
|
||||||
|
| motorway | | |
|
||||||
|
| motorway | yes | |
|
||||||
|
| motorway | no | |
|
||||||
|
| motorway | some_track | |
|
||||||
|
|
||||||
|
Scenario: Bike - Access tags should overwrite cycleway access
|
||||||
|
Then routability should be
|
||||||
|
| highway | cycleway | access | bothw |
|
||||||
|
| motorway | track | no | |
|
||||||
|
| residential | track | no | |
|
||||||
|
| footway | track | no | |
|
||||||
|
| cycleway | track | no | |
|
||||||
|
| motorway | lane | yes | x |
|
||||||
|
| residential | lane | yes | x |
|
||||||
|
| footway | lane | yes | x |
|
||||||
|
| cycleway | lane | yes | x |
|
@ -32,7 +32,7 @@ Reference: http://wiki.openstreetmap.org/wiki/Key:access
|
|||||||
|
|
||||||
Scenario: Car - Access tag hierachy on nodes
|
Scenario: Car - Access tag hierachy on nodes
|
||||||
Then routability should be
|
Then routability should be
|
||||||
| node/access | node/vehicle | node/motor_vehicle | mnode/otorcar | bothw |
|
| node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
|
||||||
| | | | | x |
|
| | | | | x |
|
||||||
| yes | | | | x |
|
| yes | | | | x |
|
||||||
| no | | | | |
|
| no | | | | |
|
||||||
|
@ -6,19 +6,21 @@ Feature: Choosing route based on length, speed, etc
|
|||||||
|
|
||||||
Scenario: Pick the geometrically shortest route, way types being equal
|
Scenario: Pick the geometrically shortest route, way types being equal
|
||||||
Given the node map
|
Given the node map
|
||||||
| | s | |
|
| | | s | | |
|
||||||
| | t | |
|
| | | t | | |
|
||||||
| a | | b |
|
| x | a | | b | y |
|
||||||
|
|
||||||
And the ways
|
And the ways
|
||||||
| nodes | highway |
|
| nodes | highway |
|
||||||
|
| xa | primary |
|
||||||
|
| by | primary |
|
||||||
| atb | primary |
|
| atb | primary |
|
||||||
| asb | primary |
|
| asb | primary |
|
||||||
|
|
||||||
When I route I should get
|
When I route I should get
|
||||||
| from | to | route |
|
| from | to | route |
|
||||||
| a | b | atb |
|
| x | y | xa,atb,by |
|
||||||
| b | a | atb |
|
| y | x | by,atb,xa |
|
||||||
|
|
||||||
Scenario: Pick the shortest travel time, even when it's longer
|
Scenario: Pick the shortest travel time, even when it's longer
|
||||||
Given the node map
|
Given the node map
|
||||||
@ -34,4 +36,3 @@ Feature: Choosing route based on length, speed, etc
|
|||||||
| from | to | route |
|
| from | to | route |
|
||||||
| a | b | apb |
|
| a | b | apb |
|
||||||
| b | a | apb |
|
| b | a | apb |
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user