Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

cucumber: change syntax of node maps

Browse Source
This commit is contained in:
Emil Tin
2016-09-30 09:33:08 +02:00
committed by Moritz Kobitzsch
parent d47d03c15b
commit 7cbb1807e7
112 changed files with 3926 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/car/advisory.feature
+15 -5
View File
@@ -8,7 +8,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Advisory speed overwrites maxspeed
Given the node map
| a | b | c |
"""
a b c
"""
And the ways
| nodes | highway | maxspeed | maxspeed:advisory |
@@ -22,7 +24,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Advisory speed overwrites forward maxspeed
Given the node map
| a | b | c |
"""
a b c
"""
And the ways
| nodes | highway | maxspeed:forward | maxspeed:advisory:forward |
@@ -36,7 +40,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c |
"""
a b c
"""
And the ways
| nodes | highway | maxspeed:backward | maxspeed:advisory:backward |
@@ -50,7 +56,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c | d |
"""
a b c d
"""
And the ways
| nodes | highway | maxspeed:backward | maxspeed:advisory:backward |
@@ -65,7 +73,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Directional advisory speeds play nice with eachother
Given the node map
| a | b | c |
"""
a b c
"""
And the ways
| nodes | highway | maxspeed:advisory | maxspeed:advisory:forward | maxspeed:advisory:backward |
features/car/bridge.feature
+10 -6
View File
@@ -6,9 +6,11 @@ Feature: Car - Handle driving
Scenario: Car - Use a ferry route
Given the node map
| a | b | c | | |
| | | d | | |
| | | e | f | g |
"""
a b c
d
e f g
"""
And the ways
| nodes | highway | bridge | bicycle |
@@ -29,9 +31,11 @@ Feature: Car - Handle driving
Scenario: Car - Properly handle durations
Given the node map
| a | b | c | | |
| | | d | | |
| | | e | f | g |
"""
a b c
d
e f g
"""
And the ways
| nodes | highway | bridge | duration |
features/car/destination.feature
+17 -11
View File
@@ -6,10 +6,12 @@ Feature: Car - Destination only, no passing through
Scenario: Car - Destination only street
Given the node map
| a | | | | e |
| | b | c | d | |
| | | | | |
| x | | | | y |
"""
a e
b c d
x y
"""
And the ways
| nodes | access |
@@ -31,10 +33,12 @@ Feature: Car - Destination only, no passing through
Scenario: Car - Destination only street
Given the node map
| a | | | | e |
| | b | c | d | |
| | | | | |
| x | | | | y |
"""
a e
b c d
x y
"""
And the ways
| nodes | access |
@@ -57,9 +61,11 @@ Feature: Car - Destination only, no passing through
Scenario: Car - Routing inside a destination only area
Given the node map
| a | | c | | e |
| | b | | d | |
| x | | | | y |
"""
a c e
b d
x y
"""
And the ways
| nodes | access |
features/car/ferry.feature
+15 -9
View File
@@ -6,9 +6,11 @@ Feature: Car - Handle ferry routes
Scenario: Car - Use a ferry route
Given the node map
| a | b | c | | |
| | | d | | |
| | | e | f | g |
"""
a b c
d
e f g
"""
And the ways
| nodes | highway | route | bicycle |
@@ -29,9 +31,11 @@ Feature: Car - Handle ferry routes
Scenario: Car - Properly handle simple durations
Given the node map
| a | b | c | | |
| | | d | | |
| | | e | f | g |
"""
a b c
d
e f g
"""
And the ways
| nodes | highway | route | duration |
@@ -48,9 +52,11 @@ Feature: Car - Handle ferry routes
Scenario: Car - Properly handle ISO 8601 durations
Given the node map
| a | b | c | | |
| | | d | | |
| | | e | f | g |
"""
a b c
d
e f g
"""
And the ways
| nodes | highway | route | duration |
features/car/link.feature
+20 -10
View File
@@ -9,8 +9,10 @@ Feature: Car - Speed on links
Scenario: Car - Use motorway_link when reasonable
Given the node map
| | | e | | | | f | | |
| x | a | b | | | | c | d | y |
"""
e f
x a b c d y
"""
And the ways
| nodes | highway |
@@ -30,8 +32,10 @@ Feature: Car - Speed on links
Scenario: Car - Use trunk_link when reasonable
Given the node map
| | | e | | | | f | | |
| x | a | b | | | | c | d | y |
"""
e f
x a b c d y
"""
And the ways
| nodes | highway |
@@ -50,8 +54,10 @@ Feature: Car - Speed on links
Scenario: Car - Use primary_link when reasonable
Given the node map
| | | e | | | | f | | |
| x | a | b | | | | c | d | y |
"""
e f
x a b c d y
"""
And the ways
| nodes | highway |
@@ -70,8 +76,10 @@ Feature: Car - Speed on links
Scenario: Car - Use secondary_link when reasonable
Given the node map
| | | e | | | | f | | |
| x | a | b | | | | c | d | y |
"""
e f
x a b c d y
"""
And the ways
| nodes | highway |
@@ -91,8 +99,10 @@ Feature: Car - Speed on links
Scenario: Car - Use tertiary_link when reasonable
Given the node map
| | | e | | | | f | | |
| x | a | b | | | | c | d | y |
"""
e f
x a b c d y
"""
And the ways
| nodes | highway |
features/car/maxspeed.feature
+6 -2
View File
@@ -8,7 +8,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Respect maxspeeds when lower that way type speed
Given the node map
| a | b | c | d | e | f | g |
"""
a b c d e f g
"""
And the ways
| nodes | highway | maxspeed |
@@ -30,7 +32,9 @@ OSRM will use 4/5 of the projected free-flow speed.
Scenario: Car - Do not ignore maxspeed when higher than way speed
Given the node map
| a | b | c | d |
"""
a b c d
"""
And the ways
| nodes | highway | maxspeed |
features/car/mode.feature
+7 -3
View File
@@ -5,8 +5,10 @@ Feature: Car - Mode flag
Scenario: Car - Mode when using a ferry
Given the node map
| a | b | |
| | c | d |
"""
a b
c d
"""
And the ways
| nodes | highway | route | duration |
@@ -25,7 +27,9 @@ Feature: Car - Mode flag
Scenario: Car - Snapping when using a ferry
Given the node map
| a | b | | c | d | | e | f |
"""
a b c d e f
"""
And the ways
| nodes | highway | route | duration |
features/car/names.feature
+29 -19
View File
@@ -6,8 +6,10 @@ Feature: Car - Street names in instructions
Scenario: Car - A named street
Given the node map
| a | b |
| | c |
"""
a b
c
"""
And the ways
| nodes | name | ref |
@@ -20,9 +22,11 @@ Feature: Car - Street names in instructions
Scenario: Car - A named street with pronunciation
Given the node map
| a | b | d |
| | 1 | |
| | c | |
"""
a b d
1
c
"""
And the ways
| nodes | name |name:pronunciation | ref |
@@ -38,9 +42,11 @@ Feature: Car - Street names in instructions
# See #2860
Scenario: Car - same street name but different pronunciation
Given the node map
| a | b | c |
| | d | |
| | e | |
"""
a b c
d
e
"""
And the ways
| nodes | name | name:pronunciation |
@@ -55,7 +61,9 @@ Feature: Car - Street names in instructions
@todo
Scenario: Car - Use way type to describe unnamed ways
Given the node map
| a | b | c | d |
"""
a b c d
"""
And the ways
| nodes | highway | name |
@@ -68,16 +76,18 @@ Feature: Car - Street names in instructions
Scenario: Inner city expressway with on road
Given the node map
| a | b | | | | c | g |
| | | | | f | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | d | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | e | |
"""
a b c g
f
d
e
"""
And the ways
| nodes | highway | name | name:pronunciation |
features/car/oneway.feature
+7 -3
View File
@@ -35,8 +35,10 @@ Feature: Car - Oneway streets
Scenario: Car - Around the Block
Given the node map
| | a | b | |
| f | d | c | e |
"""
a b
f d c e
"""
And the ways
| nodes | oneway |
@@ -70,7 +72,9 @@ Feature: Car - Oneway streets
Scenario: Car - Two consecutive oneways
Given the node map
| a | b | | c |
"""
a b c
"""
And the ways
| nodes | oneway |
features/car/restrictions.feature
+99 -63
View File
@@ -10,9 +10,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - No left turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -34,9 +36,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - No straight on
Given the node map
| a | b | j | d | e |
| v | | | | z |
| | w | x | y | |
"""
a b j d e
v z
w x y
"""
And the ways
| nodes | oneway |
@@ -62,9 +66,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - No right turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -86,9 +92,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - No u-turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -110,9 +118,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - Handle any no_* relation
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -134,9 +144,11 @@ Feature: Car - Turn restrictions
@only_turning
Scenario: Car - Only left turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -151,9 +163,11 @@ Feature: Car - Turn restrictions
Scenario: Car - Only right turn, invalid
Given the node map
| | n | | |
| w | j | e | r |
| | s | | |
"""
n
w j e r
s
"""
And the ways
| nodes | oneway |
@@ -174,9 +188,11 @@ Feature: Car - Turn restrictions
@only_turning
Scenario: Car - Only right turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -198,9 +214,11 @@ Feature: Car - Turn restrictions
@only_turning
Scenario: Car - Only straight on
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -222,9 +240,11 @@ Feature: Car - Turn restrictions
@no_turning
Scenario: Car - Handle any only_* restriction
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -246,9 +266,11 @@ Feature: Car - Turn restrictions
@specific
Scenario: Car - :hgv-qualified on a standard turn restriction
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -270,9 +292,11 @@ Feature: Car - Turn restrictions
@specific
Scenario: Car - :motorcar-qualified on a standard turn restriction
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
@@ -294,9 +318,11 @@ Feature: Car - Turn restrictions
@except
Scenario: Car - Except tag and on no_ restrictions
Given the node map
| b | x | c |
| a | j | d |
| | s | |
"""
b x c
a j d
s
"""
And the ways
| nodes | oneway |
@@ -324,9 +350,11 @@ Feature: Car - Turn restrictions
@except
Scenario: Car - Except tag and on only_ restrictions
Given the node map
| a | | b |
| | j | |
| | s | |
"""
a b
j
s
"""
And the ways
| nodes | oneway |
@@ -346,10 +374,12 @@ Feature: Car - Turn restrictions
@except
Scenario: Car - Several only_ restrictions at the same segment
Given the node map
| | | | | y | | | | |
| i | j | f | b | x | a | e | g | h |
| | | | | | | | | |
| | | | c | | d | | | |
"""
y
i j f b x a e g h
c d
"""
And the ways
| nodes | oneway |
@@ -381,13 +411,15 @@ Feature: Car - Turn restrictions
@except
Scenario: Car - two only_ restrictions share same to-way
Given the node map
| | | e | | | | f | | |
| | | | | a | | | | |
| | | | | | | | | |
| | | c | | x | | d | | |
| | | | | y | | | | |
| | | | | | | | | |
| | | | | b | | | | |
"""
e f
a
c x d
y
b
"""
And the ways
| nodes | oneway |
@@ -415,13 +447,15 @@ Feature: Car - Turn restrictions
@except
Scenario: Car - two only_ restrictions share same from-way
Given the node map
| | | e | | | | f | | |
| | | | | a | | | | |
| | | | | | | | | |
| | | c | | x | | d | | |
| | | | | y | | | | |
| | | | | | | | | |
| | | | | b | | | | |
"""
e f
a
c x d
y
b
"""
And the ways
| nodes | oneway |
@@ -449,9 +483,11 @@ Feature: Car - Turn restrictions
@specific
Scenario: Car - Ignore unrecognized restriction
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway |
features/car/shuttle_train.feature
+5 -3
View File
@@ -6,9 +6,11 @@ Feature: Car - Handle ferryshuttle train routes
Scenario: Car - Use a ferry route
Given the node map
| a | b | c | | | |
| | | d | | | |
| | | e | f | g | h |
"""
a b c
d
e f g h
"""
And the ways
| nodes | highway | route | bicycle |
features/car/summaries.feature
+22 -10
View File
@@ -8,11 +8,13 @@ Feature: Basic Routing
@smallest
Scenario: Summaries when routing on a simple network
Given the node map
| b | | | f |
| | | | |
| c | d | | g |
| | | | |
| a | | e | |
"""
b f
c d g
a e
"""
And the ways
| nodes | name |
@@ -30,7 +32,9 @@ Feature: Basic Routing
Scenario: Name Empty
Given the node map
| a | | b | | | c |
"""
a b c
"""
And the ways
| nodes | name |
@@ -43,7 +47,9 @@ Feature: Basic Routing
Scenario: Name Empty But Ref
Given the node map
| a | | b | | | c |
"""
a b c
"""
And the ways
| nodes | name | ref |
@@ -56,7 +62,9 @@ Feature: Basic Routing
Scenario: Only Refs
Given the node map
| a | | b | | | c |
"""
a b c
"""
And the ways
| nodes | name | ref |
@@ -69,7 +77,9 @@ Feature: Basic Routing
Scenario: Single Ref
Given the node map
| a | | b | | | c |
"""
a b c
"""
And the ways
| nodes | name | ref |
@@ -82,7 +92,9 @@ Feature: Basic Routing
Scenario: Nothing
Given the node map
| a | | b | | | c |
"""
a b c
"""
And the ways
| nodes | name |
features/car/traffic_turn_penalties.feature
+27 -5
View File
@@ -3,11 +3,33 @@ Feature: Traffic - turn penalties
Background: Evenly spaced grid with multiple intersections
Given the node map
| | a:1 | | b:2 | |
| c:3 | d:4 | e:5 | f:6 | g:7 |
| | h:8 | | i:9 | |
| j:10 | k:11 | l:12 | m:13 | n:14 |
| | o:15 | | p:16 | |
"""
a b
c d e f g
h i
j k l m n
o p
"""
And the nodes
| node | id |
| a | 1 |
| b | 2 |
| c | 3 |
| d | 4 |
| e | 5 |
| f | 6 |
| g | 7 |
| h | 8 |
| i | 9 |
| j | 10 |
| k | 11 |
| l | 12 |
| m | 13 |
| n | 14 |
| o | 15 |
| p | 16 |
And the ways
| nodes | highway |
| ad | primary |