cucumber: change syntax of node maps

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
+19 -11
View File
@@ -7,9 +7,11 @@ Feature: Bike - Squares and other areas
@square
Scenario: Bike - Route along edge of a squares
Given the node map
| x | |
| a | b |
| d | c |
"""
x
a b
d c
"""
And the ways
| nodes | area | highway |
@@ -30,9 +32,11 @@ Feature: Bike - Squares and other areas
@building
Scenario: Bike - Don't route on buildings
Given the node map
| x | |
| a | b |
| d | c |
"""
x
a b
d c
"""
And the ways
| nodes | highway | area | building | access |
@@ -53,9 +57,11 @@ Feature: Bike - Squares and other areas
@parking
Scenario: Bike - parking areas
Given the node map
| e | | | f |
| x | a | b | y |
| | d | c | |
"""
e f
x a b y
d c
"""
And the ways
| nodes | highway | amenity |
@@ -81,8 +87,10 @@ Feature: Bike - Squares and other areas
@train @platform
Scenario: Bike - railway platforms
Given the node map
| x | a | b | y |
| | d | c | |
"""
x a b y
d c
"""
And the ways
| nodes | highway | railway |
+10 -6
View File
@@ -6,9 +6,11 @@ Feature: Bicycle - Handle cycling
Scenario: Bicycle - 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: Bicycle - Handle cycling
Scenario: Bicycle - 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 |
+17 -11
View File
@@ -6,10 +6,12 @@ Feature: Bike - Destination only, no passing through
Scenario: Bike - 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: Bike - Destination only, no passing through
Scenario: Bike - 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: Bike - Destination only, no passing through
Scenario: Bike - 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 |
+15 -9
View File
@@ -6,9 +6,11 @@ Feature: Bike - Handle ferry routes
Scenario: Bike - 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,10 +31,12 @@ Feature: Bike - Handle ferry routes
Scenario: Bike - Ferry duration, single node
Given the node map
| a | b | c | d |
| | | e | f |
| | | g | h |
| | | i | j |
"""
a b c d
e f
g h
i j
"""
And the ways
| nodes | highway | route | bicycle | duration |
@@ -48,8 +52,10 @@ Feature: Bike - Handle ferry routes
Scenario: Bike - Ferry duration, multiple nodes
Given the node map
| x | | | | | y |
| | a | b | c | d | |
"""
x y
a b c d
"""
And the ways
| nodes | highway | route | bicycle | duration |
+3 -1
View File
@@ -40,7 +40,9 @@ Feature: Bike - Max speed restrictions
Scenario: Bike - Do not use maxspeed when higher that way type speed
Given the node map
| a | b | c |
"""
a b c
"""
And the ways
| nodes | highway | maxspeed |
+34 -16
View File
@@ -6,8 +6,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when using a ferry
Given the node map
| a | b | |
| | c | d |
"""
a b
c d
"""
And the ways
| nodes | highway | route | duration |
@@ -26,8 +28,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when using a train
Given the node map
| a | b | |
| | c | d |
"""
a b
c d
"""
And the ways
| nodes | highway | railway | bicycle |
@@ -46,8 +50,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when pushing bike against oneways
Given the node map
| a | b | e |
| f | c | d |
"""
a b e
f c d
"""
And the ways
| nodes | highway | oneway |
@@ -69,8 +75,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when pushing on pedestrain streets
Given the node map
| a | b | |
| | c | d |
"""
a b
c d
"""
And the ways
| nodes | highway |
@@ -89,8 +97,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when pushing on pedestrain areas
Given the node map
| a | b | | |
| | c | d | f |
"""
a b
c d f
"""
And the ways
| nodes | highway | area |
@@ -109,8 +119,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when pushing on steps
Given the node map
| a | b | | |
| | c | d | f |
"""
a b
c d f
"""
And the ways
| nodes | highway |
@@ -129,8 +141,10 @@ Feature: Bike - Mode flag
Scenario: Bike - Mode when bicycle=dismount
Given the node map
| a | b | | |
| | c | d | f |
"""
a b
c d f
"""
And the ways
| nodes | highway | bicycle |
@@ -149,7 +163,9 @@ Feature: Bike - Mode flag
Scenario: Bicycle - Modes when starting on forward oneway
Given the node map
| a | b |
"""
a b
"""
And the ways
| nodes | oneway |
@@ -162,7 +178,9 @@ Feature: Bike - Mode flag
Scenario: Bicycle - Modes when starting on reverse oneway
Given the node map
| a | b |
"""
a b
"""
And the ways
| nodes | oneway |
+7 -3
View File
@@ -6,8 +6,10 @@ Feature: Bike - Street names in instructions
Scenario: Bike - A named street
Given the node map
| a | b |
| | c |
"""
a b
c
"""
And the ways
| nodes | name | ref |
@@ -21,7 +23,9 @@ Feature: Bike - Street names in instructions
@unnamed
Scenario: Bike - 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 |
+7 -3
View File
@@ -18,8 +18,10 @@ Feature: Bike - Oneway streets
Scenario: Bike - Around the Block
Given the node map
| | a | b | |
| f | d | c | e |
"""
a b
f d c e
"""
And the ways
| nodes | oneway | foot |
@@ -117,7 +119,9 @@ Feature: Bike - Oneway streets
Scenario: Bike - Two consecutive oneways
Given the node map
| a | b | | c |
"""
a b c
"""
And the ways
| nodes | oneway |
+13 -7
View File
@@ -35,9 +35,11 @@ Feature: Bike - Accessability of different way types
@square
Scenario: Bike - Push bikes on pedestrian areas
Given the node map
| x | |
| a | b |
| d | c |
"""
x
a b
d c
"""
And the ways
| nodes | area | highway |
@@ -87,8 +89,10 @@ Feature: Bike - Accessability of different way types
Scenario: Bike - Instructions when pushing bike on oneways
Given the node map
| a | b | e |
| f | c | d |
"""
a b e
f c d
"""
And the ways
| nodes | highway | oneway |
@@ -107,8 +111,10 @@ Feature: Bike - Accessability of different way types
Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
Given the node map
| a | b | |
| | c | d |
"""
a b
c d
"""
And the ways
| nodes | highway |
+9 -3
View File
@@ -6,7 +6,9 @@ Feature: Bike - Way ref
Scenario: Bike - Way with both name and ref
Given the node map
| a | b |
"""
a b
"""
And the ways
| nodes | name | ref |
@@ -18,7 +20,9 @@ Feature: Bike - Way ref
Scenario: Bike - Way with only ref
Given the node map
| a | b |
"""
a b
"""
And the ways
| nodes | name | ref |
@@ -30,7 +34,9 @@ Feature: Bike - Way ref
Scenario: Bike - Way with only name
Given the node map
| a | b |
"""
a b
"""
And the ways
| nodes | name |
+58 -36
View File
@@ -9,9 +9,11 @@ Feature: Bike - Turn restrictions
@no_turning
Scenario: Bike - No left turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -33,9 +35,11 @@ Feature: Bike - Turn restrictions
@no_turning
Scenario: Bike - No right turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -57,9 +61,11 @@ Feature: Bike - Turn restrictions
@no_turning
Scenario: Bike - No u-turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -81,9 +87,11 @@ Feature: Bike - Turn restrictions
@no_turning
Scenario: Bike - Handle any no_* relation
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -105,9 +113,11 @@ Feature: Bike - Turn restrictions
@only_turning
Scenario: Bike - Only left turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -129,9 +139,11 @@ Feature: Bike - Turn restrictions
@only_turning
Scenario: Bike - Only right turn
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -153,9 +165,11 @@ Feature: Bike - Turn restrictions
@only_turning
Scenario: Bike - Only straight on
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -177,9 +191,11 @@ Feature: Bike - Turn restrictions
@no_turning
Scenario: Bike - Handle any only_* restriction
Given the node map
| | n | |
| w | j | e |
| | s | |
"""
n
w j e
s
"""
And the ways
| nodes | oneway | foot |
@@ -201,9 +217,11 @@ Feature: Bike - Turn restrictions
@except
Scenario: Bike - 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 | foot |
@@ -231,9 +249,11 @@ Feature: Bike - Turn restrictions
@except
Scenario: Bike - Except tag and on only_ restrictions
Given the node map
| a | | b |
| | j | |
| | s | |
"""
a b
j
s
"""
And the ways
| nodes | oneway | foot |
@@ -253,12 +273,14 @@ Feature: Bike - Turn restrictions
@except
Scenario: Bike - Multiple except tag values
Given the node map
| s | j | a |
| | | b |
| | | c |
| | | d |
| | | e |
| | | f |
"""
s j a
b
c
d
e
f
"""
And the ways
| nodes | oneway | foot |
+4 -2
View File
@@ -14,8 +14,10 @@ Feature: Bike - Stop areas for public transport
Scenario: Bike - railway platforms
Given the node map
| a | b | c | d |
| | s | t | |
"""
a b c d
s t
"""
And the nodes
| node | public_transport |
+4 -2
View File
@@ -41,8 +41,10 @@ Feature: Bike - Surfaces
Scenario: Bicycle - Surfaces should not increase speed when pushing bikes
Given the node map
| a | b |
| c | d |
"""
a b
c d
"""
And the ways
| nodes | highway | oneway | surface |
+5 -3
View File
@@ -7,9 +7,11 @@ Feature: Turn Penalties
Scenario: Bike - turns should incur a delay that depend on the angle
Given the node map
| c | d | e |
| b | j | f |
| a | s | g |
"""
c d e
b j f
a s g
"""
And the ways
| nodes |