diff --git a/docs/testing.md b/docs/testing.md index 7331d651e..c388345ed 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -55,7 +55,9 @@ Background: Scenario: Testbot - Straight Road Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | @@ -92,7 +94,9 @@ Background: Scenario: Testbot - Straight Road Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | name | @@ -117,8 +121,10 @@ Background: Scenario: Testbot - Straight Road Given the node map - | a | b | - | d | c | + """ + a b + d c + """ And the ways | nodes | highway | name | @@ -140,8 +146,10 @@ Background: Scenario: Testbot - Straight Road Given the node map - | a | b | e | - | d | c | | + """ + a b e + d c + """ And the ways | nodes | highway | name | @@ -165,8 +173,10 @@ Scenario: Enter and Exit mini roundabout with sharp angle # features/guidance/ Given the profile "car" # features/step_definitions/data.js:8 Given a grid size of 10 meters # features/step_definitions/data.js:20 Given the node map # features/step_definitions/data.js:45 - | a | b | | - | | c | d | + """ + a b + c d + """ And the ways # features/step_definitions/data.js:128 | nodes | highway | name | | ab | tertiary | MySt | @@ -195,9 +205,11 @@ OSRM converts the grid into a so called edge-based graph. ``` Scenario: Testbot - Intersection Given the node map - | | e | | - | b | a | d | - | | c | | + """ + e + b a d + c + """ And the ways | nodes | highway | oneway | @@ -213,11 +225,13 @@ To guarantee discovery, use: ``` Scenario: Testbot - Intersection Given the node map - | | | e | | | - | | | 4 | | | - | b | 1 | a | 3 | d | - | | | 2 | | | - | | | c | | | + """ + e + 4 + b 1 a 3 d + 2 + c + """ And the ways | nodes | highway | oneway | diff --git a/features/bicycle/area.feature b/features/bicycle/area.feature index 5f139f6f1..716f5b75a 100644 --- a/features/bicycle/area.feature +++ b/features/bicycle/area.feature @@ -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 | diff --git a/features/bicycle/bridge.feature b/features/bicycle/bridge.feature index 9e3873f9d..51094c330 100644 --- a/features/bicycle/bridge.feature +++ b/features/bicycle/bridge.feature @@ -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 | diff --git a/features/bicycle/destination.feature b/features/bicycle/destination.feature index c3a0173cd..dccba750c 100644 --- a/features/bicycle/destination.feature +++ b/features/bicycle/destination.feature @@ -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 | diff --git a/features/bicycle/ferry.feature b/features/bicycle/ferry.feature index aaec0ef9c..056786b03 100644 --- a/features/bicycle/ferry.feature +++ b/features/bicycle/ferry.feature @@ -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 | diff --git a/features/bicycle/maxspeed.feature b/features/bicycle/maxspeed.feature index ad2c2bf2d..72f6a0ed6 100644 --- a/features/bicycle/maxspeed.feature +++ b/features/bicycle/maxspeed.feature @@ -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 | diff --git a/features/bicycle/mode.feature b/features/bicycle/mode.feature index 98d23c474..96fea9ab2 100644 --- a/features/bicycle/mode.feature +++ b/features/bicycle/mode.feature @@ -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 | diff --git a/features/bicycle/names.feature b/features/bicycle/names.feature index 38b1d2ea7..6cd087331 100644 --- a/features/bicycle/names.feature +++ b/features/bicycle/names.feature @@ -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 | diff --git a/features/bicycle/oneway.feature b/features/bicycle/oneway.feature index 17e4a251a..c91c7a656 100644 --- a/features/bicycle/oneway.feature +++ b/features/bicycle/oneway.feature @@ -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 | diff --git a/features/bicycle/pushing.feature b/features/bicycle/pushing.feature index d06a96df6..2c672584f 100644 --- a/features/bicycle/pushing.feature +++ b/features/bicycle/pushing.feature @@ -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 | diff --git a/features/bicycle/ref.feature b/features/bicycle/ref.feature index 8c64232fa..543c64775 100644 --- a/features/bicycle/ref.feature +++ b/features/bicycle/ref.feature @@ -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 | diff --git a/features/bicycle/restrictions.feature b/features/bicycle/restrictions.feature index 1f604714c..08565c116 100644 --- a/features/bicycle/restrictions.feature +++ b/features/bicycle/restrictions.feature @@ -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 | diff --git a/features/bicycle/stop_area.feature b/features/bicycle/stop_area.feature index 9d02c1308..880be4519 100644 --- a/features/bicycle/stop_area.feature +++ b/features/bicycle/stop_area.feature @@ -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 | diff --git a/features/bicycle/surface.feature b/features/bicycle/surface.feature index 4f95ee6a6..b2e9b4105 100644 --- a/features/bicycle/surface.feature +++ b/features/bicycle/surface.feature @@ -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 | diff --git a/features/bicycle/turn_penalty.feature b/features/bicycle/turn_penalty.feature index 4d66cc34f..3ac9f5f53 100644 --- a/features/bicycle/turn_penalty.feature +++ b/features/bicycle/turn_penalty.feature @@ -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 | diff --git a/features/car/advisory.feature b/features/car/advisory.feature index 698d6fd53..eba9ac79a 100644 --- a/features/car/advisory.feature +++ b/features/car/advisory.feature @@ -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 | diff --git a/features/car/bridge.feature b/features/car/bridge.feature index c1cb50636..71299b672 100644 --- a/features/car/bridge.feature +++ b/features/car/bridge.feature @@ -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 | diff --git a/features/car/destination.feature b/features/car/destination.feature index 3bf07331f..47168ac81 100644 --- a/features/car/destination.feature +++ b/features/car/destination.feature @@ -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 | diff --git a/features/car/ferry.feature b/features/car/ferry.feature index 60e1b0944..b43cdcc50 100644 --- a/features/car/ferry.feature +++ b/features/car/ferry.feature @@ -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 | diff --git a/features/car/link.feature b/features/car/link.feature index 26f32d1ea..702a00173 100644 --- a/features/car/link.feature +++ b/features/car/link.feature @@ -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 | diff --git a/features/car/maxspeed.feature b/features/car/maxspeed.feature index 3b94ac763..dc9a60375 100644 --- a/features/car/maxspeed.feature +++ b/features/car/maxspeed.feature @@ -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 | diff --git a/features/car/mode.feature b/features/car/mode.feature index e0feff11a..136942e5b 100644 --- a/features/car/mode.feature +++ b/features/car/mode.feature @@ -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 | diff --git a/features/car/names.feature b/features/car/names.feature index de76b252e..333c7cca6 100644 --- a/features/car/names.feature +++ b/features/car/names.feature @@ -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 | diff --git a/features/car/oneway.feature b/features/car/oneway.feature index 72fd3940d..c9d0d4077 100644 --- a/features/car/oneway.feature +++ b/features/car/oneway.feature @@ -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 | diff --git a/features/car/restrictions.feature b/features/car/restrictions.feature index 294e587d7..d6b6f5876 100644 --- a/features/car/restrictions.feature +++ b/features/car/restrictions.feature @@ -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 | diff --git a/features/car/shuttle_train.feature b/features/car/shuttle_train.feature index f6e8b84a6..25e6691fa 100644 --- a/features/car/shuttle_train.feature +++ b/features/car/shuttle_train.feature @@ -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 | diff --git a/features/car/summaries.feature b/features/car/summaries.feature index 38670ea54..3c03857cc 100644 --- a/features/car/summaries.feature +++ b/features/car/summaries.feature @@ -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 | diff --git a/features/car/traffic_turn_penalties.feature b/features/car/traffic_turn_penalties.feature index cb3907a5e..39f9e116b 100644 --- a/features/car/traffic_turn_penalties.feature +++ b/features/car/traffic_turn_penalties.feature @@ -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 | diff --git a/features/foot/area.feature b/features/foot/area.feature index 8cfc0a839..53226ee6a 100644 --- a/features/foot/area.feature +++ b/features/foot/area.feature @@ -7,9 +7,11 @@ Feature: Foot - Squares and other areas @square Scenario: Foot - 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: Foot - Squares and other areas @building Scenario: Foot - 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: Foot - Squares and other areas @parking Scenario: Foot - 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 | @@ -80,8 +86,10 @@ Feature: Foot - Squares and other areas @train @platform Scenario: Foot - railway platforms Given the node map - | x | a | b | y | - | | d | c | | + """ + x a b y + d c + """ And the ways | nodes | highway | railway | diff --git a/features/foot/ferry.feature b/features/foot/ferry.feature index 9ad1c9d74..a690af4a2 100644 --- a/features/foot/ferry.feature +++ b/features/foot/ferry.feature @@ -6,9 +6,11 @@ Feature: Foot - Handle ferry routes Scenario: Foot - 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 | foot | @@ -29,10 +31,12 @@ Feature: Foot - Handle ferry routes Scenario: Foot - 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 | foot | duration | @@ -48,8 +52,10 @@ Feature: Foot - Handle ferry routes Scenario: Foot - 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 | foot | duration | diff --git a/features/foot/names.feature b/features/foot/names.feature index 2c3d76bf6..cd4a18ebf 100644 --- a/features/foot/names.feature +++ b/features/foot/names.feature @@ -6,8 +6,10 @@ Feature: Foot - Street names in instructions Scenario: Foot - A named street Given the node map - | a | b | - | | c | + """ + a b + c + """ And the ways | nodes | name | ref | @@ -21,7 +23,9 @@ Feature: Foot - Street names in instructions @unnamed Scenario: Foot - 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 | diff --git a/features/foot/ref.feature b/features/foot/ref.feature index a99c24bb3..ec8c8276c 100644 --- a/features/foot/ref.feature +++ b/features/foot/ref.feature @@ -6,7 +6,9 @@ Feature: Foot - Way ref Scenario: Foot - 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: Foot - Way ref Scenario: Foot - Way with only ref Given the node map - | a | b | + """ + a b + """ And the ways | nodes | name | ref | @@ -30,7 +34,9 @@ Feature: Foot - Way ref Scenario: Foot - Way with only name Given the node map - | a | b | + """ + a b + """ And the ways | nodes | name | diff --git a/features/foot/restrictions.feature b/features/foot/restrictions.feature index ae66658a6..6a691f661 100644 --- a/features/foot/restrictions.feature +++ b/features/foot/restrictions.feature @@ -8,9 +8,11 @@ Feature: Foot - Turn restrictions @no_turning Scenario: Foot - No left turn Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -32,9 +34,11 @@ Feature: Foot - Turn restrictions @no_turning Scenario: Foot - No right turn Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -56,9 +60,11 @@ Feature: Foot - Turn restrictions @no_turning Scenario: Foot - No u-turn Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -80,9 +86,11 @@ Feature: Foot - Turn restrictions @no_turning Scenario: Foot - Handle any no_* relation Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -104,9 +112,11 @@ Feature: Foot - Turn restrictions @only_turning Scenario: Foot - Only left turn Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -128,9 +138,11 @@ Feature: Foot - Turn restrictions @only_turning Scenario: Foot - Only right turn Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -152,9 +164,11 @@ Feature: Foot - Turn restrictions @only_turning Scenario: Foot - Only straight on Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -176,9 +190,11 @@ Feature: Foot - Turn restrictions @no_turning Scenario: Foot - Handle any only_* restriction Given the node map - | | n | | - | w | j | e | - | | s | | + """ + n + w j e + s + """ And the ways | nodes | oneway | @@ -200,9 +216,11 @@ Feature: Foot - Turn restrictions @except Scenario: Foot - 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 | @@ -230,9 +248,11 @@ Feature: Foot - Turn restrictions @except Scenario: Foot - Except tag and on only_ restrictions Given the node map - | a | | b | - | | j | | - | | s | | + """ + a b + j + s + """ And the ways | nodes | oneway | @@ -252,12 +272,14 @@ Feature: Foot - Turn restrictions @except Scenario: Foot - 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 | diff --git a/features/foot/roundabout.feature b/features/foot/roundabout.feature index 181f24028..bee9a1c51 100644 --- a/features/foot/roundabout.feature +++ b/features/foot/roundabout.feature @@ -10,11 +10,13 @@ Feature: Roundabout Instructions # make sense when you're going the opposite way around the roundabout. Given the node map - | | | v | | | - | | | d | | | - | s | a | | c | u | - | | | b | | | - | | | t | | | + """ + v + d + s a c u + b + t + """ And the ways | nodes | junction | diff --git a/features/guidance/advanced-lanes.feature b/features/guidance/advanced-lanes.feature index 17bc97fe2..9f4322b00 100644 --- a/features/guidance/advanced-lanes.feature +++ b/features/guidance/advanced-lanes.feature @@ -8,10 +8,12 @@ Feature: Turn Lane Guidance @sliproads Scenario: Separate Turn Lanes Given the node map - | | | | | | | | e | | - | a | | | b | | | | c | g | - | | | | | | | | d | | - | | | | | | | | f | | + """ + e + a b c g + d + f + """ And the ways | nodes | turn:lanes:forward | name | oneway | @@ -37,10 +39,12 @@ Feature: Turn Lane Guidance @sliproads Scenario: Separate Turn Lanes Given the node map - | | | | | | | | e | | - | a | | | b | | | | c | g | - | | | | | | | | d | | - | | | | | | | | f | | + """ + e + a b c g + d + f + """ And the ways | nodes | turn:lanes:forward | name | oneway | @@ -66,17 +70,19 @@ Feature: Turn Lane Guidance @sliproads Scenario: Separate Turn Lanes Next to other turns Given the node map - | | | | | | | | e | | - | a | | | b | | | | c | g | - | | | | | | | | d | | - | | | | | | | | f | | - | | | | | | | | | | - | | | | | | | | | | - | | | | | | | | | | - | | | | | | | | | | - | | | | | | | | | | - | | | | | | | | | | - | i | | | h | | | | j | | + """ + e + a b c g + d + f + + + + + + + i h j + """ And the ways | nodes | turn:lanes:forward | name | oneway | @@ -108,12 +114,14 @@ Feature: Turn Lane Guidance #http://www.openstreetmap.org/export#map=19/52.56054/13.32152 Scenario: Kurt-Schuhmacher-Damm Given the node map - | | | | g | | f | - | | | | | | | - | j | | | h | | e | - | | | | | | | - | a | | | b | | c | - | | | | i | | d | + """ + g f + + j h e + + a b c + i d + """ And the ways | nodes | name | highway | oneway | turn:lanes | @@ -136,23 +144,25 @@ Feature: Turn Lane Guidance #http://www.openstreetmap.org/#map=19/37.77308/-122.42238 Scenario: Market/Haight without Through Street Given the node map - | | | | | | | | g | j | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | f | - | | | | | | | | | e | | - | | | | | | | | d | | | - | a | | | | | | b | c | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | l | | | h | i | | + """ + g j + + + + + + f + e + d + a b c + + + + + + + l h i + """ And the ways | nodes | name | highway | oneway | turn:lanes:forward | @@ -182,23 +192,25 @@ Feature: Turn Lane Guidance #http://www.openstreetmap.org/#map=19/37.77308/-122.42238 Scenario: Market/Haight without Through Street Given the node map - | | | | | | | | g | j | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | f | - | | | | | | | | | e | | - | | | | | | | | d | | | - | a | | | | | | b | c | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | | | | | | | - | | | | | l | | | h | i | | + """ + g j + + + + + + f + e + d + a b c + + + + + + + l h i + """ And the ways | nodes | name | highway | oneway | turn:lanes:forward | diff --git a/features/guidance/anticipate-lanes.feature b/features/guidance/anticipate-lanes.feature index 049faf97c..d6af4766d 100644 --- a/features/guidance/anticipate-lanes.feature +++ b/features/guidance/anticipate-lanes.feature @@ -8,11 +8,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lane Change for subsequent multi-lane intersections Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | | + """ + a – b – x + | + c – d – z + | | + y e + """ And the ways | nodes | turn:lanes:forward | @@ -32,11 +34,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lane Change for quick same direction turns, staying on the same street Given the node map - | a | | b | x | - | | | | | - | | | c | | - | | | | | - | e | | d | y | + """ + a – b – x + | + c + | + e – d – y + """ And the ways | nodes | turn:lanes:forward | turn:lanes:backward | name | @@ -55,11 +59,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lane Change for quick same direction turns, changing between streets Given the node map - | a | | b | x | - | | | | | - | | | c | | - | | | | | - | e | | d | y | + """ + a – b – x + | + c + | + e – d – y + """ And the ways | nodes | turn:lanes:forward | turn:lanes:backward | name | @@ -79,9 +85,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lane Change for quick turns during a merge Given the node map - | a | | | | | - | x | b | | c | y | - | | | | | d | + """ + a + \ + x – b – c – y + | + d + """ And the ways | nodes | turn:lanes:forward | name | highway | oneway | @@ -100,9 +110,12 @@ Feature: Turn Lane Guidance Scenario: Schoenefelder Kreuz # https://www.openstreetmap.org/way/264306388#map=16/52.3202/13.5568 Given the node map - | a | b | x | | | i | - | | | c | d | | | - | | | | | | j | + """ + a b – x + \ / i + c – d + \ j + """ And the ways | nodes | turn:lanes:forward | lanes | highway | oneway | name | @@ -123,8 +136,11 @@ Feature: Turn Lane Guidance Scenario: Kreuz Oranienburg # https://www.openstreetmap.org/way/4484007#map=18/52.70439/13.20269 Given the node map - | i | | | | | a | - | j | | c | b | | x | + """ + i a + ' . . ' + j – – c – b – – x + """ And the ways | nodes | turn:lanes:forward | lanes | highway | oneway | name | @@ -143,11 +159,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Lane anticipation for fan-in Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | | + """ + a – b – x + | + c – d – z + | | + y e + """ And the ways | nodes | turn:lanes:forward | name | @@ -166,11 +184,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Lane anticipation for fan-out Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | | + """ + a – b – x + | + c – d – z + | | + y e + """ And the ways | nodes | turn:lanes:forward | name | @@ -189,11 +209,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Lane anticipation for fan-in followed by fan-out Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | | + """ + a – b – x + | + c – d – z + | | + y e + """ And the ways | nodes | turn:lanes:forward | name | @@ -212,11 +234,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Lane anticipation for fan-out followed by fan-in Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | | + """ + a – b – x + | + c – d – z + | | + y e + """ And the ways | nodes | turn:lanes:forward | name | @@ -235,13 +259,15 @@ Feature: Turn Lane Guidance @anticipate Scenario: Lane anticipation for multiple hops with same number of lanes Given the node map - | a | | b | | x | | | - | | | | | | | | - | | | c | | d | | z | - | | | | | | | | - | | | y | | e | | f | - | | | | | | | | - | | | | | w | | | + """ + a – b – x + | + c – d – z + | | + y e – f + | + w + """ And the ways | nodes | turn:lanes:forward | name | @@ -262,11 +288,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for through, through with lanes Given the node map - | | | | f | g | | - | | | | | | | - | a | b | c | d | | e | - | | | | | | | - | | | | h | i | | + """ + f g + / / + a – b – c – d – e + \ \ + h i + """ And the ways | nodes | turn:lanes:forward | name | @@ -286,11 +314,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for through and collapse multiple use lanes Given the node map - | | | e | f | g | - | | | | | | - | a | b | c | d | | - | | | | | | - | | | h | i | j | + """ + e f g + / / / + a – b – c – d + \ \ \ + h i j + """ And the ways | nodes | turn:lanes:forward | name | @@ -312,11 +342,13 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for through followed by left/right Given the node map - | | | f | g | | - | | | | | d | - | a | b | c | x | | - | | | | | e | - | | | h | i | | + """ + f g d + / / / + a – b – c – x + \ \ \ + h i e + """ And the ways | nodes | turn:lanes:forward | name | @@ -338,11 +370,11 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for through with turn before / after Given the node map - | a | b | c | - | | d | | - | f | e | g | - | | h | | - | j | i | l | + """ + c g l + b – d – e – h - i + a f j + """ And the ways | nodes | turn:lanes:forward | name | oneway | @@ -370,10 +402,16 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for turns with through before and after + Given a grid size of 10 meters Given the node map - | a | b | q | | s | h | i | - | | | e | f | g | | | - | c | d | r | | t | j | k | + """ + a – b – q s h – i + \ / / + e – f – g + / \ \ + c – d – r t j – k + + """ And the ways | nodes | turn:lanes:forward | name | @@ -402,10 +440,15 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate Lanes for turn between throughs Given the node map - | | q | | | - | a | b | c | s | - | | r | d | t | - | | | e | | + """ + q + | + a – b – c – s + | | + r d – t + | + e + """ And the ways | nodes | turn:lanes:forward | name | @@ -425,13 +468,15 @@ Feature: Turn Lane Guidance @anticipate @todo @2661 Scenario: Anticipate with lanes in roundabout: roundabouts as the unit of anticipation Given the node map - | | | e | | | - | a | b | | d | f | - | | | c | | | - | | | | | | - | | | g | | | - | k | h | | j | l | - | | | i | | | + """ + /e\ + a – b d – f + \c/ + | + /g\ + k – h j – l + \i/ + """ And the ways | nodes | turn:lanes:forward | highway | junction | # | @@ -459,9 +504,11 @@ Feature: Turn Lane Guidance @anticipate @todo Scenario: Roundabout with lanes only tagged on exit Given the node map - | | | e | | | - | a | b | | d | f | - | | | c | | | + """ + /e\ + a – b d – f + \c/ + """ And the ways | nodes | turn:lanes:forward | highway | junction | @@ -479,13 +526,16 @@ Feature: Turn Lane Guidance @anticipate Scenario: No Lanes for Roundabouts, see #2626 Given the node map - | | | a | | | - | | | b | | | - | | c | | g | h | - | | | | | | - | | d | | f | | - | | | e | | | - | x | | | | y | + """ + a + | + /b\ + c g – h + /| | + | d f + |/ \e/ \ + x \ y + """ And the ways | nodes | turn:lanes:forward | highway | junction | @@ -509,9 +559,11 @@ Feature: Turn Lane Guidance @anticipate Scenario: No Lanes for Roundabouts, see #2626 Given the node map - | | | a | | | - | x | b | | d | y | - | | | c | | | + """ + /a\ + x – b d – y + \c/ + """ And the ways | nodes | turn:lanes:forward | highway | junction | name | @@ -535,13 +587,16 @@ Feature: Turn Lane Guidance properties.left_hand_driving = true """ And the node map - | | | a | | | - | | | b | | | - | h | c | | g | | - | | | | | | - | | d | | f | | - | | | e | | | - | x | | | | y | + """ + a + | + /b\ + h – c g + | |\ + d f | + / \e/ \| + x / y + """ And the ways | nodes | turn:lanes:forward | highway | junction | @@ -565,43 +620,45 @@ Feature: Turn Lane Guidance @anticipate Scenario: No Lanes for Roundabouts, see #2626 Given the node map - | | | a | | | - | x | b | | d | y | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | c | | | + """ + /a\ + x – b d – y + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | + | + | + | + | + | + | + | + | + | + | + | + c + """ And the ways | nodes | turn:lanes:forward | highway | junction | name | @@ -621,12 +678,15 @@ Feature: Turn Lane Guidance @anticipate @todo @2032 Scenario: No Lanes for Roundabouts, see #2626 Given the node map - | a | b | | | x | - | | c | | | | - | d | | f | g | z | - | | e | | h | | - | | | | | | - | | y | | | | + """ + a – b –x + | + /c\ + d f – g – z + \e/ | + | h + y + """ And the ways | nodes | turn:lanes:forward | highway | junction | name | @@ -649,10 +709,11 @@ Feature: Turn Lane Guidance @anticipate Scenario: Anticipate none tags Given the node map - | a | b | c | - | | d | | - | f | e | g | - | | h | | + """ + c g l + b – d – e – h - i + a f j + """ And the ways | nodes | turn:lanes:forward | highway | name | @@ -672,14 +733,16 @@ Feature: Turn Lane Guidance @anticipate Scenario: Triple Right keeping Left Given the node map - | a | | | | b | | i | - | | | | | | | | - | | | | | | | | - | f | | e | | | | g | - | | | | | | | | - | | | | | | | | - | | j | d | | c | | | - | | | | | h | | | + """ + a – b – i + | + f – e – g | + | | + | | + j – d – – c + | + h + """ And the ways | nodes | turn:lanes:forward | highway | name | @@ -697,14 +760,16 @@ Feature: Turn Lane Guidance @anticipate Scenario: Tripple Left keeping Right Given the node map - | i | | b | | | | a | - | | | | | | | | - | | | | | | | | - | g | | | | e | | f | - | | | | | | | | - | | | | | | | | - | | | c | | d | j | | - | | | h | | | | | + """ + i – b – a + | + | g – e – f + | | + | | + c – – d – j + | + h + """ And the ways | nodes | turn:lanes:forward | highway | name | diff --git a/features/guidance/bridges_and_tunnels.feature b/features/guidance/bridges_and_tunnels.feature index b1ee7353f..4d734c4ac 100644 --- a/features/guidance/bridges_and_tunnels.feature +++ b/features/guidance/bridges_and_tunnels.feature @@ -6,7 +6,9 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Simple Bridge Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | bridge | name | @@ -20,9 +22,11 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Bridge with Immediate Turn Given the node map - | | | | d | - | a | | b | c | - | | | | e | + """ + d + a b c + e + """ And the ways | nodes | highway | bridge | name | @@ -39,9 +43,11 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Bridge with Immediate Turn Front and Back Given the node map - | f | | | d | - | a | | b | c | - | g | | | e | + """ + f d + a b c + g e + """ And the ways | nodes | highway | bridge | name | @@ -63,7 +69,9 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Simple Tunnel Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | tunnel | name | @@ -77,9 +85,11 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Tunnel with Immediate Turn Given the node map - | | | | d | - | a | | b | c | - | | | | e | + """ + d + a b c + e + """ And the ways | nodes | highway | tunnel | name | @@ -96,9 +106,11 @@ Feature: Car - Guidance - Bridges and Tunnels Scenario: Tunnel with Immediate Turn Front and Back Given the node map - | f | | | d | - | a | | b | c | - | g | | | e | + """ + f d + a b c + g e + """ And the ways | nodes | highway | bridge | name | diff --git a/features/guidance/bugs.feature b/features/guidance/bugs.feature index 489262c68..0eed6c86e 100644 --- a/features/guidance/bugs.feature +++ b/features/guidance/bugs.feature @@ -8,13 +8,15 @@ Feature: Features related to bugs @2852 Scenario: Loop Given the node map - | a | 1 | | g | | | b | - | | | | | | | | - | | | | | | | | - | e | | | | | | f | - | | | | | | | | - | | | | | | | 2 | - | d | | | h | | | c | + """ + a 1 g b + + + e f + + 2 + d h c + """ And the ways | nodes | name | oneway | diff --git a/features/guidance/collapse-detail.feature b/features/guidance/collapse-detail.feature index 9653bc9f3..49728a109 100644 --- a/features/guidance/collapse-detail.feature +++ b/features/guidance/collapse-detail.feature @@ -8,10 +8,12 @@ Feature: Collapse @reverse Scenario: Collapse U-Turn Triangle Intersection Given the node map - | g | | f | | e | | d | - | | | | | | | | - | | | | | | | | - | a | | | b | | | c | + """ + g f e d + + + a b c + """ And the ways | nodes | highway | name | oneway | @@ -28,11 +30,13 @@ Feature: Collapse @reverse @traffic-signals Scenario: Collapse U-Turn Triangle Intersection Given the node map - | g | | f | | j | | e | | d | - | | | | | | | | | | - | | | | h | | i | | | | - | | | | | | | | | | - | a | | | | b | | | | c | + """ + g f j e d + + h i + + a b c + """ And the ways | nodes | highway | name | oneway | diff --git a/features/guidance/collapse.feature b/features/guidance/collapse.feature index ea318cf39..6ccffc7fc 100644 --- a/features/guidance/collapse.feature +++ b/features/guidance/collapse.feature @@ -7,12 +7,14 @@ Feature: Collapse Scenario: Segregated Intersection, Cross Belonging to Single Street Given the node map - | | | i | l | | | - | | | | | | | - | d | | c | b | | a | - | e | | f | g | | h | - | | | | | | | - | | | j | k | | | + """ + i l + + d c b a + e f g h + + j k + """ And the ways | nodes | highway | name | oneway | @@ -50,12 +52,14 @@ Feature: Collapse Scenario: Segregated Intersection, Cross Belonging to Correct Street Given the node map - | | | i | l | | | - | | | | | | | - | d | | c | b | | a | - | e | | f | g | | h | - | | | | | | | - | | | j | k | | | + """ + i l + + d c b a + e f g h + + j k + """ And the ways | nodes | highway | name | oneway | @@ -93,12 +97,14 @@ Feature: Collapse Scenario: Segregated Intersection, Cross Belonging to Mixed Streets Given the node map - | | | i | l | | | - | | | | | | | - | d | | c | b | | a | - | e | | f | g | | h | - | | | | | | | - | | | j | k | | | + """ + i l + + d c b a + e f g h + + j k + """ And the ways | nodes | highway | name | oneway | @@ -136,26 +142,28 @@ Feature: Collapse Scenario: Partly Segregated Intersection, Two Segregated Roads Given the node map - | | n | | m | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | g | | h | | - | | | | | | - | | | | | | - | c | | b | | a | - | d | | e | | f | - | | | | | | - | | | | | | - | | j | | i | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | | | | | - | | k | | l | | + """ + n m + + + + + + g h + + + c b a + d e f + + + j i + + + + + + k l + """ And the ways | nodes | highway | name | oneway | @@ -188,22 +196,24 @@ Feature: Collapse Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second Given the node map - | | n | | m | | - | | | | | | - | | | | | | - | | | | | | - | | g | | h | | - | | | | | | - | | | | | | - | c | | b | | a | - | d | | e | | f | - | | | | | | - | | | | | | - | | j | | i | | - | | | | | | - | | | | | | - | | | | | | - | | k | | l | | + """ + n m + + + + g h + + + c b a + d e f + + + j i + + + + k l + """ And the ways | nodes | highway | name | oneway | @@ -236,12 +246,14 @@ Feature: Collapse Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles Given the node map - | | | i | l | | | - | | | | | | a | - | | | c | b | | h | - | d | | f | g | | | - | e | | | | | | - | | | j | k | | | + """ + i l + a + c b h + d f g + e + j k + """ And the ways | nodes | highway | name | oneway | @@ -279,12 +291,14 @@ Feature: Collapse Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles (2) Given the node map - | | | i | l | | | - | | | | | | | - | | | c | b | | | - | d | | f | g | | a | - | e | | | | | h | - | | | j | k | | | + """ + i l + + c b + d f g a + e h + j k + """ And the ways | nodes | highway | name | oneway | @@ -322,12 +336,14 @@ Feature: Collapse Scenario: Entering a segregated road Given the node map - | | a | f | | | | g | - | | | | | | | | - | | b | e | | | | | - | | | | | | | | - | | | | | | | | - | c | d | | | | | | + """ + a f g + + b e + + + c d + """ And the ways | nodes | highway | name | oneway | @@ -347,9 +363,11 @@ Feature: Collapse Scenario: Do not collapse turning roads Given the node map - | | | e | | | - | | | c | | d | - | a | | b | f | | + """ + e + c d + a b f + """ And the ways | nodes | highway | name | oneway | @@ -367,7 +385,9 @@ Feature: Collapse Scenario: Bridge on unnamed road Given the node map - | a | b | | | | c | d | + """ + a b c d + """ And the ways | nodes | highway | name | @@ -381,9 +401,11 @@ Feature: Collapse Scenario: Crossing Bridge into Segregated Turn Given the node map - | | | | | | f | - | i | h | | | g | e | - | a | b | | | c | d | + """ + f + i h g e + a b c d + """ And the ways | nodes | highway | oneway | name | @@ -402,9 +424,11 @@ Feature: Collapse Scenario: Pankenbruecke Given the node map - | j | | | | h | | | | | | i | | | | | | | - | | | | | | | b | c | d | e | f | | | | | | g | - | k | | | | a | | | | | | | | | | | | | + """ + j h i + b c d e f g + k a + """ And the ways | nodes | highway | name | oneway | @@ -421,11 +445,13 @@ Feature: Collapse Scenario: Close Turns - Don't Collapse Given the node map - | | g | d | | - | | | | | - | e | b | c | f | - | | | | | - | | a | h | | + """ + g d + + e b c f + + a h + """ And the ways | nodes | highway | name | @@ -443,8 +469,10 @@ Feature: Collapse Scenario: No Name During Turns Given the node map - | a | b | | - | | c | d | + """ + a b + c d + """ And the ways | nodes | highway | name | @@ -458,8 +486,10 @@ Feature: Collapse Scenario: No Name During Turns, Random Oneway Given the node map - | a | b | | - | | c | d | + """ + a b + c d + """ And the ways | nodes | highway | name | oneway | @@ -473,9 +503,11 @@ Feature: Collapse Scenario: Pulled Back Turn Given the node map - | | | d | - | a | b | c | - | | e | | + """ + d + a b c + e + """ And the ways | nodes | highway | name | @@ -490,8 +522,10 @@ Feature: Collapse Scenario: No Name During Turns, keep important turns Given the node map - | a | b | e | - | | c | d | + """ + a b e + c d + """ And the ways | nodes | highway | name | @@ -506,17 +540,19 @@ Feature: Collapse Scenario: Segregated Intersection into Slight Turn Given the node map - | h | | | | | | | - | a | | | | | | | - | | | | | | | | - | | | g | | | | | - | | | b | f | | | | - | | | | c | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | e | - | | | | | | | d | - | | | j | i | | | | + """ + h + a + + g + b f + c + + + e + d + j i + """ And the ways | nodes | highway | name | oneway | @@ -533,20 +569,22 @@ Feature: Collapse Scenario: Segregated Intersection into Very Slight Turn Given the node map - | h | | | | | | | - | a | | | | | | | - | | | | | | | | - | | | | | | | | - | | | g | | | | | - | | | b | | | | | - | | | | f | | | | - | | | | c | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | e | - | | | | | | | d | - | | | j | i | | | | + """ + h + a + + + g + b + f + c + + + + e + d + j i + """ And the ways | nodes | highway | name | oneway | @@ -563,9 +601,11 @@ Feature: Collapse Scenario: Don't collapse everything to u-turn / too wide Given the node map - | a | | b | | e | - | | | | | | - | d | | c | | f | + """ + a b e + + d c f + """ And the ways | nodes | highway | name | @@ -580,12 +620,14 @@ Feature: Collapse Scenario: Forking before a turn Given the node map - | | | | g | | - | | | | | | - | | | | c | | - | a | | b | d | e | - | | | | | | - | | | | f | | + """ + g + + c + a b d e + + f + """ And the ways | nodes | name | oneway | highway | @@ -607,12 +649,14 @@ Feature: Collapse Scenario: Forking before a turn (narrow) Given the node map - | | | | g | | - | | | | | | - | | | | c | | - | a | b | | d | e | - | | | | | | - | | | | f | | + """ + g + + c + a b d e + + f + """ And the ways | nodes | name | oneway | highway | @@ -636,12 +680,14 @@ Feature: Collapse Scenario: Forking before a turn (forky) Given the node map - | | | | | | g | | | - | | | | | | | | | - | | | | | | c | | | - | a | | | b | | | | | - | | | | | | | d | | - | | | | | | | f | e | + """ + g + + c + a b + d + f e + """ And the ways | nodes | name | oneway | highway | @@ -667,9 +713,11 @@ Feature: Collapse Scenario: On-Off on Highway Given the node map - | f | | | | - | a | b | c | d | - | | | | e | + """ + f + a b c d + e + """ And the ways | nodes | name | highway | oneway | @@ -687,13 +735,15 @@ Feature: Collapse @negative @straight Scenario: Don't collapse going straight if actual turn Given the node map - | | c | e | | | - | | | d | | f | - | | | | | | - | | | b | | | - | | | | | | - | | | | | | - | | | a | | | + """ + c e + d f + + b + + + a + """ And the ways | nodes | name | highway | @@ -709,12 +759,14 @@ Feature: Collapse Scenario: Entering a segregated road Given the node map - | | a | f | | | - | | | | | g | - | | b | e | | | - | | | | | | - | | | | | | - | c | d | | | | + """ + a f + g + b e + + + c d + """ And the ways | nodes | highway | name | oneway | @@ -729,12 +781,14 @@ Feature: Collapse Scenario: Entering a segregated road slight turn Given the node map - | | | a | f | | - | | | | | g | - | | b | e | | | - | | | | | | - | | | | | | - | c | d | | | | + """ + a f + g + b e + + + c d + """ And the ways | nodes | highway | name | oneway | @@ -749,11 +803,13 @@ Feature: Collapse Scenario: Do not collapse UseLane step when lanes change Given the node map - | | | | f | g | | - | | | | | | | - | a | b | c | d | | e | - | | | | | | | - | | | | h | i | | + """ + f g + + a b c d e + + h i + """ And the ways | nodes | turn:lanes:forward | name | @@ -772,11 +828,13 @@ Feature: Collapse Scenario: But _do_ collapse UseLane step when lanes stay the same Given the node map - | | | | f | g | | - | | | | | | | - | a | b | c | d | | e | - | | | | | | | - | | | | h | i | | + """ + f g + + a b c d e + + h i + """ And the ways | nodes | turn:lanes:forward | name | @@ -795,10 +853,12 @@ Feature: Collapse Scenario: Don't collapse different travel modes Given the node map - | g | | | | | | | h | | - | a | b | | c | | | | e | f | - | | | | | | d | | | | - | | | | i | j | | | | | + """ + g h + a b c e f + d + i j + """ And the ways | nodes | highway | route | name | @@ -818,11 +878,13 @@ Feature: Collapse Scenario: U-Turn onto a Ferry Given the node map - | | | | | | | i | | | - | j | e | | | | | d | c | h | - | | | | | | | | | | - | | | | | | | | | | - | k | g | | | | | a | b | f | + """ + i + j e d c h + + + k g a b f + """ And the ways | nodes | highway | route | name | oneway | diff --git a/features/guidance/continue.feature b/features/guidance/continue.feature index aedb87806..bd6ce8081 100644 --- a/features/guidance/continue.feature +++ b/features/guidance/continue.feature @@ -7,8 +7,10 @@ Feature: Continue Instructions Scenario: Road turning left Given the node map - | | | c | | - | a | | b | d | + """ + c + a b d + """ And the ways | nodes | highway | @@ -22,8 +24,10 @@ Feature: Continue Instructions Scenario: Road turning left and straight Given the node map - | | | c | | - | a | | b | d | + """ + c + a b d + """ And the ways | nodes | highway | name | @@ -37,9 +41,11 @@ Feature: Continue Instructions Scenario: Road turning left and straight Given the node map - | | | c | | - | a | | b | d | - | | | e | | + """ + c + a b d + e + """ And the ways | nodes | highway | name | @@ -55,8 +61,10 @@ Feature: Continue Instructions Scenario: Road turning right Given the node map - | a | | b | d | - | | | c | | + """ + a b d + c + """ And the ways | nodes | highway | @@ -70,10 +78,12 @@ Feature: Continue Instructions Scenario: Road turning slight left Given the node map - | | | | | c | - | | | | | | - | a | | b | | | - | | | | d | | + """ + c + + a b + d + """ And the ways | nodes | highway | @@ -87,10 +97,12 @@ Feature: Continue Instructions Scenario: Road turning slight right Given the node map - | | | | d | | - | a | | b | | | - | | | | | | - | | | | | c | + """ + d + a b + + c + """ And the ways | nodes | highway | @@ -104,11 +116,13 @@ Feature: Continue Instructions Scenario: Road Loop Given the node map - | | | f | | e | - | | | | | | - | a | | b | g | | - | | | | | | - | | | c | | d | + """ + f e + + a b g + + c d + """ And the ways | nodes | highway | diff --git a/features/guidance/dedicated-turn-roads.feature b/features/guidance/dedicated-turn-roads.feature index d6fe959ca..50969b331 100644 --- a/features/guidance/dedicated-turn-roads.feature +++ b/features/guidance/dedicated-turn-roads.feature @@ -7,15 +7,17 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Turn Instead of Ramp Given the node map - | | | | | e | | - | a | b | | | c | d | - | | | | h | | | - | | | | | | | - | | | | 1 | | | - | | | | | | | - | | | | | f | | - | | | | | | | - | | | | | g | | + """ + e + a b c d + h + + 1 + + f + + g + """ And the ways | nodes | highway | name | @@ -34,16 +36,18 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Turn Instead of Ramp Given the node map - | | | | | e | | - | a | b | | | c | d | - | | | | h | | | - | | | | | | | - | | | | | | | - | | | | | | | - | | | | | f | | - | | | | | | | - | | | | | | | - | | | | | g | | + """ + e + a b c d + h + + + + f + + + g + """ And the ways | nodes | highway | name | @@ -57,16 +61,18 @@ Feature: Slipways and Dedicated Turn Lanes 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 | @@ -86,14 +92,16 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Slipway Round U-Turn Given the node map - | a | | f | - | | | | - | b | | e | - | | | | - | | | | - | | g | | - | | | | - | c | | d | + """ + a f + + b e + + + g + + c d + """ And the ways | nodes | highway | name | oneway | @@ -107,13 +115,15 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Slipway Steep U-Turn Given the node map - | a | | f | - | | | | - | b | | e | - | | g | | - | | | | - | | | | - | c | | d | + """ + a f + + b e + g + + + c d + """ And the ways | nodes | highway | name | oneway | @@ -127,21 +137,23 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Schwarzwaldstrasse Autobahn Given the node map - | | | | | i | | | | | | h | | | | | g | - | | | j | | | | | | | | | | | | | | - | a | | | | | | | k | | | | | | | | | - | | | | b | | r | c | | d | | e | | | | | f | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | l | | | | | | | | | | | - | | | | | | m | | | | | | | | | | | - | | | | | | | n | | q | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | o | | p | | | | | | | | + """ + i h g + j + a k + b r c d e f + + + + + l + m + n q + + + + o p + """ And the nodes # the traffic light at `l` is not actually in the data, but necessary for the test to check everything @@ -171,15 +183,17 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Traffic Lights everywhere #http://map.project-osrm.org/?z=18¢er=48.995336%2C8.383813&loc=48.995467%2C8.384548&loc=48.995115%2C8.382761&hl=en&alt=0 Given the node map - | a | | | k | l | | | j | | - | | | | | | d | b | c | i | - | | | | | | | | | | - | | | | | | | e | g | | - | | | | | | | | | | - | | | | | | | 1 | | | - | | | | | | | | h | | - | | | | | | | | | | - | | | | | | | | f | | + """ + a k l j + d b c i + + e g + + 1 + h + + f + """ And the nodes | node | highway | @@ -203,24 +217,25 @@ Feature: Slipways and Dedicated Turn Lanes #2839 Scenario: Self-Loop Given the node map - # 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 - | | | | | | | | | | | | | | | | | | | | | | l | | | k | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | j | | | | - | | | | | | | | | | | | | | | | | | | | m | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | h | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | n | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g | - | | | | | | | | | | | | | | | | | | | o | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f | | - | | | | | | | | | | | | | | | | | | p | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | e | | | | - | a | | | | | b | | | | | | | | | c | | | | | | | | | | d | | | | | | | + """ + l k + j + m + i + + + h + + n + + g + o + + f + p + e + a b c d + """ And the ways | nodes | name | oneway | highway | lanes | @@ -237,24 +252,25 @@ Feature: Slipways and Dedicated Turn Lanes #has to remain as todo (see #https://github.com/Project-OSRM/osrm-backend/pull/2849) Scenario: Self-Loop - Bidirectional Given the node map - # 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 - | | | | | | | | | | | | | | | | | | | | | | l | | | k | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | j | | | | - | | | | | | | | | | | | | | | | | | | | m | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | h | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | n | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g | - | | | | | | | | | | | | | | | | | | | o | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f | | - | | | | | | | | | | | | | | | | | | p | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | e | | | | - | a | | | | | b | | | | | | | | | c | | | | | | | | | | d | | | | | | | + """ + l k + j + m + i + + + h + + n + + g + o + + f + p + e + a b c d + """ And the ways | nodes | name | oneway | highway | lanes | @@ -268,34 +284,35 @@ Feature: Slipways and Dedicated Turn Lanes #http://www.openstreetmap.org/#map=19/38.90597/-77.01276 Scenario: Don't falsly classify as sliproads Given the node map - # 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 - | | | | | | | | | | | | | | | | | | | | | | | | j | | | | | | | | - | a | b | | | | | | | | | | | | | | | | | | | | | | c | | | | | | | d | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | e | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | 1 | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | f | | | | | g | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | | | | | | | i | | | | | | | h | + """ + j + a b c d + + + + + + e + + + + + + + + + + + + + + + 1 + + f g + + i h + """ And the ways | nodes | name | highway | oneway | maxspeed | @@ -317,21 +334,23 @@ Feature: Slipways and Dedicated Turn Lanes # Merging into degree two loop on dedicated turn detection / 2927 Scenario: Turn Instead of Ramp Given the node map - | | | | | | | | | | | | | | | | f | - | | | | | g | | | | | | h | | | | | | - | | | | | | | | | | | | | d | | | e | - | i | | | | c | | | | | | j | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | b | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | - | | | a | | | | | | | | | | | | | | + """ + f + g h + d e + i c j + + + + + + + + + b + + a + """ And the ways | nodes | highway | name | oneway | diff --git a/features/guidance/destination-signs.feature b/features/guidance/destination-signs.feature index 73f90d9b0..390b3e05b 100644 --- a/features/guidance/destination-signs.feature +++ b/features/guidance/destination-signs.feature @@ -6,15 +6,17 @@ Feature: Destination Signs Scenario: Car - route name assembly with destination signs Given the node map - | a | b | - | c | d | - | e | f | - | g | h | - | i | j | - | k | l | - | m | n | - | o | p | - | q | r | + """ + a b + c d + e f + g h + i j + k l + m n + o p + q r + """ And the ways | nodes | name | ref | destination | destination:ref | oneway | # | diff --git a/features/guidance/end-of-road.feature b/features/guidance/end-of-road.feature index 9ac6b72a7..834fa635f 100644 --- a/features/guidance/end-of-road.feature +++ b/features/guidance/end-of-road.feature @@ -7,9 +7,11 @@ Feature: End Of Road Instructions Scenario: End of Road with through street Given the node map - | | | c | - | a | e | b | - | | f | d | + """ + c + a e b + f d + """ And the ways | nodes | highway | @@ -24,9 +26,11 @@ Feature: End Of Road Instructions Scenario: End of Road with three streets Given the node map - | | | c | - | a | e | b | - | | f | d | + """ + c + a e b + f d + """ And the ways | nodes | highway | @@ -42,9 +46,11 @@ Feature: End Of Road Instructions Scenario: End of Road with three streets, slightly angled Given the node map - | a | e | | | | c | - | | f | | | | b | - | | | | | | d | + """ + a e c + f b + d + """ And the ways | nodes | highway | @@ -60,9 +66,11 @@ Feature: End Of Road Instructions Scenario: End of Road with three streets, slightly angled Given the node map - | | | | | | c | - | | f | | | | b | - | a | e | | | | d | + """ + c + f b + a e d + """ And the ways | nodes | highway | @@ -78,9 +86,11 @@ Feature: End Of Road Instructions Scenario: End of Road with through street, slightly angled Given the node map - | a | e | | | | c | - | | f | | | | b | - | | | | | | d | + """ + a e c + f b + d + """ And the ways | nodes | highway | @@ -95,9 +105,11 @@ Feature: End Of Road Instructions Scenario: End of Road with through street, slightly angled Given the node map - | | | | | | c | - | | f | | | | b | - | a | e | | | | d | + """ + c + f b + a e d + """ And the ways | nodes | highway | @@ -112,9 +124,11 @@ Feature: End Of Road Instructions Scenario: End of Road with two ramps - prefer ramp over end of road Given the node map - | | | c | - | a | e | b | - | | f | d | + """ + c + a e b + f d + """ And the ways | nodes | highway | @@ -132,19 +146,21 @@ Feature: End Of Road Instructions @end-of-road @negative Scenario: Don't Handle Circles as End-Of-Road Given the node map - | | r | | | | q | | | | | | | - | | | | | | a | s | | | | | | - | | | | b | | | | | | | | | - | | | | | | | | j | | | | | - | | | | | | | | | | | | | - | l | | c | | | | | i | | | | k | - | | | | | | | | | | | | | - | | | | | | | | h | | | | | - | m | | | | | | | | | | | | - | | | d | | | | | | | | | n | - | | | | e | | | g | | | | | | - | | | | | f | | | | | | | | - | | | | | o | | p | | | | | | + """ + r q + a s + b + j + + l c i k + + h + m + d n + e g + f + o p + """ And the ways | nodes | highway | name | oneway | diff --git a/features/guidance/fork.feature b/features/guidance/fork.feature index 879584aae..4136ba48c 100644 --- a/features/guidance/fork.feature +++ b/features/guidance/fork.feature @@ -7,9 +7,11 @@ Feature: Fork Instructions Scenario: Fork Same Road Class Given the node map - | | | | | c | - | a | | b | | | - | | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -24,9 +26,11 @@ Feature: Fork Instructions Scenario: Don't Fork On Single Road Given the node map - | | | | | c | - | a | | b | | | - | | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | oneway | @@ -40,8 +44,10 @@ Feature: Fork Instructions Scenario: Don't Fork On Single Road Given the node map - | | | | | | | c | - | a | | b | | d | | | + """ + c + a b d + """ And the ways | nodes | highway | oneway | name | @@ -55,9 +61,11 @@ Feature: Fork Instructions Scenario: Do not fork on link type Given the node map - | | | | | c | - | a | | b | | | - | | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -72,9 +80,11 @@ Feature: Fork Instructions Scenario: Fork in presence of other roads Given the node map - | | | | | c | - | a | | b | | | - | | e | | | d | + """ + c + a b + e d + """ And the ways | nodes | highway | @@ -90,10 +100,12 @@ Feature: Fork Instructions Scenario: Fork Turning Slight Left Given the node map - | | | | | | c | - | | | | | | | - | a | | b | | | | - | | | | | d | | + """ + c + + a b + d + """ And the ways | nodes | highway | @@ -108,10 +120,12 @@ Feature: Fork Instructions Scenario: Fork Turning Slight Right Given the node map - | | | | | c | | - | a | | b | | | | - | | | | | | | - | | | | | | d | + """ + c + a b + + d + """ And the ways | nodes | highway | @@ -126,9 +140,11 @@ Feature: Fork Instructions Scenario: Do not fork on service Given the node map - | | | | | c | - | a | | b | | | - | | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -142,9 +158,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Slight Right Given the node map - | a | | b | | | | - | | | | | | c | - | | | | | | d | + """ + a b + c + d + """ And the ways | nodes | highway | @@ -159,9 +177,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Slight Left Given the node map - | | | | | | c | - | | | | | | d | - | a | | b | | | | + """ + c + d + a b + """ And the ways | nodes | highway | @@ -176,9 +196,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Slight Right - Unnamed Given the node map - | a | | b | | | | - | | | | | | c | - | | | | | | d | + """ + a b + c + d + """ And the ways | nodes | highway | name | @@ -193,9 +215,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Slight Left - Unnamed Given the node map - | | | | | | c | - | | | | | | d | - | a | | b | | | | + """ + c + d + a b + """ And the ways | nodes | highway | name | @@ -210,9 +234,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Very Slightly Right - Unnamed Given the node map - | a | | b | | | | | | | | | | | | | | | | - | | | | | | | | | | | | c | | | | | | | - | | | | | | | | | | | | | | | | | | d | + """ + a b + c + d + """ And the ways | nodes | highway | name | @@ -227,9 +253,11 @@ Feature: Fork Instructions Scenario: Fork Both Turning Very Slightly Right - Unnamed Ramps Given the node map - | a | | b | | | | | | | | | | | | | | | | - | | | | | | | | | | | | c | | | | | | | - | | | | | | | | | | | | | | | | | | d | + """ + a b + c + d + """ And the ways | nodes | highway | name | @@ -244,9 +272,11 @@ Feature: Fork Instructions Scenario: Non-Fork on complex intersection - left Given the node map - | | | | | c | - | a | | b | | | - | | e | | | d | + """ + c + a b + e d + """ And the ways | nodes | highway | @@ -261,9 +291,11 @@ Feature: Fork Instructions Scenario: Non-Fork on complex intersection - right Given the node map - | | e | | | c | - | a | | b | | | - | | | | | d | + """ + e c + a b + d + """ And the ways | nodes | highway | @@ -278,9 +310,11 @@ Feature: Fork Instructions Scenario: Tripple fork Given the node map - | | | | | | | | | c | - | a | | b | | d | | | | | - | | | | | | | | | e | + """ + c + a b d + e + """ And the ways | nodes | highway | @@ -297,9 +331,11 @@ Feature: Fork Instructions Scenario: Tripple fork -- middle obvious Given the node map - | | | | | c | - | a | | b | | d | - | | | | | e | + """ + c + a b d + e + """ And the ways | nodes | highway | @@ -315,8 +351,10 @@ Feature: Fork Instructions Scenario: Don't Fork when leaving Road Given the node map - | a | | b | | c | - | | | | | d | + """ + a b c + d + """ And the ways | nodes | highway | @@ -330,8 +368,10 @@ Feature: Fork Instructions Scenario: Fork on motorway links - don't fork on through Given the node map - | i | | | | | a | - | j | | c | b | | x | + """ + i a + j c b x + """ And the ways | nodes | name | highway | diff --git a/features/guidance/intersections.feature b/features/guidance/intersections.feature index 78f3fdf7c..fe8b79919 100644 --- a/features/guidance/intersections.feature +++ b/features/guidance/intersections.feature @@ -7,8 +7,10 @@ Feature: Intersections Data Scenario: Passing Three Way South Given the node map - | a | | b | | c | - | | | d | | | + """ + a b c + d + """ And the ways | nodes | name | @@ -22,8 +24,10 @@ Feature: Intersections Data Scenario: Passing Three Way North Given the node map - | | | d | | | - | a | | b | | c | + """ + d + a b c + """ And the ways | nodes | name | @@ -37,8 +41,10 @@ Feature: Intersections Data Scenario: Passing Oneway Street In Given the node map - | | | d | | | - | a | | b | | c | + """ + d + a b c + """ And the ways | nodes | name | oneway | @@ -52,8 +58,10 @@ Feature: Intersections Data Scenario: Passing Oneway Street Out Given the node map - | | | d | | | - | a | | b | | c | + """ + d + a b c + """ And the ways | nodes | name | oneway | @@ -67,9 +75,11 @@ Feature: Intersections Data Scenario: Passing Two Intersections Given the node map - | | | e | | | | | - | a | | b | | c | | d | - | | | | | f | | | + """ + e + a b c d + f + """ And the ways | nodes | name | @@ -85,9 +95,11 @@ Feature: Intersections Data Scenario: Passing Two Intersections, Collapsing Given the node map - | | | e | | | | | - | a | | b | | c | | d | - | | | | | f | | | + """ + e + a b c d + f + """ And the ways | nodes | name | @@ -104,17 +116,19 @@ Feature: Intersections Data Scenario: Roundabouts Given the node map - | | | | | e | | | | | - | | | | | | | | | | - | | | | | a | | | | | - | | | | 1 | | 4 | | | | - | | | | | | | | | | - | f | | b | | | | d | | h | - | | | | | | | | | | - | | | | 2 | | 3 | | | | - | | | | | c | | | | | - | | | | | | | | | | - | | | | | g | | | | | + """ + e + + a + 1 4 + + f b d h + + 2 3 + c + + g + """ And the ways | nodes | junction | diff --git a/features/guidance/merge.feature b/features/guidance/merge.feature index 2b52ba75d..d34170a5f 100644 --- a/features/guidance/merge.feature +++ b/features/guidance/merge.feature @@ -8,9 +8,11 @@ Feature: Merging @merge Scenario: Merge on Four Way Intersection Given the node map - | d | | | | | | | | | | - | a | | b | | | | | | | c | - | e | | | | | | | | | | + """ + d + a b c + e + """ And the ways | nodes | highway | @@ -26,8 +28,10 @@ Feature: Merging @merge Scenario: Merge on Three Way Intersection Right Given the node map - | d | | | | | | | | | | - | a | | b | | | | | | | c | + """ + d + a b c + """ And the ways | nodes | highway | @@ -41,8 +45,10 @@ Feature: Merging @merge @negative Scenario: Don't Merge on Short-Three Way Intersection Right Given the node map - | d | | | | | | | | - | a | | b | | | | | c | + """ + d + a b c + """ And the ways | nodes | highway | @@ -57,8 +63,10 @@ Feature: Merging @merge Scenario: Merge on Three Way Intersection Right Given the node map - | a | | b | | | | | | | c | - | d | | | | | | | | | | + """ + a b c + d + """ And the ways | nodes | highway | @@ -72,23 +80,25 @@ Feature: Merging @merge Scenario: Merge onto a turning road Given the node map - | | | | | | | e | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | d | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | | | | - | | | | | c | | | - | | | | b | | | | - | a | | | | | | f | + """ + e + + + + + + + + + d + + + + + c + b + a f + """ And the ways | nodes | highway | name | @@ -103,8 +113,10 @@ Feature: Merging @merge Scenario: Merge onto a motorway Given the node map - | d | | | | | | | | | | - | a | | | b | | | | | | c | + """ + d + a b c + """ And the ways | nodes | name | highway | oneway | diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature index f560a3bfc..e86e22d26 100644 --- a/features/guidance/motorway.feature +++ b/features/guidance/motorway.feature @@ -7,8 +7,10 @@ Feature: Motorway Guidance Scenario: Ramp Exit Right Given the node map - | a | b | c | d | e | - | | | | f | g | + """ + a b c d e + f g + """ And the ways | nodes | highway | oneway | @@ -22,9 +24,11 @@ Feature: Motorway Guidance Scenario: Ramp Exit Right Curved Right Given the node map - | a | b | c | | | - | | | f | d | | - | | | | g | e | + """ + a b c + f d + g e + """ And the ways | nodes | highway | oneway | @@ -38,9 +42,11 @@ Feature: Motorway Guidance Scenario: Ramp Exit Right Curved Left Given the node map - | | | | | e | - | | | | d | g | - | a | b | c | f | | + """ + e + d g + a b c f + """ And the ways @@ -56,8 +62,10 @@ Feature: Motorway Guidance Scenario: Ramp Exit Left Given the node map - | | | | f | g | - | a | b | c | d | e | + """ + f g + a b c d e + """ And the ways | nodes | highway | oneway | @@ -71,9 +79,11 @@ Feature: Motorway Guidance Scenario: Ramp Exit Left Curved Left Given the node map - | | | | g | e | - | | | f | d | | - | a | b | c | | | + """ + g e + f d + a b c + """ And the ways | nodes | highway | oneway | @@ -87,9 +97,11 @@ Feature: Motorway Guidance Scenario: Ramp Exit Left Curved Right Given the node map - | a | b | c | f | | - | | | | d | g | - | | | | | e | + """ + a b c f + d g + e + """ And the ways | nodes | highway | oneway | @@ -103,8 +115,10 @@ Feature: Motorway Guidance Scenario: On Ramp Right Given the node map - | a | b | c | d | e | - | f | g | | | | + """ + a b c d e + f g + """ And the ways | nodes | highway | oneway | @@ -118,8 +132,10 @@ Feature: Motorway Guidance Scenario: On Ramp Left Given the node map - | f | g | | | | - | a | b | c | d | e | + """ + f g + a b c d e + """ And the ways | nodes | highway | oneway | @@ -133,9 +149,11 @@ Feature: Motorway Guidance Scenario: Highway Fork Given the node map - | | | | | d | e | - | a | b | c | | | | - | | | | | f | g | + """ + d e + a b c + f g + """ And the ways | nodes | highway | @@ -149,9 +167,11 @@ Feature: Motorway Guidance Scenario: Fork After Ramp Given the node map - | | | | | d | e | - | a | b | c | | | | - | | | | | f | g | + """ + d e + a b c + f g + """ And the ways | nodes | highway | oneway | @@ -166,8 +186,10 @@ Feature: Motorway Guidance Scenario: On And Off Ramp Right Given the node map - | a | b | | c | | d | e | - | f | g | | | | h | i | + """ + a b c d e + f g h i + """ And the ways | nodes | highway | oneway | @@ -184,8 +206,10 @@ Feature: Motorway Guidance Scenario: On And Off Ramp Left Given the node map - | f | g | | | | h | i | - | a | b | | c | | d | e | + """ + f g h i + a b c d e + """ And the ways | nodes | highway | oneway | @@ -202,9 +226,11 @@ Feature: Motorway Guidance Scenario: Merging Motorways Given the node map - | e | | | - | a | b | c | - | d | | | + """ + e + a b c + d + """ And the ways | nodes | highway | @@ -219,9 +245,11 @@ Feature: Motorway Guidance Scenario: Handle 90 degree off ramps correctly Given the node map - | a | | | | | - | x | b | | c | y | - | | | | d | | + """ + a + x b c y + d + """ And the ways | nodes | name | highway | oneway | diff --git a/features/guidance/new-name.feature b/features/guidance/new-name.feature index 9ff97561b..978e759da 100644 --- a/features/guidance/new-name.feature +++ b/features/guidance/new-name.feature @@ -7,7 +7,9 @@ Feature: New-Name Instructions Scenario: Undisturbed name Change Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | @@ -21,8 +23,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with unannounced Turn Right Given the node map - | a | | b | | | - | | | | | c | + """ + a b + c + """ And the ways | nodes | @@ -35,8 +39,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with unannounced Turn Left Given the node map - | | | | | c | - | a | | b | | | + """ + c + a b + """ And the ways | nodes | @@ -49,8 +55,10 @@ Feature: New-Name Instructions Scenario: Disturbed Name Change with Turn Given the node map - | a | | b | | | - | | d | | | c | + """ + a b + d c + """ And the ways | nodes | @@ -64,8 +72,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with announced Turn Left Given the node map - | | | c | - | a | | b | + """ + c + a b + """ And the ways | nodes | @@ -78,8 +88,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with announced Turn Sharp Left Given the node map - | c | | | - | a | | b | + """ + c + a b + """ And the ways | nodes | @@ -92,8 +104,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with announced Turn Right Given the node map - | a | | b | - | | | c | + """ + a b + c + """ And the ways | nodes | @@ -106,8 +120,10 @@ Feature: New-Name Instructions Scenario: Undisturbed Name Change with announced Turn Sharp Right Given the node map - | a | | b | - | c | | | + """ + a b + c + """ And the ways | nodes | @@ -121,8 +137,10 @@ Feature: New-Name Instructions Scenario: Disturbed Name Change with minor road class Given the node map - | a | | b | | d | - | | | | | c | + """ + a b d + c + """ And the ways | nodes | highway | oneway | @@ -136,7 +154,9 @@ Feature: New-Name Instructions Scenario: Empty road names - Announce Change From, suppress Change To Given the node map - | a | | b | 1 | c | | d | + """ + a b 1 c d + """ And the ways | nodes | name | @@ -151,7 +171,9 @@ Feature: New-Name Instructions Scenario: Empty road names - Loose name shortly Given the node map - | a | | b | | c | | d | | e | + """ + a b c d e + """ And the ways | nodes | name | @@ -167,7 +189,9 @@ Feature: New-Name Instructions Scenario: Both Name and Ref Empty Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -180,7 +204,9 @@ Feature: New-Name Instructions Scenario: Same Name, Ref Extended Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -193,7 +219,9 @@ Feature: New-Name Instructions Scenario: Same Name, Ref Removed Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -206,7 +234,9 @@ Feature: New-Name Instructions Scenario: Name Removed, Ref Extended Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -219,7 +249,9 @@ Feature: New-Name Instructions Scenario: Name Added, Ref Removed Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -232,7 +264,9 @@ Feature: New-Name Instructions Scenario: Prefix Change Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -245,7 +279,9 @@ Feature: New-Name Instructions Scenario: Prefix Change Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -258,7 +294,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -271,7 +309,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -284,7 +324,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -297,7 +339,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -310,7 +354,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | @@ -323,7 +369,9 @@ Feature: New-Name Instructions Scenario: No Name, Same Reference Given the node map - | a | | | | b | | | | c | + """ + a b c + """ And the ways | nodes | name | ref | highway | diff --git a/features/guidance/notification.feature b/features/guidance/notification.feature index f6f17ae2b..b9a4e0162 100644 --- a/features/guidance/notification.feature +++ b/features/guidance/notification.feature @@ -7,9 +7,11 @@ Feature: Notification on turn onto mode change Scenario: Turn onto a Ferry Given the node map - | f | | | | | - | b | | | d | | - | a | | | | e | + """ + f + b d + a e + """ And the ways | nodes | highway | route | name | @@ -23,9 +25,11 @@ Feature: Notification on turn onto mode change Scenario: Turn onto a Ferry Given the node map - | h | | | g | - | a | c | | e | - | b | | | f | + """ + h g + a c e + b f + """ And the ways | nodes | highway | route | name | @@ -41,10 +45,12 @@ Feature: Notification on turn onto mode change Scenario: Straight onto a Ferry Given the node map - | | | | | | - | | c | d | | i | - | a | | | | | - | | | | f | | + """ + + c d i + a + f + """ And the ways | nodes | highway | route | name | diff --git a/features/guidance/perception.feature b/features/guidance/perception.feature index 3a6f2cfae..e0eeea7f8 100644 --- a/features/guidance/perception.feature +++ b/features/guidance/perception.feature @@ -7,15 +7,17 @@ Feature: Simple Turns Scenario: Turning into splitting road Given the node map - | | a | | | - | | b | | | - | | | | | - | | | | | - | c | | d | | - | | | | | - | | | | e | - | | | | | - | | | f | | + """ + a + b + + + c d + + e + + f + """ And the ways | nodes | name | highway | oneway | @@ -31,18 +33,20 @@ Feature: Simple Turns Scenario: Middle Island Given the node map - | | a | | - | | | | - | | b | | - | c | | h | - | | | | - | | | | - | | | | - | | | | - | d | | g | - | | e | | - | | | | - | | f | | + """ + a + + b + c h + + + + + d g + e + + f + """ And the ways | nodes | name | oneway | @@ -60,18 +64,20 @@ Feature: Simple Turns Scenario: Middle Island Over Bridge Given the node map - | | a | | - | | | | - | | b | | - | c | | h | - | | | | - | | | | - | 1 | | 2 | - | | | | - | d | | g | - | | e | | - | | | | - | | f | | + """ + a + + b + c h + + + 1 2 + + d g + e + + f + """ And the ways | nodes | name | oneway | @@ -96,19 +102,21 @@ Feature: Simple Turns @negative Scenario: Don't Collapse Places: Given the node map - | | | | | | | h | | | | | | | - | | | | | | | g | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | a | b | | | | | | | | | | e | f | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | c | | | | | | | - | | | | | | | d | | | | | | | + """ + h + g + + + + + a b e f + + + + + c + d + """ And the ways | nodes | name | oneway | diff --git a/features/guidance/post-processing.feature b/features/guidance/post-processing.feature index 27e19b08f..61e55fa2a 100644 --- a/features/guidance/post-processing.feature +++ b/features/guidance/post-processing.feature @@ -8,9 +8,11 @@ Feature: General Post-Processing related features # this testcase used to crash geometry generation (at that time handled during intersection generation) Scenario: Regression test #2424 Given the node map - | | | e | | | | | | i | | | | | - | a | | b | | c | | d | | h | | k | | m | - | | | | | f | | | | | | l | | | + """ + e i + a b c d h k m + f l + """ And the ways | nodes | name | diff --git a/features/guidance/ramp.feature b/features/guidance/ramp.feature index 0d7acb97b..1b3280c70 100644 --- a/features/guidance/ramp.feature +++ b/features/guidance/ramp.feature @@ -7,8 +7,10 @@ Feature: Ramp Guidance Scenario: Ramp On Through Street Right Given the node map - | a | b | c | - | | d | | + """ + a b c + d + """ And the ways | nodes | highway | @@ -21,8 +23,10 @@ Feature: Ramp Guidance Scenario: Ramp On Through Street Left Given the node map - | | d | | - | a | b | c | + """ + d + a b c + """ And the ways | nodes | highway | @@ -35,9 +39,11 @@ Feature: Ramp Guidance Scenario: Ramp On Through Street Left and Right Given the node map - | | e | | - | a | b | c | - | | d | | + """ + e + a b c + d + """ And the ways | nodes | highway | @@ -52,8 +58,10 @@ Feature: Ramp Guidance Scenario: Ramp On Three Way Intersection Right Given the node map - | a | b | c | - | | d | | + """ + a b c + d + """ And the ways | nodes | highway | @@ -67,9 +75,11 @@ Feature: Ramp Guidance Scenario: Ramp On Three Way Intersection Right Given the node map - | | | c | - | a | b | | - | | d | | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -83,9 +93,11 @@ Feature: Ramp Guidance Scenario: Ramp Off Though Street Given the node map - | | | | | c | - | a | | | b | | - | | | | d | | + """ + c + a b + d + """ And the ways | nodes | highway | oneway | @@ -99,8 +111,10 @@ Feature: Ramp Guidance Scenario: Straight Ramp Off Turning Though Street Given the node map - | | | c | - | a | b | d | + """ + c + a b d + """ And the ways | nodes | highway | @@ -114,9 +128,11 @@ Feature: Ramp Guidance Scenario: Fork Ramp Off Turning Though Street Given the node map - | | | c | - | a | b | | - | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -130,9 +146,11 @@ Feature: Ramp Guidance Scenario: Fork Ramp Given the node map - | | | c | - | a | b | | - | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -147,9 +165,11 @@ Feature: Ramp Guidance Scenario: Fork Slight Ramp Given the node map - | | | | c | - | a | b | | | - | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -164,9 +184,11 @@ Feature: Ramp Guidance Scenario: Fork Slight Ramp on Through Street Given the node map - | | | | c | - | a | b | | | - | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -180,9 +202,11 @@ Feature: Ramp Guidance Scenario: Fork Slight Ramp on Obvious Through Street Given the node map - | | | | c | - | a | b | | | - | | | | d | + """ + c + a b + d + """ And the ways | nodes | highway | @@ -196,9 +220,11 @@ Feature: Ramp Guidance Scenario: Two Ramps Joining into common Motorway Given the node map - | a | | | | - | | | c | d | - | b | | | | + """ + a + c d + b + """ And the ways | nodes | highway | @@ -213,9 +239,11 @@ Feature: Ramp Guidance Scenario: Two Ramps Joining into common Motorway Unnamed Given the node map - | a | | | | - | | | c | d | - | b | | | | + """ + a + c d + b + """ And the ways | nodes | highway | name | diff --git a/features/guidance/rotary-bike.feature b/features/guidance/rotary-bike.feature index 512b81580..bc55e5de4 100644 --- a/features/guidance/rotary-bike.feature +++ b/features/guidance/rotary-bike.feature @@ -7,11 +7,13 @@ Feature: Rotary Scenario: Enter and Exit Given the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | @@ -38,11 +40,13 @@ Feature: Rotary Scenario: Only Enter Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -69,11 +73,13 @@ Feature: Rotary Scenario: Only Exit Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -101,11 +107,13 @@ Feature: Rotary Scenario: Drive Around Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -133,11 +141,13 @@ Feature: Rotary #needs to be adjusted when name-discovery works for entrys Scenario: Mixed Entry and Exit Given the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | diff --git a/features/guidance/rotary.feature b/features/guidance/rotary.feature index 178847682..9a685be80 100644 --- a/features/guidance/rotary.feature +++ b/features/guidance/rotary.feature @@ -7,11 +7,13 @@ Feature: Rotary Scenario: Enter and Exit Given the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | @@ -38,11 +40,13 @@ Feature: Rotary Scenario: Only Enter Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -69,11 +73,13 @@ Feature: Rotary Scenario: Only Exit Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -101,11 +107,13 @@ Feature: Rotary Scenario: Drive Around Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -133,11 +141,13 @@ Feature: Rotary #needs to be adjusted when name-discovery works for entrys Scenario: Mixed Entry and Exit Given the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | @@ -168,10 +178,12 @@ Feature: Rotary Scenario: Collinear in X,Y Given the node map - | a | | | - | b | | | - | c | d | f | - | e | | | + """ + a + b + c d f + e + """ And the ways | nodes | junction | @@ -187,10 +199,12 @@ Feature: Rotary Scenario: Collinear in X,Y Given the node map - | a | | | - | d | | | - | b | c | f | - | e | | | + """ + a + d + b c f + e + """ And the ways | nodes | junction | @@ -206,10 +220,12 @@ Feature: Rotary Scenario: Collinear in X,Y Given the node map - | a | | | - | c | | | - | d | b | f | - | e | | | + """ + a + c + d b f + e + """ And the ways | nodes | junction | @@ -225,10 +241,12 @@ Feature: Rotary Scenario: Collinear in X,Y Given the node map - | f | | | - | d | c | e | - | | b | | - | | a | | + """ + f + d c e + b + a + """ And the ways | nodes | junction | @@ -244,10 +262,12 @@ Feature: Rotary Scenario: Collinear in X,Y Given the node map - | f | | | - | d | c | e | - | b | | | - | a | | | + """ + f + d c e + b + a + """ And the ways | nodes | junction | diff --git a/features/guidance/roundabout-bike.feature b/features/guidance/roundabout-bike.feature index b50b7a5f0..9d9389eac 100644 --- a/features/guidance/roundabout-bike.feature +++ b/features/guidance/roundabout-bike.feature @@ -7,11 +7,13 @@ Feature: Basic Roundabout Scenario: Only Enter Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -38,11 +40,13 @@ Feature: Basic Roundabout Scenario: Only Exit Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -70,11 +74,13 @@ Feature: Basic Roundabout Scenario: Drive Around Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -101,11 +107,13 @@ Feature: Basic Roundabout Scenario: Mixed Entry and Exit Given the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | diff --git a/features/guidance/roundabout-turn-bike.feature b/features/guidance/roundabout-turn-bike.feature index 77aa20c24..ce7e3649e 100644 --- a/features/guidance/roundabout-turn-bike.feature +++ b/features/guidance/roundabout-turn-bike.feature @@ -7,11 +7,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit Given the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | diff --git a/features/guidance/roundabout-turn.feature b/features/guidance/roundabout-turn.feature index 00b7644a0..e846daab1 100644 --- a/features/guidance/roundabout-turn.feature +++ b/features/guidance/roundabout-turn.feature @@ -7,11 +7,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit Given the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | @@ -38,10 +40,12 @@ Feature: Basic Roundabout Scenario: Enter and Exit - Rotated Given the node map - | a | | | d | - | | b | c | | - | | g | e | | - | h | | | f | + """ + a d + b c + g e + h f + """ And the ways | nodes | junction | @@ -68,11 +72,13 @@ Feature: Basic Roundabout Scenario: Only Enter Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -99,11 +105,13 @@ Feature: Basic Roundabout Scenario: Only Exit Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -131,11 +139,13 @@ Feature: Basic Roundabout Scenario: Drive Around Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -162,11 +172,13 @@ Feature: Basic Roundabout Scenario: Mixed Entry and Exit - Not an Intersection Given the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | @@ -197,11 +209,13 @@ Feature: Basic Roundabout Scenario: Segregated roads - Not an intersection Given the node map - | | a | | c | | - | l | | b | | d | - | | k | | e | | - | j | | h | | f | - | | i | | g | | + """ + a c + l b d + k e + j h f + i g + """ And the ways | nodes | junction | oneway | @@ -232,8 +246,10 @@ Feature: Basic Roundabout Scenario: Collinear in X Given the node map - | a | b | c | d | f | - | | | e | | | + """ + a b c d f + e + """ And the ways | nodes | junction | @@ -249,11 +265,13 @@ Feature: Basic Roundabout Scenario: Collinear in Y Given the node map - | | a | - | | b | - | e | c | - | | d | - | | f | + """ + a + b + e c + d + f + """ And the ways | nodes | junction | @@ -269,10 +287,12 @@ Feature: Basic Roundabout Scenario: Collinear in X,Y Given the node map - | a | | | - | b | | | - | c | d | f | - | e | | | + """ + a + b + c d f + e + """ And the ways | nodes | junction | @@ -288,10 +308,12 @@ Feature: Basic Roundabout Scenario: Collinear in X,Y Given the node map - | a | | | - | d | | | - | b | c | f | - | e | | | + """ + a + d + b c f + e + """ And the ways | nodes | junction | @@ -307,10 +329,12 @@ Feature: Basic Roundabout Scenario: Collinear in X,Y Given the node map - | a | | | - | c | | | - | d | b | f | - | e | | | + """ + a + c + d b f + e + """ And the ways | nodes | junction | @@ -326,11 +350,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit -- too complex Given the node map - | j | | a | | | - | | i | b | | | - | | g | | c | d | - | h | | e | | | - | | | f | | | + """ + j a + i b + g c d + h e + f + """ And the ways | nodes | junction | @@ -358,11 +384,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit -- Non-Distinct Given the node map - | | | a | | | - | | | b | | | - | | g | | c | d | - | | | e | | | - | h | | f | | | + """ + a + b + g c d + e + h f + """ And the ways | nodes | junction | @@ -389,11 +417,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit -- Bearing Given the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | @@ -411,13 +441,15 @@ Feature: Basic Roundabout Scenario: Enter and Exit - Bearings Given the node map - | | | | a | | | | - | | | | | | | | - | | | i | b | l | | | - | h | | g | | c | | d | - | | | j | e | k | | | - | | | | | | | | - | | | | f | | | | + """ + a + + i b l + h g c d + j e k + + f + """ And the ways | nodes | junction | @@ -437,19 +469,21 @@ Feature: Basic Roundabout # http://www.openstreetmap.org/way/348812150 # Note: grid size is 3 meter, this roundabout is more like 5-10 meters in radius Given the node map - | | | | a | | | | | | - | | | | | | | | | | - | | | | b | | n | | | | - | | | | | | | | | | - | | | c | | | | m | | | - | | | | | | | | | | - | e | | d | | | | k | | l | - | | | | | | | | | | - | | | f | | | | j | | | - | | | | | | | | | | - | | | | g | | i | | | | - | | | | | | | | | | - | | | | h | | | | | | + """ + a + + b n + + c m + + e d k l + + f j + + g i + + h + """ And the ways | nodes | junction | highway | name | @@ -476,11 +510,13 @@ Feature: Basic Roundabout Scenario: Enter and Exit - Traffic Signals Given the node map - | | | a | | | - | | i | b | l | | - | h | g | | c | d | - | | j | e | k | | - | | | f | | | + """ + a + i b l + h g c d + j e k + f + """ And the nodes | node | highway | @@ -516,11 +552,13 @@ Feature: Basic Roundabout #at some point we probably want to recognise these situations and don't mention the roundabout at all here Scenario: Enter And Exit Throughabout Given the node map - | | | | | | h | | | | | - | | | | | | | | | | | - | c | b | | d | | | | e | | f | - | | | | | | | | | | | - | | a | | | | g | | | | | + """ + h + + c b d e f + + a g + """ And the ways | nodes | highway | name | junction | oneway | diff --git a/features/guidance/roundabout.feature b/features/guidance/roundabout.feature index 56af30c48..e7f73ae4c 100644 --- a/features/guidance/roundabout.feature +++ b/features/guidance/roundabout.feature @@ -7,11 +7,13 @@ Feature: Basic Roundabout Scenario: Only Enter Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -39,13 +41,11 @@ Feature: Basic Roundabout #2927 Scenario: Only Roundabout Given the node map - | | | a | | | - | | | | | | - | | | | | | - | b | | | | d | - | | | | | | - | | | | | | - | | | c | | | + """ + a + b d + c + """ And the ways | nodes | junction | @@ -57,11 +57,13 @@ Feature: Basic Roundabout Scenario: Only Exit Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -89,11 +91,13 @@ Feature: Basic Roundabout Scenario: Drive Around Given the node map - | | | a | | | - | | | b | | | - | d | c | | g | h | - | | | e | | | - | | | f | | | + """ + a + b + d c g h + e + f + """ And the ways | nodes | junction | @@ -120,11 +124,13 @@ Feature: Basic Roundabout Scenario: Mixed Entry and Exit Given the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | @@ -155,13 +161,15 @@ Feature: Basic Roundabout Scenario: Mixed Entry and Exit - segregated roads Given the node map - | | | a | | c | | | - | | | | | | | | - | l | | | b | | | d | - | | | k | | e | | | - | j | | | h | | | f | - | | | | | | | | - | | | i | | g | | | + """ + a c + + l b d + k e + j h f + + i g + """ And the ways | nodes | junction | oneway | @@ -192,13 +200,15 @@ Feature: Basic Roundabout Scenario: Mixed Entry and Exit - segregated roads, different names Given the node map - | | | a | | c | | | - | | | | | | | | - | l | | | b | | | d | - | | | k | | e | | | - | j | | | h | | | f | - | | | | | | | | - | | | i | | g | | | + """ + a c + + l b d + k e + j h f + + i g + """ And the ways | nodes | junction | oneway | @@ -234,21 +244,23 @@ Feature: Basic Roundabout Scenario: Motorway Roundabout #See 39.933742 -75.082345 Given the node map - | | | | | l | | | | a | | i | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | | | b | | | | | - | | | | c | | | | | | | | - | | | | | | | | | | | | - | | | | | | | | | h | | | - | n | | | | | | | | | | | - | | | | | | | | | | | | - | | | d | | | | | | | | j | - | | | | | | | | | | | | - | | | | | m | | | g | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | e | | f | | | | | | | + """ + l a i + + + b + c + + h + n + + d j + + m g + + + e f + """ And the ways | nodes | junction | name | highway | oneway | ref | @@ -272,15 +284,17 @@ Feature: Basic Roundabout Scenario: Double Roundabout with through-lane #http://map.project-osrm.org/?z=18¢er=38.911752%2C-77.048667&loc=38.912003%2C-77.050831&loc=38.909277%2C-77.042516&hl=en&alt=0 Given the node map - | | | | | o | | | | | | | | | | | | n | | | | | - | | | | | e | | | | | | | | | | | | j | | | | | - | | | | | | | | | | | | | | | | | | | | | | - | | | | | | | q | | | | | | | | | | | | | | | - | a | | b | | | | | | s | | f | | | | g | | | | i | | k | - | | | | | | | r | | | | | | | | | | | p | | | | - | | | | | | | | | | | t | | | | | | | | | | | - | | | | | c | | d | | | | | | | | | | h | | | | | - | | | | | l | | | | | | | | | | | | m | | | | | + """ + o n + e j + + q + a b s f g i k + r p + t + c d h + l m + """ And the nodes | node | highway | @@ -311,36 +325,38 @@ Feature: Basic Roundabout #2856 - http://www.openstreetmap.org/#map=19/47.23318/-1.56563 Scenario: Linked Roundabouts Given the node map - | | | | | | | | | | | | | | x | - | | u | | | | | | | | | | | r | | - | | | | | | | | | | | | | | | - | | | | t | | | | | | | | | | | - | | | | | | | | | | | s | | | | - | | | v | | | i | | h | | g | | | | | - | | | | | | | | | | | | q | | | - | | | | | | | | | | | | | | | - | | | | j | | | | | | | | f | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | a | | | | | | | | e | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | b | | c | | d | | p | | | - | | | | | | | | | | | | | | | - | | | m | | | | | | | | n | | | | - | | | | | l | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | k | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | - | | w | | | | | | | | | | o | | | + """ + x + u r + + t + s + v i h g + q + + j f + + + a e + + + b c d p + + m n + l + + + + + + + + k + + + + w o + """ And the ways | nodes | junction | name | highway | oneway | diff --git a/features/guidance/staggered-intersections.feature b/features/guidance/staggered-intersections.feature index 63e0dc5c9..4c8bcdd15 100644 --- a/features/guidance/staggered-intersections.feature +++ b/features/guidance/staggered-intersections.feature @@ -9,12 +9,14 @@ Feature: Staggered Intersections # https://www.openstreetmap.org/#map=19/39.26022/-84.25144 Scenario: Staggered Intersection: Oak St, Cedar Dr Given the node map - | | | j | | | - | a | b | c | | | - | | | d | | | - | | | e | f | g | - | | | h | | | - | | | i | | | + """ + j + a b c + d + e f g + h + i + """ And the ways | nodes | highway | name | @@ -29,16 +31,18 @@ Feature: Staggered Intersections Scenario: Staggered Intersection: do not collapse if long segment in between Given the node map - | | | j | | | - | a | b | c | | | - | | | | | | - | | | | | | - | | | d | | | - | | | | | | - | | | | | | - | | | e | f | g | - | | | h | | | - | | | i | | | + """ + j + a b c + + + d + + + e f g + h + i + """ And the ways | nodes | highway | name | @@ -53,12 +57,14 @@ Feature: Staggered Intersections Scenario: Staggered Intersection: do not collapse if not left-right or right-left Given the node map - | | | j | | | - | a | b | c | | | - | | | d | | | - | g | f | e | | | - | | | h | | | - | | | i | | | + """ + j + a b c + d + g f e + h + i + """ And the ways | nodes | highway | name | @@ -73,12 +79,14 @@ Feature: Staggered Intersections Scenario: Staggered Intersection: do not collapse if the names are not the same Given the node map - | | | j | | | - | a | b | c | | | - | | | d | | | - | | | e | f | g | - | | | h | | | - | | | i | | | + """ + j + a b c + d + e f g + h + i + """ And the ways | nodes | highway | name | diff --git a/features/guidance/suffix-changes.feature b/features/guidance/suffix-changes.feature index ae7a79a45..076c0e798 100644 --- a/features/guidance/suffix-changes.feature +++ b/features/guidance/suffix-changes.feature @@ -7,7 +7,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Suffix To Suffix Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | @@ -20,7 +22,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Suffix To Suffix Ref Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -33,7 +37,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Prefix Change Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | @@ -46,7 +52,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Prefix Change ref Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | @@ -59,7 +67,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Prefix Change and Reference Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | ref | @@ -72,8 +82,10 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Suffix To Suffix - Turn Given the node map - | a | | b | | c | - | | | d | | | + """ + a b c + d + """ And the ways | nodes | name | @@ -88,7 +100,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: Suffix To No Suffix Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | @@ -101,7 +115,9 @@ Feature: Suppress New Names on dedicated Suffices Scenario: No Suffix To Suffix Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | name | diff --git a/features/guidance/suppressed.feature b/features/guidance/suppressed.feature index 02555add5..5f67201e9 100644 --- a/features/guidance/suppressed.feature +++ b/features/guidance/suppressed.feature @@ -7,8 +7,10 @@ Feature: Suppressed Turns Scenario: Do not announce passing a exit ramp Given the node map - | a | b | c | d | e | - | | | | f | g | + """ + a b c d e + f g + """ And the ways | nodes | highway | @@ -21,7 +23,9 @@ Feature: Suppressed Turns Scenario: Do not announce reference changes Given the node map - | a | b | c | d | e | f | + """ + a b c d e f + """ And the ways | nodes | highway | name | ref | @@ -38,8 +42,10 @@ Feature: Suppressed Turns Scenario: Don't Announce Turn on following major road class -- service Given the node map - | a | b | d | - | | | c | + """ + a b d + c + """ And the ways | nodes | highway | @@ -52,8 +58,10 @@ Feature: Suppressed Turns Scenario: Don't Announce Turn on following major road class -- residential Given the node map - | a | b | d | - | | | c | + """ + a b d + c + """ And the ways | nodes | highway | diff --git a/features/guidance/trimming.feature b/features/guidance/trimming.feature index 62808a75c..2be378f7d 100644 --- a/features/guidance/trimming.feature +++ b/features/guidance/trimming.feature @@ -8,38 +8,40 @@ Feature: General Post-Processing related features # this testcase used to crash geometry generation (at that time handled during intersection generation) Scenario: Regression Test 2754 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 | diff --git a/features/guidance/turn-lanes.feature b/features/guidance/turn-lanes.feature index 81c094b8d..7a839ad9c 100644 --- a/features/guidance/turn-lanes.feature +++ b/features/guidance/turn-lanes.feature @@ -8,8 +8,10 @@ Feature: Turn Lane Guidance @simple Scenario: Basic Turn Lane 3-way Turn with empty lanes Given the node map - | a | | b | | c | - | | | d | | | + """ + a b c + d + """ And the ways | nodes | turn:lanes | turn:lanes:forward | turn:lanes:backward | name | @@ -26,8 +28,10 @@ Feature: Turn Lane Guidance Scenario: Basic Turn Lane 3-way Turn with designated lane Given the node map - | a | | b | | c | - | | | d | | | + """ + a b c + d + """ And the ways | nodes | turn:lanes | turn:lanes:forward | name | vehicle:lanes:forward | @@ -43,9 +47,11 @@ Feature: Turn Lane Guidance @simple Scenario: Basic Turn Lane 4-Way Turn Given the node map - | | | e | | | - | a | | b | | c | - | | | d | | | + """ + e + a b c + d + """ And the ways | nodes | turn:lanes | turn:lanes:forward | turn:lanes:backward | name | @@ -66,9 +72,11 @@ Feature: Turn Lane Guidance @simple @none Scenario: Basic Turn Lane 4-Way Turn using none Given the node map - | | | e | | | - | a | | b | | c | - | | | d | | | + """ + e + a b c + d + """ And the ways | nodes | turn:lanes | turn:lanes:forward | turn:lanes:backward | name | @@ -86,9 +94,11 @@ Feature: Turn Lane Guidance @simple @reverse Scenario: Basic Turn Lane 4-Way With U-Turn Lane Given the node map - | | | e | | | - | a | 1 | b | | c | - | | | d | | | + """ + e + a 1 b c + d + """ And the ways | nodes | turn:lanes | turn:lanes:forward | name | @@ -109,9 +119,11 @@ Feature: Turn Lane Guidance @simple @psv @none Scenario: Turn with Bus-Lane Given the node map - | a | | b | | c | - | | | | | | - | | | d | | | + """ + a b c + + d + """ And the ways | nodes | name | turn:lanes:forward | lanes:psv:forward | @@ -126,10 +138,12 @@ Feature: Turn Lane Guidance Scenario: Turn with Bus-Lane Left Given the node map - | | | d | | | | | - | | | | | | | | - | a | | b | | c | | f | - | | | | | e | | | + """ + d + + a b c f + e + """ And the ways | nodes | name | turn:lanes:forward | lanes:psv:forward | oneway | @@ -147,9 +161,11 @@ Feature: Turn Lane Guidance # This tests whether empty/invalid PSV tags cause osrm-extract to crash Scenario: Turn with Bus-Lane Given the node map - | a | | b | | c | - | | | | | | - | | | d | | | + """ + a b c + + d + """ And the ways | nodes | name | turn:lanes:forward | lanes:psv:forward | lanes:psv:backward | @@ -164,9 +180,11 @@ Feature: Turn Lane Guidance @simple @psv Scenario: Turn with Bus-Lane but without lanes Given the node map - | a | | b | | c | - | | | | | | - | | | d | | | + """ + a b c + + d + """ And the ways | nodes | name | lanes:psv | @@ -183,12 +201,14 @@ Feature: Turn Lane Guidance @todo @collapse @partition-lanes Scenario: Turn Lanes at Segregated Road Given the node map - | | | i | l | | | - | | | | | | | - | h | | g | f | | e | - | a | | b | c | | d | - | | | | | | | - | | | j | k | | | + """ + i l + + h g f e + a b c d + + j k + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -228,12 +248,14 @@ Feature: Turn Lane Guidance @collapse @partition-lanes Scenario: Turn Lanes at Segregated Road Given the node map - | | | i | l | | | - | | | | | | | - | h | | g | f | | e | - | a | | b | c | | d | - | | | | | | | - | | | j | k | | | + """ + i l + + h g f e + a b c d + + j k + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -262,10 +284,12 @@ Feature: Turn Lane Guidance @partition-lanes Scenario: Turn Lanes at Segregated Road Given the node map - | | | g | f | | | - | a | | b | c | | d | - | | | | | | | - | | | j | k | | | + """ + g f + a b c d + + j k + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -285,9 +309,11 @@ Feature: Turn Lane Guidance @2654 @previous-lanes Scenario: Turn Lanes Given earlier than actual turn Given the node map - | a | | b | c | | d | - | | | | | | | - | | | | e | | | + """ + a b c d + + e + """ And the ways | nodes | name | turn:lanes:forward | @@ -304,8 +330,10 @@ Feature: Turn Lane Guidance @2654 @previous-lanes Scenario: Turn Lanes Given earlier than actual turn Given the node map - | a | | b | c | d | | e | | f | g | h | | i | - | | | j | | | | | | | | k | | | + """ + a b c d e f g h i + j k + """ And the ways | nodes | name | turn:lanes:forward | turn:lanes:backward | @@ -327,8 +355,10 @@ Feature: Turn Lane Guidance @previous-lanes Scenario: Passing a one-way street Given the node map - | e | | | f | | - | a | | b | c | d | + """ + e f + a b c d + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -344,9 +374,11 @@ Feature: Turn Lane Guidance @partition-lanes Scenario: Passing a one-way street, partly pulled back lanes Given the node map - | e | | | f | | - | a | | b | c | d | - | | | g | | | + """ + e f + a b c d + g + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -365,9 +397,11 @@ Feature: Turn Lane Guidance @partition-lanes @previous-lanes Scenario: Passing a one-way street, partly pulled back lanes, no through Given the node map - | e | | | f | - | a | | b | c | - | | | g | | + """ + e f + a b c + g + """ And the ways | nodes | name | turn:lanes:forward | oneway | @@ -385,10 +419,12 @@ Feature: Turn Lane Guidance @todo @partition-lanes @previous-lanes Scenario: Narrowing Turn Lanes Given the node map - | | | | | g | | - | | | | | | | - | a | | b | c | d | e | - | | | | f | | | + """ + g + + a b c d e + f + """ And the ways | nodes | name | turn:lanes:forward | @@ -408,8 +444,10 @@ Feature: Turn Lane Guidance @previous-lanes Scenario: Turn at a traffic light Given the node map - | a | b | c | d | - | | | e | | + """ + a b c d + e + """ And the nodes | node | highway | @@ -430,17 +468,19 @@ Feature: Turn Lane Guidance @todo @roundabout Scenario: Theodor Heuss Platz Given the node map - | | | | i | o | | | l | | - | | | b | | | | a | | m | - | | c | | | | | | | | - | | | | | | | | h | | - | | | | | | | | | | - | j | | | | | | | | | - | | | | | | | | g | | - | | | | | | | | | | - | | d | | | | | | | | - | | | e | | | | f | | | - | | | | | k | | | | n | + """ + i o l + b a m + c + h + + j + g + + d + e f + k n + """ And the nodes | node | highway | @@ -467,12 +507,14 @@ Feature: Turn Lane Guidance @sliproads Scenario: Turn Lanes Breaking up Given the node map - | | | | g | | - | | | | | | - | | | | c | | - | a | b | | d | e | - | | | | | | - | | | | f | | + """ + g + + c + a b d e + + f + """ And the ways | nodes | name | turn:lanes:forward | oneway | highway | @@ -498,11 +540,13 @@ Feature: Turn Lane Guidance @reverse @previous-lanes Scenario: U-Turn Road at Intersection Given the node map - | | | | | | | h | | - | | | | | f | | e | j | - | a | b | | | | | | | - | | | | | c | | d | i | - | | | | | | | g | | + """ + h + f e j + a b + c d i + g + """ And the ways | nodes | name | turn:lanes:forward | oneway | highway | @@ -532,13 +576,15 @@ Feature: Turn Lane Guidance @reverse Scenario: Segregated Intersection Merges With Lanes Given the node map - | | | | | | | f | - | | | | | | | | - | e | | | d | | | | - | | | | | | c | g | - | a | | | b | | | | - | | | | | | | | - | | | | | | h | | + """ + f + + e d + c g + a b + + h + """ And the ways | nodes | name | turn:lanes:forward | oneway | highway | @@ -557,13 +603,15 @@ Feature: Turn Lane Guidance @todo @roundabout Scenario: Passing Through a Roundabout Given the node map - | | | h | | g | | | - | | a | | | | f | k | - | i | | | | | | | - | | | | | | | | - | | b | | | | e | | - | | | c | | d | | | - | | | | | j | | | + """ + h g + a f k + i + + b e + c d + j + """ And the ways | nodes | name | turn:lanes:forward | oneway | highway | junction | @@ -584,8 +632,10 @@ Feature: Turn Lane Guidance @previous-lanes Scenario: Crossing Traffic Light Given the node map - | a | | b | | c | | d | - | | | | | | | e | + """ + a b c d + e + """ And the nodes | node | highway | @@ -605,8 +655,10 @@ Feature: Turn Lane Guidance @ramp Scenario: Highway Ramp Given the node map - | a | | b | | c | | d | - | | | | | | | e | + """ + a b c d + e + """ And the ways | nodes | name | turn:lanes:forward | highway | @@ -622,10 +674,12 @@ Feature: Turn Lane Guidance @todo Scenario: Turning Off Ramp Given the node map - | | a | | - | d | c | b | - | e | f | g | - | | h | | + """ + a + d c b + e f g + h + """ And the ways | nodes | name | turn:lanes:forward | highway | oneway | @@ -644,10 +698,12 @@ Feature: Turn Lane Guidance @ramp Scenario: Off Ramp In a Turn Given the node map - | a | | | | | | | | | | | | - | | | | | | | | | | | | | - | | | | | | b | | | | | | c | - | | | | | | | | | | | d | | + """ + a + + b c + d + """ And the ways | nodes | name | turn:lanes:forward | highway | oneway | @@ -663,10 +719,12 @@ Feature: Turn Lane Guidance @reverse Scenario: Reverse Lane in Segregated Road Given the node map - | h | | | | | g | | | | | | f | - | | | | | | | | e | | | | | - | | | | | | | | d | | | | | - | a | | | | | b | | | | | | c | + """ + h g f + e + d + a b c + """ And the ways | nodes | name | turn:lanes:forward | highway | oneway | @@ -682,10 +740,12 @@ Feature: Turn Lane Guidance @reverse Scenario: Reverse Lane in Segregated Road with none Given the node map - | h | | | | | g | | | | | | f | - | | | | | | | | e | | | | | - | | | | | | | | d | | | | | - | a | | | | | b | | | | | | c | + """ + h g f + e + d + a b c + """ And the ways | nodes | name | turn:lanes:forward | highway | oneway | @@ -701,11 +761,13 @@ Feature: Turn Lane Guidance @reverse Scenario: Reverse Lane in Segregated Road with none, Service Turn Prior Given the node map - | h | | | | | g | | | | | | f | - | | | | | | | | e | | | | | - | | | | | | | | d | | | | | - | a | | j | | | b | | | | | | c | - | | | i | | | | | | | | | | + """ + h g f + e + d + a j b c + i + """ And the ways | nodes | name | turn:lanes:forward | highway | oneway | @@ -722,9 +784,11 @@ Feature: Turn Lane Guidance @simple Scenario: Don't collapse everything to u-turn / too wide Given the node map - | a | | b | | e | - | | | | | | - | d | | c | | f | + """ + a b e + + d c f + """ And the ways | nodes | highway | name | turn:lanes:forward | @@ -742,8 +806,10 @@ Feature: Turn Lane Guidance @simple Scenario: Merge Lanes Onto Freeway Given the node map - | a | | | b | c | - | | d | | | | + """ + a b c + d + """ And the ways | nodes | highway | name | turn:lanes:forward | @@ -757,8 +823,10 @@ Feature: Turn Lane Guidance @2654 @simple Scenario: Fork on motorway links - don't fork on through but use lane Given the node map - | i | | | | | a | - | j | | c | b | | x | + """ + i a + j c b x + """ And the ways | nodes | name | highway | turn:lanes:forward | @@ -777,10 +845,12 @@ Feature: Turn Lane Guidance @todo @ramp @2645 Scenario: Kreuz Schoeneberg - Continue on ramp, don't merge Given the node map - | i | | | | | j | | | | | | | | | | | | - | | | | | k | | | | | | | | | | | | | - | h | g | | l | | | f | | | | | | | | | | e | - | d | | | | | | | | c | | | | | b | | | a | + """ + i j + k + h g l f e + d c b a + """ And the ways | nodes | highway | name | oneway | lanes | turn:lanes | @@ -808,8 +878,10 @@ Feature: Turn Lane Guidance @collapse @use-lane Scenario: Collapse Multiple Use Lanes Given the node map - | x | a | | b | | | c | | | d | - | | | | e | | | f | | | | + """ + x a b c d + e f + """ And the ways | nodes | name | highway | turn:lanes:forward | @@ -827,12 +899,14 @@ Feature: Turn Lane Guidance @partition-lanes Scenario: Partitioned turn, Slight Curve Given the node map - | | | f | | e | - | | | | | | - | | | | | | - | | | | | c | - | a | | b | | | - | | | g | | d | + """ + f e + + + c + a b + g d + """ And the ways | nodes | name | highway | oneway | turn:lanes:forward | @@ -848,9 +922,11 @@ Feature: Turn Lane Guidance Scenario: Lane Parsing Issue #2694 Given the node map - | | c | - | a | b | - | | d | + """ + c + a b + d + """ And the ways | nodes | highway | turn:lanes:forward | @@ -866,12 +942,14 @@ Feature: Turn Lane Guidance @todo Scenario: Lane Parsing Issue #2706: None Assignments I Given the node map - | | f | | | j | | - | | | | | | | - | a | b | c | | d | e | - | | | | | | | - | | | | | i | | - | | g | | | h | | + """ + f j + + a b c d e + + i + g h + """ And the nodes | node | highway | @@ -906,10 +984,12 @@ Feature: Turn Lane Guidance @todo Scenario: Lane Parsing Issue #2706: None Assignments II Given the node map - | | k | l | | - | j | a | b | f | - | i | c | d | e | - | | h | g | | + """ + k l + j a b f + i c d e + h g + """ And the ways | nodes | highway | name | oneway | turn:lanes | @@ -941,10 +1021,12 @@ Feature: Turn Lane Guidance @todo Scenario: Lane Parsing Issue #2706: None Assignments III - Minimal reproduction recipe Given the node map - | | | l | | - | | a | b | | - | | | d | | - | | | | | + """ + l + a b + d + + """ And the ways | nodes | highway | name | oneway | turn:lanes | @@ -960,9 +1042,11 @@ Feature: Turn Lane Guidance @reverse @2730 @todo Scenario: Reverse on the right Given the node map - | a | | | c | | - | | | | b | d | - | f | | | e | | + """ + a c + b d + f e + """ And the ways | nodes | highway | name | turn:lanes:forward | oneway | @@ -983,12 +1067,14 @@ Feature: Turn Lane Guidance #http://www.openstreetmap.org/export#map=19/52.56054/13.32152 Scenario: Kurt-Schuhmacher-Damm Given the node map - | | | | g | | f | - | | | | | | | - | j | | | h | | e | - | | | | | | | - | a | | | b | | c | - | | | | i | | d | + """ + g f + + j h e + + a b c + i d + """ And the ways | nodes | name | highway | oneway | turn:lanes | diff --git a/features/guidance/turn.feature b/features/guidance/turn.feature index 73b23ae99..9b1e8319b 100644 --- a/features/guidance/turn.feature +++ b/features/guidance/turn.feature @@ -7,9 +7,11 @@ Feature: Simple Turns Scenario: Four Way Intersection Given the node map - | | c | | - | a | b | e | - | | d | | + """ + c + a b e + d + """ And the ways | nodes | highway | @@ -35,9 +37,11 @@ Feature: Simple Turns Scenario: Rotated Four Way Intersection Given the node map - | a | | c | - | | b | | - | d | | e | + """ + a c + b + d e + """ And the ways | nodes | highway | @@ -64,9 +68,11 @@ Feature: Simple Turns Scenario: Four Way Intersection Through Street Given the node map - | | c | | - | a | b | e | - | | d | | + """ + c + a b e + d + """ And the ways | nodes | highway | @@ -91,9 +97,11 @@ Feature: Simple Turns Scenario: Four Way Intersection Double Through Street Given the node map - | | c | | - | a | b | e | - | | d | | + """ + c + a b e + d + """ And the ways | nodes | highway | @@ -117,8 +125,10 @@ Feature: Simple Turns Scenario: Three Way Intersection Given the node map - | | c | | - | a | b | d | + """ + c + a b d + """ And the ways | nodes | highway | @@ -135,8 +145,10 @@ Feature: Simple Turns Scenario: Three Way Intersection - Meeting Oneways Given the node map - | | c | | - | a | b | d | + """ + c + a b d + """ And the ways | nodes | highway | oneway | @@ -151,8 +163,10 @@ Feature: Simple Turns Scenario: Three Way Intersection on Through Street Given the node map - | | d | | - | a | b | c | + """ + d + a b c + """ And the ways | nodes | highway | @@ -168,13 +182,15 @@ Feature: Simple Turns Scenario: High Degree Intersection Given the node map - | i | | b | | c | - | | | | | | - | | | | | | - | h | | a | | d | - | | | | | | - | | | | | | - | g | | f | | e | + """ + i b c + + + h a d + + + g f e + """ And the ways | nodes | highway | @@ -199,13 +215,15 @@ Feature: Simple Turns Scenario: Disturbed High Degree Intersection Given the node map - | | | b | | | - | i | | | | c | - | | | | | | - | h | | a | | d | - | | | | | | - | g | | | | e | - | | | f | | | + """ + b + i c + + h a d + + g e + f + """ And the ways | nodes | highway | @@ -262,21 +280,23 @@ Feature: Simple Turns Scenario: Four Way Intersection Double Through Street Segregated Given the node map - | | | | | q | | p | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | b | | c | | | | | - | j | | | i | | | | d | | | o | - | | | | | | a | | | | | | - | k | | | h | | | | e | | | n | - | | | | | g | | f | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | | | | | | | | - | | | | | l | | m | | | | | + """ + q p + + + + + b c + j i d o + a + k h e n + g f + + + + + l m + """ And the ways | nodes | highway | oneway | name | @@ -306,9 +326,11 @@ Feature: Simple Turns Scenario: Three Way Similar Sharp Turns Given the node map - | a | | | | b | - | c | | | | | - | | d | | | | + """ + a b + c + d + """ And the ways | nodes | highway | @@ -325,9 +347,11 @@ Feature: Simple Turns Scenario: Left Turn Assignment (1) Given the node map - | | | | | d | - | a | | b | | c | - | | | e | | | + """ + d + a b c + e + """ And the ways | nodes | highway | @@ -341,10 +365,12 @@ Feature: Simple Turns Scenario: Left Turn Assignment (2) Given the node map - | | | | | d | - | | | | | | - | a | | b | | c | - | | | e | | | + """ + d + + a b c + e + """ And the ways | nodes | highway | @@ -358,11 +384,13 @@ Feature: Simple Turns Scenario: Left Turn Assignment (3) Given the node map - | | | | d | | - | | | | | | - | | | | | | - | a | | b | | c | - | | | e | | | + """ + d + + + a b c + e + """ And the ways | nodes | highway | @@ -376,12 +404,14 @@ Feature: Simple Turns Scenario: Left Turn Assignment (4) Given the node map - | | | d | | | - | | | | | | - | | | | | | - | | | | | | - | a | | b | | c | - | | | e | | | + """ + d + + + + a b c + e + """ And the ways | nodes | highway | @@ -395,11 +425,13 @@ Feature: Simple Turns Scenario: Left Turn Assignment (5) Given the node map - | | d | | | | - | | | | | | - | | | | | | - | a | | b | | c | - | | | e | | | + """ + d + + + a b c + e + """ And the ways | nodes | highway | @@ -413,10 +445,12 @@ Feature: Simple Turns Scenario: Left Turn Assignment (6) Given the node map - | d | | | | | - | | | | | | - | a | | b | | c | - | | | e | | | + """ + d + + a b c + e + """ And the ways | nodes | highway | @@ -430,9 +464,11 @@ Feature: Simple Turns Scenario: Left Turn Assignment (7) Given the node map - | d | | | | | - | a | | b | | c | - | | | e | | | + """ + d + a b c + e + """ And the ways | nodes | highway | @@ -446,9 +482,11 @@ Feature: Simple Turns Scenario: Right Turn Assignment (1) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | d | + """ + e + a b c + d + """ And the ways | nodes | highway | @@ -462,10 +500,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment (2) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | | - | | | | | d | + """ + e + a b c + + d + """ And the ways | nodes | highway | @@ -479,11 +519,13 @@ Feature: Simple Turns Scenario: Right Turn Assignment (3) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | | - | | | | | | - | | | | d | | + """ + e + a b c + + + d + """ And the ways | nodes | highway | @@ -497,12 +539,14 @@ Feature: Simple Turns Scenario: Right Turn Assignment (4) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | | - | | | | | | - | | | | | | - | | | d | | | + """ + e + a b c + + + + d + """ And the ways | nodes | highway | @@ -516,11 +560,13 @@ Feature: Simple Turns Scenario: Right Turn Assignment (5) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | | - | | | | | | - | | d | | | | + """ + e + a b c + + + d + """ And the ways | nodes | highway | @@ -534,10 +580,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment (6) Given the node map - | | | e | | | - | a | | b | | c | - | | | | | | - | d | | | | | + """ + e + a b c + + d + """ And the ways @@ -552,9 +600,11 @@ Feature: Simple Turns Scenario: Right Turn Assignment (7) Given the node map - | | | e | | | - | a | | b | | c | - | d | | | | | + """ + e + a b c + d + """ And the ways @@ -569,10 +619,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Two Turns Given the node map - | | | f | | | - | a | | b | | c | - | | | | | | - | d | e | | | | + """ + f + a b c + + d e + """ And the ways @@ -589,10 +641,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Two Turns (2) Given the node map - | | | f | | c | - | a | | b | | | - | | | | | e | - | | | | d | | + """ + f c + a b + e + d + """ And the ways @@ -609,10 +663,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Two Turns (3) Given the node map - | | | f | | | - | a | | b | | c | - | | | | | e | - | | | | d | | + """ + f + a b c + e + d + """ And the ways @@ -629,10 +685,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Two Turns (4) Given the node map - | | | f | | | - | a | | b | | c | - | | | | | | - | | | d | | e | + """ + f + a b c + + d e + """ And the ways @@ -649,10 +707,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Three Turns Given the node map - | | | g | | | - | a | | b | | c | - | | d | | f | | - | | | e | | | + """ + g + a b c + d f + e + """ And the ways | nodes | highway | @@ -670,11 +730,13 @@ Feature: Simple Turns Scenario: Slight Turn involving Oneways Given the node map - | | | a | | | - | | | | | | - | | | b | | e | - | d | | | | | - | | | c | | | + """ + a + + b e + d + c + """ And the ways | nodes | highway | oneway | @@ -689,12 +751,14 @@ Feature: Simple Turns Scenario: Slight Turn involving Oneways Given the node map - | | | | a | | - | | | | | | - | | | | | | - | | | b | | e | - | d | | | | | - | | | c | | | + """ + a + + + b e + d + c + """ And the ways | nodes | highway | oneway | @@ -710,11 +774,13 @@ Feature: Simple Turns Scenario: Slight Turn involving Oneways - Name Change Given the node map - | | | a | | | - | | | | | | - | | | b | | e | - | d | | | | | - | | | c | | | + """ + a + + b e + d + c + """ And the ways | nodes | highway | oneway | @@ -730,10 +796,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 1 Given the node map - | | | g | | | - | a | | b | | c | - | | | | | | - | | d | e | f | | + """ + g + a b c + + d e f + """ And the ways | nodes | highway | oneway | @@ -750,10 +818,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 2 Given the node map - | | | g | | | - | a | | b | | c | - | | | | | | - | | d | e | f | | + """ + g + a b c + + d e f + """ And the ways | nodes | highway | oneway | @@ -770,10 +840,12 @@ Feature: Simple Turns Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 3 Given the node map - | | | g | | | - | a | | b | | c | - | | | | | | - | | d | e | f | | + """ + g + a b c + + d e f + """ And the ways | nodes | highway | oneway | @@ -790,10 +862,12 @@ Feature: Simple Turns Scenario: Conflicting Turns with well distinguished turn Given the node map - | a | | | b | | | c | - | | | | | | | | - | f | | | | | | d | - | | | | | | | e | + """ + a b c + + f d + e + """ And the ways | nodes | highway | @@ -810,10 +884,12 @@ Feature: Simple Turns Scenario: Conflicting Turns with well distinguished turn (back) Given the node map - | a | | | b | | | c | - | | | | | | | | - | d | | | | | | f | - | | e | | | | | | + """ + a b c + + d f + e + """ And the ways | nodes | highway | @@ -830,12 +906,14 @@ Feature: Simple Turns Scenario: Turn Lane on Splitting up Road Given the node map - | | | | | | | | | | | | | | | | - | g | | | | f | | | | | | | | | | | - | | | | | | | | | | | | | | | | - | | | | | | h | | | e | | | c | | | d | - | a | | | b | | | | | | | | | | | | - | | | | i | | | | | | | | | | | | + """ + + g f + + h e c d + a b + i + """ And the ways | nodes | highway | oneway | name | @@ -858,12 +936,14 @@ Feature: Simple Turns Scenario: Go onto turning major road Given the node map - | | | | c | - | | | | | - | | | | | - | a | | | b | - | | | | | - | | | | d | + """ + c + + + a b + + d + """ And the ways | nodes | highway | name | @@ -878,12 +958,14 @@ Feature: Simple Turns Scenario: Channing Street Given the node map - | | | g | f | | - | | | | | | - | d | | c | b | a | - | | | | | | - | | | | | | - | | | h | e | | + """ + g f + + d c b a + + + h e + """ And the nodes | node | highway | @@ -906,11 +988,13 @@ Feature: Simple Turns # https://www.mapillary.com/app/?focus=map&lat=38.91815595&lng=-77.03880249&z=17&pKey=sCxepTOCTZD3OoBXuqGEOw # http://www.openstreetmap.org/way/6062557#map=19/38.91805/-77.03892 Given the node map - | y | | | x | | | - | | | c | | | | - | | d | | | b | a | - | | | | | | | - | e | | | | | | + """ + y x + c + d b a + + e + """ And the ways | nodes | name | highway | oneway | @@ -925,15 +1009,17 @@ Feature: Simple Turns # http://www.openstreetmap.org/node/182805179 Scenario: Make Sharp Left at Traffic Signal Given the node map - | | | | g | | | | - | | | | | | | | - | | | | f | | | y | - | i | | | | | | | - | j | k | a | | b | | x | - | | | | e | | c | | - | | | | | d | | | - | | | | | | | | - | | | | h | | | | + """ + g + + f y + i + j k a b x + e c + d + + h + """ And the nodes | node | highway | @@ -957,9 +1043,11 @@ Feature: Simple Turns # https://www.openstreetmap.org/#map=20/52.51609/13.41080 Scenario: Unnecessary Slight Left onto Stralauer Strasse Given the node map - | | e | | | | | | - | | | | | | | | - | a | | b | | c | | d | + """ + e + + a b c d + """ And the ways | nodes | name | highway | oneway | @@ -975,9 +1063,11 @@ Feature: Simple Turns Scenario: Unnecessary Slight Left onto Stralauer Strasse Given the node map - | | e | | | | | | - | | | | | | | | - | a | | b | | c | | d | + """ + e + + a b c d + """ And the ways | nodes | name | highway | oneway | @@ -995,22 +1085,24 @@ Feature: Simple Turns # http://www.openstreetmap.org/#map=19/52.46750/13.43171 Scenario: Collapse Turn Instruction, Issue #2725 Given the node map - | | f | | - | | e | | - | | | | - | | | | - | g | | d | - | | | | - | | | | - | h | | c | - | | | | - | | | | - | | b | | - | | a | | - | | | | - | | | | - | r | x | s | - | | y | | + """ + f + e + + + g d + + + h c + + + b + a + + + r x s + y + """ And the ways | nodes | name | highway | oneway | @@ -1041,20 +1133,22 @@ Feature: Simple Turns # https://www.mapillary.com/app/?lat=52.466483333333336&lng=13.431908333333332&z=17&focus=photo&pKey=LWXnKqoGqUNLnG0lofiO0Q # http://www.openstreetmap.org/#map=19/52.46750/13.43171 Given the node map - | | f | | - | | e | | - | g | | d | - | | | | - | | | | - | h | | c | - | | | | - | | | | - | | b | | - | | a | | - | | | | - | | | | - | r | x | s | - | | y | | + """ + f + e + g d + + + h c + + + b + a + + + r x s + y + """ And the ways | nodes | name | highway | oneway | @@ -1085,8 +1179,10 @@ Feature: Simple Turns @3002 Scenario: Obvious Index wigh very narrow turn to the right Given the node map - | a | | b | | | | | | c | - | | | | | | | | | d | + """ + a b c + d + """ And the ways | nodes | highway | name | @@ -1102,8 +1198,10 @@ Feature: Simple Turns @3002 Scenario: Obvious Index wigh very narrow turn to the right Given the node map - | a | | b | | | | | | c | | - | | | | | e | | | | d | f | + """ + a b c + e d f + """ And the ways | nodes | highway | name | @@ -1120,8 +1218,10 @@ Feature: Simple Turns @3002 Scenario: Obvious Index wigh very narrow turn to the left Given the node map - | | | | | | | | | d | - | a | | b | | | | | | c | + """ + d + a b c + """ And the ways | nodes | highway | name | @@ -1137,8 +1237,10 @@ Feature: Simple Turns @3002 Scenario: Obvious Index wigh very narrow turn to the left Given the node map - | | | | | e | | | | d | f | - | a | | b | | | | | | c | | + """ + e d f + a b c + """ And the ways | nodes | highway | name | diff --git a/features/lib/osm.js b/features/lib/osm.js index 5387b7f01..f34751a61 100644 --- a/features/lib/osm.js +++ b/features/lib/osm.js @@ -113,6 +113,10 @@ class Node { addTag (k, v) { this.tags[k] = v; } + + setID (id ) { + this.id = id; + } } class Way { diff --git a/features/nearest/pick.feature b/features/nearest/pick.feature index 75dbc6ea1..fb66ef654 100644 --- a/features/nearest/pick.feature +++ b/features/nearest/pick.feature @@ -6,11 +6,13 @@ Feature: Locating Nearest node on a Way - pick closest way Scenario: Nearest - two ways crossing Given the node map - | | 0 | c | 1 | | - | 7 | | n | | 2 | - | a | k | x | m | b | - | 6 | | l | | 3 | - | | 5 | d | 4 | | + """ + 0 c 1 + 7 n 2 + a k x m b + 6 l 3 + 5 d 4 + """ And the ways | nodes | @@ -34,12 +36,14 @@ Feature: Locating Nearest node on a Way - pick closest way Scenario: Nearest - inside a triangle Given the node map - | | | | | | c | | | | | | - | | | | | | | | | | | | - | | | | y | | | | z | | | | - | | | | | 0 | | 1 | | | | | - | | | | 2 | | 3 | | 4 | | | | - | a | | | x | | u | | w | | | b | + """ + c + + y z + 0 1 + 2 3 4 + a x u w b + """ And the ways | nodes | diff --git a/features/nearest/projection.feature b/features/nearest/projection.feature index 33a827813..3d9e6aa30 100644 --- a/features/nearest/projection.feature +++ b/features/nearest/projection.feature @@ -6,9 +6,11 @@ Feature: Locating Nearest node on a Way - basic projection onto way Scenario: Nearest - easy-west way Given the node map - | 0 | 1 | 2 | 3 | 4 | - | | a | x | b | | - | 5 | 6 | 7 | 8 | 9 | + """ + 0 1 2 3 4 + a x b + 5 6 7 8 9 + """ And the ways | nodes | @@ -29,11 +31,13 @@ Feature: Locating Nearest node on a Way - basic projection onto way Scenario: Nearest - north-south way Given the node map - | 0 | | 5 | - | 1 | a | 6 | - | 2 | x | 7 | - | 3 | b | 8 | - | 4 | | 9 | + """ + 0 5 + 1 a 6 + 2 x 7 + 3 b 8 + 4 9 + """ And the ways | nodes | @@ -54,12 +58,14 @@ Feature: Locating Nearest node on a Way - basic projection onto way Scenario: Nearest - diagonal 1 Given the node map - | 8 | | 4 | | | | - | | a | | 5 | | | - | 0 | | x | | 6 | | - | | 1 | | y | | 7 | - | | | 2 | | b | | - | | | | 3 | | 9 | + """ + 8 4 + a 5 + 0 x 6 + 1 y 7 + 2 b + 3 9 + """ And the ways | nodes | @@ -80,12 +86,14 @@ Feature: Locating Nearest node on a Way - basic projection onto way Scenario: Nearest - diagonal 2 Given the node map - | | | | 3 | | 9 | - | | | 2 | | b | | - | | 1 | | y | | 7 | - | 0 | | x | | 6 | | - | | a | | 5 | | | - | 8 | | 4 | | | | + """ + 3 9 + 2 b + 1 y 7 + 0 x 6 + a 5 + 8 4 + """ And the ways | nodes | diff --git a/features/options/contract/datasources.feature b/features/options/contract/datasources.feature index 19913885f..363058b80 100644 --- a/features/options/contract/datasources.feature +++ b/features/options/contract/datasources.feature @@ -7,22 +7,24 @@ Feature: osrm-contract command line options: datasources Given the profile "testbot" Given the extract extra arguments "--generate-edge-lookup" And the node map - | a | b | + """ + a b + """ And the ways | nodes | | ab | And the speed file """ - 1,2,27 - 2,1,27 - 2,3,27 - 3,2,27 - 1,4,27 - 4,1,27 + 1,2,50 + 2,1,50 + 2,3,50 + 3,2,50 + 1,4,50 + 4,1,50 """ And the data has been extracted Scenario: osrm-contract - Passing base file When I run "osrm-contract --segment-speed-file {speeds_file} {processed_file}" - Then datasource names should contain "lua profile,25_osrmcontract_passing_base_file_speeds" + Then datasource names should contain "lua profile,27_osrmcontract_passing_base_file_speeds" And it should exit successfully diff --git a/features/options/contract/files.feature b/features/options/contract/files.feature index 46cf4fba0..eacf3adb2 100644 --- a/features/options/contract/files.feature +++ b/features/options/contract/files.feature @@ -3,7 +3,9 @@ Feature: osrm-contract command line options: files Background: Given the profile "testbot" And the node map - | a | b | + """ + a b + """ And the ways | nodes | | ab | diff --git a/features/options/extract/files.feature b/features/options/extract/files.feature index c4e14a278..c4e220a58 100644 --- a/features/options/extract/files.feature +++ b/features/options/extract/files.feature @@ -7,7 +7,9 @@ Feature: osrm-extract command line options: files Background: Given the profile "testbot" And the node map - | a | b | + """ + a b + """ And the ways | nodes | | ab | diff --git a/features/options/routed/files.feature b/features/options/routed/files.feature index b28c8b11a..d7c329b0d 100644 --- a/features/options/routed/files.feature +++ b/features/options/routed/files.feature @@ -15,7 +15,9 @@ Feature: osrm-routed command line options: files Background: Given the profile "testbot" And the node map - | a | b | + """ + a b + """ And the ways | nodes | | ab | diff --git a/features/raster/extract.feature b/features/raster/extract.feature index 86a753716..456749b93 100644 --- a/features/raster/extract.feature +++ b/features/raster/extract.feature @@ -3,7 +3,9 @@ Feature: osrm-extract with a profile containing raster source Scenario: osrm-extract on a valid profile Given the profile "rasterbot" And the node map - | a | b | + """ + a b + """ And the ways | nodes | | ab | diff --git a/features/step_definitions/data.js b/features/step_definitions/data.js index acd320a72..9b7e7c296 100644 --- a/features/step_definitions/data.js +++ b/features/step_definitions/data.js @@ -48,41 +48,26 @@ module.exports = function () { q.awaitAll(callback); }); - this.Given(/^the node map$/, (table, callback) => { - let q = d3.queue(); + this.Given(/^the node map$/, (docstring, callback) => { + var q = d3.queue(); - let addNode = (name, ri, ci, cb) => { - if (name) { - let nodeWithID = name.match(/([a-z])\:([0-9]*)/); - if (nodeWithID) { - let nodeName = nodeWithID[1], - nodeID = nodeWithID[2]; - if (this.nameNodeHash[nodeName]) throw new Error(util.format('*** duplicate node %s', name)); - let lonLat = this.tableCoordToLonLat(ci, ri); - this.addOSMNode(nodeName, lonLat[0], lonLat[1], nodeID); - } else { - if (name.length !== 1) throw new Error(util.format('*** node invalid name %s, must be single characters', name)); - if (!name.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name %s, must me alphanumeric', name)); - - if (name.match(/[a-z]/)) { - if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name)); - let lonLat = this.tableCoordToLonLat(ci, ri); - this.addOSMNode(name, lonLat[0], lonLat[1], null); - } else { - if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name); - let lonLat = this.tableCoordToLonLat(ci, ri); - this.addLocation(name, lonLat[0], lonLat[1], null); - } - } - - cb(); + var addNode = (name, ri, ci, cb) => { + var lonLat = this.tableCoordToLonLat(ci, ri); + if (name.match(/[a-z]/) ) { + if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name)); + this.addOSMNode(name, lonLat[0], lonLat[1], null); + } else if (name.match(/[0-9]/) ) { + if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name); + this.addLocation(name, lonLat[0], lonLat[1], null); } - else cb(); + cb(); }; - table.raw().forEach((row, ri) => { - row.forEach((name, ci) => { - q.defer(addNode, name, ri, ci); + docstring.split(/\n/).forEach( (row,ri) => { + row.split('').forEach( (cell,ci) => { + if( cell.match(/[a-z0-9]/) ) { + q.defer(addNode, cell, ri, ci*0.5); + } }); }); @@ -120,7 +105,11 @@ module.exports = function () { delete row.node; if (!node) throw new Error(util.format('*** unknown node %s'), name); for (let key in row) { - node.addTag(key, row[key]); + if (key=='id') { + node.setID( row[key] ); + } else { + node.addTag(key, row[key]); + } } cb(); }; diff --git a/features/stress/launch.feature b/features/stress/launch.feature index 10c13c8fc..747911bb8 100644 --- a/features/stress/launch.feature +++ b/features/stress/launch.feature @@ -8,9 +8,11 @@ Feature: Stress testing #osrm-routed hangs very often Given a grid size of 10000 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | @@ -31,9 +33,11 @@ Feature: Stress testing #osrm-routed hangs sometimes Given a grid size of 10000 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | diff --git a/features/testbot/alternative.feature b/features/testbot/alternative.feature index 8f2edcca8..05d39dfbb 100644 --- a/features/testbot/alternative.feature +++ b/features/testbot/alternative.feature @@ -6,9 +6,11 @@ Feature: Alternative route And a grid size of 200 meters And the node map - | | b | c | d | | | - | a | | k | | | z | - | | g | h | i | j | | + """ + b c d + a k z + g h i j + """ And the ways | nodes | diff --git a/features/testbot/alternative_loop.feature b/features/testbot/alternative_loop.feature index 159a399f8..d35431224 100644 --- a/features/testbot/alternative_loop.feature +++ b/features/testbot/alternative_loop.feature @@ -6,10 +6,12 @@ Feature: Alternative route Scenario: Alternative Loop Paths Given the node map - | a | 2 | 1 | b | - | 7 | | | 4 | - | 8 | | | 3 | - | c | 5 | 6 | d | + """ + a 2 1 b + 7 4 + 8 3 + c 5 6 d + """ And the ways | nodes | oneway | diff --git a/features/testbot/bad.feature b/features/testbot/bad.feature index aeddc95d1..9632d03cf 100644 --- a/features/testbot/bad.feature +++ b/features/testbot/bad.feature @@ -6,7 +6,9 @@ Feature: Handle bad data in a graceful manner Scenario: Empty dataset Given the node map - | | + """ + + """ Given the ways | nodes | @@ -16,7 +18,9 @@ Feature: Handle bad data in a graceful manner Scenario: Only dead-end oneways Given the node map - | a | b | c | d | e | + """ + a b c d e + """ Given the ways | nodes | oneway | @@ -29,8 +33,10 @@ Feature: Handle bad data in a graceful manner @todo Scenario: Start/end point at the same location Given the node map - | a | b | - | 1 | 2 | + """ + a b + 1 2 + """ Given the ways | nodes | diff --git a/features/testbot/basic.feature b/features/testbot/basic.feature index 466fff2e1..7f9674c13 100644 --- a/features/testbot/basic.feature +++ b/features/testbot/basic.feature @@ -7,7 +7,9 @@ Feature: Basic Routing @smallest Scenario: A single way with two nodes Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -20,7 +22,9 @@ Feature: Basic Routing Scenario: Routing in between two nodes of way Given the node map - | a | b | 1 | 2 | c | d | + """ + a b 1 2 c d + """ And the ways | nodes | @@ -33,7 +37,9 @@ Feature: Basic Routing Scenario: Routing between the middle nodes of way Given the node map - | a | b | c | d | e | f | + """ + a b c d e f + """ And the ways | nodes | @@ -56,7 +62,9 @@ Feature: Basic Routing Scenario: Two ways connected in a straight line Given the node map - | a | | b | | c | + """ + a b c + """ And the ways | nodes | @@ -74,8 +82,10 @@ Feature: Basic Routing Scenario: 2 unconnected parallel ways Given the node map - | a | b | c | - | d | e | f | + """ + a b c + d e f + """ And the ways | nodes | @@ -113,9 +123,11 @@ Feature: Basic Routing Scenario: 3 ways connected in a triangle Given the node map - | a | | b | - | | | | - | | c | | + """ + a b + + c + """ And the ways | nodes | @@ -135,10 +147,12 @@ Feature: Basic Routing Scenario: 3 connected triangles Given a grid size of 100 meters Given the node map - | x | a | | b | s | - | y | | | | t | - | | | c | | | - | | v | | w | | + """ + x a b s + y t + c + v w + """ And the ways | nodes | @@ -166,9 +180,11 @@ Feature: Basic Routing Scenario: To ways connected at a 45 degree angle Given the node map - | a | | | - | b | | | - | c | d | e | + """ + a + b + c d e + """ And the ways | nodes | @@ -186,10 +202,12 @@ Feature: Basic Routing Scenario: Grid city center Given the node map - | a | b | c | d | - | e | f | g | h | - | i | j | k | l | - | m | n | o | p | + """ + a b c d + e f g h + i j k l + m n o p + """ And the ways | nodes | @@ -211,10 +229,12 @@ Feature: Basic Routing Scenario: Grid city periphery Given the node map - | a | b | c | d | - | e | f | g | h | - | i | j | k | l | - | m | n | o | p | + """ + a b c d + e f g h + i j k l + m n o p + """ And the ways | nodes | @@ -236,9 +256,11 @@ Feature: Basic Routing Scenario: Testbot - Triangle challenge Given the node map - | | | | d | - | a | b | c | | - | | | | e | + """ + d + a b c + e + """ And the ways | nodes | highway | oneway | @@ -254,7 +276,9 @@ Feature: Basic Routing Scenario: Ambiguous edge weights - Use minimal edge weight Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | name | @@ -269,7 +293,9 @@ Feature: Basic Routing Scenario: Ambiguous edge names - Use lexicographically smallest name Given the node map - | a | b | c | + """ + a b c + """ And the ways | nodes | highway | name | diff --git a/features/testbot/bearing.feature b/features/testbot/bearing.feature index 8ca7e918b..4d99ec589 100644 --- a/features/testbot/bearing.feature +++ b/features/testbot/bearing.feature @@ -6,8 +6,10 @@ Feature: Compass bearing Scenario: Bearing when going northwest Given the node map - | b | | - | | a | + """ + b + a + """ And the ways | nodes | @@ -19,7 +21,9 @@ Feature: Compass bearing Scenario: Bearing when going west Given the node map - | b | a | + """ + b a + """ And the ways | nodes | @@ -31,9 +35,11 @@ Feature: Compass bearing Scenario: Bearing af 45 degree intervals Given the node map - | b | a | h | - | c | x | g | - | d | e | f | + """ + b a h + c x g + d e f + """ And the ways | nodes | @@ -59,10 +65,12 @@ Feature: Compass bearing Scenario: Bearing in a roundabout Given the node map - | k | d | c | j | - | e | | | b | - | f | | | a | - | l | g | h | i | + """ + k d c j + e b + f a + l g h i + """ And the ways | nodes | oneway | @@ -90,10 +98,12 @@ Feature: Compass bearing Scenario: Bearing should stay constant when zig-zagging Given the node map - | i | j | k | | - | b | d | f | h | - | a | c | e | g | - | | m | n | o | + """ + i j k + b d f h + a c e g + m n o + """ And the ways | nodes | @@ -117,7 +127,9 @@ Feature: Compass bearing Scenario: Bearings on an east-west way. Given the node map - | a | b | c | d | e | f | + """ + a b c d e f + """ And the ways | nodes | diff --git a/features/testbot/bearing_param.feature b/features/testbot/bearing_param.feature index 7693cdb8a..adc0fbe83 100644 --- a/features/testbot/bearing_param.feature +++ b/features/testbot/bearing_param.feature @@ -7,7 +7,9 @@ Feature: Bearing parameter Scenario: Testbot - Intial bearing in simple case Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | @@ -23,9 +25,11 @@ Feature: Bearing parameter Scenario: Testbot - Intial bearing in simple case Given the node map - | a | | - | 0 | c | - | b | | + """ + a + 0 c + b + """ And the ways | nodes | @@ -43,8 +47,10 @@ Feature: Bearing parameter Scenario: Testbot - Initial bearing on split way Given the node map - | g | d | | | | | 1 | | | | | c | f | - | h | a | | | | | 0 | | | | | b | e | + """ + g d 1 c f + h a 0 b e + """ And the ways | nodes | oneway | @@ -76,13 +82,15 @@ Feature: Bearing parameter Scenario: Testbot - Initial bearing in all direction Given the node map - | h | | q | a | | | b | - | | | | | | | | - | | | p | i | j | | | - | g | | o | 0 | k | | c | - | | | n | m | l | | | - | | | | | | | | - | f | | | e | | | d | + """ + h q a b + + p i j + g o 0 k c + n m l + + f e d + """ And the ways | nodes | oneway | name | diff --git a/features/testbot/compression.feature b/features/testbot/compression.feature index 4569b4caa..5ddbf92d8 100644 --- a/features/testbot/compression.feature +++ b/features/testbot/compression.feature @@ -6,9 +6,11 @@ Feature: Geometry Compression Scenario: Compressed segments have correct order Given the node map - | a | | d | | | | h | - | b | | | | e | | f | - | | c | | | | | g | + """ + a d h + b e f + c g + """ And the ways | nodes | diff --git a/features/testbot/continue_straight.feature b/features/testbot/continue_straight.feature index df435bd84..e71e45c5f 100644 --- a/features/testbot/continue_straight.feature +++ b/features/testbot/continue_straight.feature @@ -7,8 +7,10 @@ Feature: U-turns at via points Scenario: Continue straight at waypoints enabled by default Given the node map - | a | b | c | d | - | | e | f | g | + """ + a b c d + e f g + """ And the ways | nodes | @@ -26,8 +28,10 @@ Feature: U-turns at via points Scenario: Query parameter to disallow changing direction at all waypoints Given the node map - | a | b | c | d | - | | e | f | g | + """ + a b c d + e f g + """ And the query options | continue_straight | false | @@ -48,8 +52,10 @@ Feature: U-turns at via points Scenario: Instructions at waypoints at u-turns Given the node map - | a | b | c | d | - | | e | f | g | + """ + a b c d + e f g + """ And the query options | continue_straight | false | @@ -70,9 +76,11 @@ Feature: U-turns at via points Scenario: u-turn mixed with non-uturn vias Given the node map - | a | 1 | b | 3 | c | 5 | d | - | | | 2 | | | | 4 | - | | | e | | f | | g | + """ + a 1 b 3 c 5 d + 2 4 + e f g + """ And the query options | continue_straight | false | diff --git a/features/testbot/datastore.feature b/features/testbot/datastore.feature index 70a754bdf..3a2678b53 100644 --- a/features/testbot/datastore.feature +++ b/features/testbot/datastore.feature @@ -6,7 +6,9 @@ Feature: Temporary tests related to osrm-datastore Scenario: Scenario ab Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -19,7 +21,9 @@ Feature: Temporary tests related to osrm-datastore Scenario: Scenaria xy Given the node map - | x | y | + """ + x y + """ And the ways | nodes | diff --git a/features/testbot/distance.feature b/features/testbot/distance.feature index b8e571fef..83be25178 100644 --- a/features/testbot/distance.feature +++ b/features/testbot/distance.feature @@ -7,7 +7,9 @@ Feature: Distance calculation Scenario: 100m distance Given a grid size of 100 meters Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -19,9 +21,11 @@ Feature: Distance calculation Scenario: Distance should equal sum of segments, leftwinded Given the node map - | e | | - | d | c | - | a | b | + """ + e + d c + a b + """ And the ways | nodes | @@ -33,9 +37,11 @@ Feature: Distance calculation Scenario: Distance should equal sum of segments, rightwinded Given the node map - | | e | - | c | d | - | b | a | + """ + e + c d + b a + """ And the ways | nodes | @@ -48,8 +54,10 @@ Feature: Distance calculation Scenario: 10m distances Given a grid size of 10 meters Given the node map - | a | b | - | | c | + """ + a b + c + """ And the ways | nodes | @@ -67,8 +75,10 @@ Feature: Distance calculation Scenario: 100m distances Given a grid size of 100 meters Given the node map - | a | b | - | | c | + """ + a b + c + """ And the ways | nodes | @@ -86,8 +96,10 @@ Feature: Distance calculation Scenario: 1km distance Given a grid size of 1000 meters Given the node map - | a | b | - | | c | + """ + a b + c + """ And the ways | nodes | @@ -105,10 +117,12 @@ Feature: Distance calculation Scenario: Distance of a winding south-north path Given a grid size of 10 meters Given the node map - | a | b | - | d | c | - | e | f | - | h | g | + """ + a b + d c + e f + h g + """ And the ways | nodes | @@ -127,8 +141,10 @@ Feature: Distance calculation Scenario: Distance of a winding east-west path Given a grid size of 10 meters Given the node map - | a | d | e | h | - | b | c | f | g | + """ + a d e h + b c f g + """ And the ways | nodes | @@ -147,13 +163,15 @@ Feature: Distance calculation Scenario: Geometric distances Given a grid size of 100 meters Given the node map - | v | w | y | a | b | c | d | - | u | | | | | | e | - | t | | | | | | f | - | s | | | x | | | g | - | r | | | | | | h | - | q | | | | | | i | - | p | o | n | m | l | k | j | + """ + v w y a b c d + u e + t f + s x g + r h + q i + p o n m l k j + """ And the ways | nodes | @@ -213,11 +231,13 @@ Feature: Distance calculation Scenario: Distance of a maze of short segments Given a grid size of 7 meters Given the node map - | a | b | s | t | - | d | c | r | q | - | e | f | o | p | - | h | g | n | m | - | i | j | k | l | + """ + a b s t + d c r q + e f o p + h g n m + i j k l + """ And the ways | nodes | diff --git a/features/testbot/distance_matrix.feature b/features/testbot/distance_matrix.feature index 4afa30708..36683d4f2 100644 --- a/features/testbot/distance_matrix.feature +++ b/features/testbot/distance_matrix.feature @@ -9,7 +9,9 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix of minimal network Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -22,7 +24,9 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix with different way speeds Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | @@ -39,7 +43,9 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix with fuzzy match Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -52,8 +58,10 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix of small grid Given the node map - | a | b | c | - | d | e | f | + """ + a b c + d e f + """ And the ways | nodes | @@ -72,7 +80,9 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix of network with unroutable parts Given the node map - | a | b | + """ + a b + """ And the ways | nodes | oneway | @@ -85,8 +95,10 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix of network with oneways Given the node map - | x | a | b | y | - | | d | e | | + """ + x a b y + d e + """ And the ways | nodes | oneway | @@ -103,8 +115,10 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix and with only one source Given the node map - | a | b | c | - | d | e | f | + """ + a b c + d e f + """ And the ways | nodes | @@ -120,8 +134,10 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time 3x2 matrix Given the node map - | a | b | c | - | d | e | f | + """ + a b c + d e f + """ And the ways | nodes | @@ -140,8 +156,10 @@ Feature: Basic Distance Matrix Given a grid size of 300 meters Given the extract extra arguments "--small-component-size 4" Given the node map - | a | b | | f | - | d | e | | g | + """ + a b f + d e g + """ And the ways | nodes | @@ -160,8 +178,10 @@ Feature: Basic Distance Matrix Given a grid size of 300 meters Given the extract extra arguments "--small-component-size 4" Given the node map - | a | b | | f | h | - | d | e | | g | i | + """ + a b f h + d e g i + """ And the ways | nodes | @@ -181,8 +201,10 @@ Feature: Basic Distance Matrix Scenario: Testbot - Travel time matrix with loops Given the node map - | a | 1 | 2 | b | - | d | 4 | 3 | c | + """ + a 1 2 b + d 4 3 c + """ And the ways | nodes | oneway | diff --git a/features/testbot/duration.feature b/features/testbot/duration.feature index bb158db1c..26e4f7551 100644 --- a/features/testbot/duration.feature +++ b/features/testbot/duration.feature @@ -6,9 +6,11 @@ Feature: Durations Scenario: Duration of ways Given the node map - | a | b | | | | f | - | | | | e | | | - | | c | | | d | | + """ + a b f + e + c d + """ And the ways | nodes | highway | duration | @@ -29,7 +31,9 @@ Feature: Durations @todo Scenario: Partial duration of ways Given the node map - | a | b | | c | + """ + a b c + """ And the ways | nodes | highway | duration | diff --git a/features/testbot/example.feature b/features/testbot/example.feature index 075a22e56..d4192e920 100644 --- a/features/testbot/example.feature +++ b/features/testbot/example.feature @@ -8,9 +8,11 @@ Feature: Testbot - Walkthrough Scenario: Testbot - Processing Flow Given the node map - | | | | d | - | a | b | c | | - | | | | e | + """ + d + a b c + e + """ And the ways | nodes | highway | oneway | diff --git a/features/testbot/fastest.feature b/features/testbot/fastest.feature index 5576c738c..72f52c803 100644 --- a/features/testbot/fastest.feature +++ b/features/testbot/fastest.feature @@ -6,9 +6,11 @@ Feature: Choosing fastest route Scenario: Pick the geometrically shortest route, way types being equal Given the node map - | | | s | | | - | | | t | | | - | x | a | | b | y | + """ + s + t + x a b y + """ And the ways | nodes | highway | @@ -24,8 +26,10 @@ Feature: Choosing fastest route Scenario: Pick the fastest route, even when it's longer Given the node map - | | p | | - | a | s | b | + """ + p + a s b + """ And the ways | nodes | highway | diff --git a/features/testbot/ferry.feature b/features/testbot/ferry.feature index 6dd896b95..a634f93cd 100644 --- a/features/testbot/ferry.feature +++ b/features/testbot/ferry.feature @@ -6,11 +6,13 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - Ferry duration, single node Given the node map - | a | b | c | d | - | e | f | g | h | - | i | j | k | l | - | m | n | o | p | - | q | r | s | t | + """ + a b c d + e f g h + i j k l + m n o p + q r s t + """ And the ways | nodes | highway | route | duration | @@ -41,9 +43,11 @@ Feature: Testbot - Handle ferry routes @todo Scenario: Testbot - Week long ferry routes Given the node map - | a | b | c | d | - | e | f | g | h | - | i | j | k | l | + """ + a b c d + e f g h + i j k l + """ And the ways | nodes | highway | route | duration | @@ -65,8 +69,10 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - 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 | duration | @@ -83,8 +89,10 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - Ferry duration, individual parts, fast Given a grid size of 10000 meters Given the node map - | x | y | | z | | | v | - | a | b | | c | | | d | + """ + x y z v + a b c d + """ And the ways | nodes | highway | route | duration | @@ -104,8 +112,10 @@ Feature: Testbot - Handle ferry routes @todo Scenario: Testbot - Ferry duration, individual parts, slow Given the node map - | x | y | | z | | | v | - | a | b | | c | | | d | + """ + x y z v + a b c d + """ And the ways | nodes | highway | route | duration | @@ -124,8 +134,10 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - Ferry duration, connected routes Given the node map - | x | | | | d | | | | y | - | | a | b | c | | e | f | g | t | + """ + x d y + a b c e f g t + """ And the ways | nodes | highway | route | duration | @@ -141,9 +153,11 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - Prefer road when faster than ferry Given the node map - | x | a | b | c | | - | | | | | d | - | y | g | f | e | | + """ + x a b c + d + y g f e + """ And the ways | nodes | highway | route | duration | @@ -160,8 +174,10 @@ Feature: Testbot - Handle ferry routes Scenario: Testbot - Long winding ferry route Given the node map - | x | | b | | d | | f | | y | - | | a | | c | | e | | g | | + """ + x b d f y + a c e g + """ And the ways | nodes | highway | route | duration | @@ -177,8 +193,10 @@ Feature: Testbot - Handle ferry routes @todo Scenario: Testbot - Ferry duration formats Given the node map - | a | c | e | g | i | k | m | o | q | s | - | b | d | f | h | j | l | n | p | r | t | + """ + a c e g i k m o q s + b d f h j l n p r t + """ And the ways | nodes | route | duration | diff --git a/features/testbot/fixed.feature b/features/testbot/fixed.feature index 1499eba3a..9d83649ff 100644 --- a/features/testbot/fixed.feature +++ b/features/testbot/fixed.feature @@ -28,7 +28,9 @@ Feature: Fixed bugs, kept to check for regressions Scenario: Step trimming with very short segments Given a grid size of 0.1 meters Given the node map - | a | 1 | b | c | d | 2 | e | + """ + a 1 b c d 2 e + """ Given the ways | nodes | oneway | diff --git a/features/testbot/graph.feature b/features/testbot/graph.feature index 81741aa93..d291c5945 100644 --- a/features/testbot/graph.feature +++ b/features/testbot/graph.feature @@ -7,9 +7,11 @@ Feature: Basic Routing Scenario: Graph transformation Given the node map - | | | d | - | a | b | c | - | | | e | + """ + d + a b c + e + """ And the ways | nodes | @@ -22,12 +24,14 @@ Feature: Basic Routing Scenario: Turn instructions on compressed road network geometry Given the node map - | x | a | | | - | | b | | | - | f | | | e | - | | | | | - | | | | | - | y | c | | d | + """ + x a + b + f e + + + y c d + """ And the ways | nodes | name | diff --git a/features/testbot/impedance.feature b/features/testbot/impedance.feature index cab9ec3da..b579f210d 100644 --- a/features/testbot/impedance.feature +++ b/features/testbot/impedance.feature @@ -9,8 +9,10 @@ Feature: Setting impedance and speed separately Scenario: Use impedance to pick route, even when longer/slower Given the node map - | | s | | t | | u | | v | | - | a | | b | | c | | d | | e | + """ + s t u v + a b c d e + """ And the ways | nodes | impedance | @@ -36,8 +38,10 @@ Feature: Setting impedance and speed separately Scenario: Weight should default to 1 Given the node map - | | s | | t | | - | a | | b | | c | + """ + s t + a b c + """ And the ways | nodes | impedance | @@ -57,8 +61,10 @@ Feature: Setting impedance and speed separately # OSRM should not factor speed into impedance internally. However, the profile can choose to do so, # and this test expect the testbot profile to do it. Given the node map - | | s | | t | | - | a | | b | | c | + """ + s t + a b c + """ And the ways | nodes | impedance | highway | @@ -76,8 +82,10 @@ Feature: Setting impedance and speed separately Scenario: Weight should influence neither speed nor travel time. Given the node map - | a | b | c | - | t | | | + """ + a b c + t + """ And the ways | nodes | diff --git a/features/testbot/load.feature b/features/testbot/load.feature index b29fdc7ed..0c472ae95 100644 --- a/features/testbot/load.feature +++ b/features/testbot/load.feature @@ -9,7 +9,9 @@ Feature: Ways of loading data Scenario: Load data with datastore - ab Given data is loaded with datastore Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -23,7 +25,9 @@ Feature: Ways of loading data Scenario: Load data directly - st Given data is loaded directly Given the node map - | s | t | + """ + s t + """ And the ways | nodes | @@ -37,7 +41,9 @@ Feature: Ways of loading data Scenario: Load data datastore - xy Given data is loaded with datastore Given the node map - | x | y | + """ + x y + """ And the ways | nodes | @@ -51,7 +57,9 @@ Feature: Ways of loading data Scenario: Load data directly - cd Given data is loaded directly Given the node map - | c | d | + """ + c d + """ And the ways | nodes | diff --git a/features/testbot/loop.feature b/features/testbot/loop.feature index d3d19bb42..238692271 100644 --- a/features/testbot/loop.feature +++ b/features/testbot/loop.feature @@ -6,9 +6,11 @@ Feature: Avoid weird loops caused by rounding errors Scenario: Weird sidestreet loops Given the node map - | a | 1 | b | 2 | c | 3 | d | - | | | | | | | | - | e | | f | | g | | h | + """ + a 1 b 2 c 3 d + + e f g h + """ And the ways | nodes | @@ -73,14 +75,16 @@ Feature: Avoid weird loops caused by rounding errors @412 Scenario: Avoid weird loops 3 And the node map - | a | | | - | b | e | | - | h | | 1 | - | | | | - | | | 2 | - | g | | | - | | c | f | - | d | | | + """ + a + b e + h 1 + + 2 + g + c f + d + """ And the ways | nodes | highway | diff --git a/features/testbot/matching.feature b/features/testbot/matching.feature index ead4b6a74..402648651 100644 --- a/features/testbot/matching.feature +++ b/features/testbot/matching.feature @@ -9,11 +9,13 @@ Feature: Basic Map Matching Scenario: Testbot - Map matching with outlier that has no candidate Given a grid size of 100 meters Given the node map - | a | b | c | d | - | | | | | - | | | | | - | | | | | - | | | 1 | | + """ + a b c d + + + + 1 + """ And the ways | nodes | oneway | @@ -25,8 +27,10 @@ Feature: Basic Map Matching Scenario: Testbot - Map matching with trace splitting Given the node map - | a | b | c | d | - | | | e | | + """ + a b c d + e + """ And the ways | nodes | oneway | @@ -39,8 +43,10 @@ Feature: Basic Map Matching Scenario: Testbot - Map matching with core factor Given the contract extra arguments "--core 0.8" Given the node map - | a | b | c | d | - | | | e | | + """ + a b c d + e + """ And the ways | nodes | oneway | @@ -52,12 +58,14 @@ Feature: Basic Map Matching Scenario: Testbot - Map matching with small distortion Given the node map - | a | b | c | d | e | - | | f | | | | - | | | | | | - | | | | | | - | | | | | | - | | h | | | k | + """ + a b c d e + f + + + + h k + """ # The second way does not need to be a oneway # but the grid spacing triggers the uturn @@ -74,8 +82,10 @@ Feature: Basic Map Matching Scenario: Testbot - Map matching with oneways Given a grid size of 10 meters Given the node map - | a | b | c | d | - | e | f | g | h | + """ + a b c d + e f g h + """ And the ways | nodes | oneway | @@ -89,8 +99,10 @@ Feature: Basic Map Matching Scenario: Testbot - Matching with oneway streets Given a grid size of 10 meters Given the node map - | a | b | c | d | - | e | f | g | h | + """ + a b c d + e f g h + """ And the ways | nodes | oneway | @@ -111,8 +123,10 @@ Feature: Basic Map Matching | annotations | true | Given the node map - | a | b | c | d | e | | g | h | - | | | i | | | | | | + """ + a b c d e g h + i + """ And the ways | nodes | oneway | @@ -143,8 +157,10 @@ Feature: Basic Map Matching | geometries | polyline | Given the node map - | a | b | c | - | | d | | + """ + a b c + d + """ And the ways | nodes | oneway | diff --git a/features/testbot/mode.feature b/features/testbot/mode.feature index f0675b5f8..949fe20cd 100644 --- a/features/testbot/mode.feature +++ b/features/testbot/mode.feature @@ -15,7 +15,9 @@ Feature: Testbot - Travel mode Scenario: Testbot - Always announce mode change Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | name | @@ -30,7 +32,9 @@ Feature: Testbot - Travel mode Scenario: Testbot - Compressed Modes Given the node map - | a | b | c | d | e | f | g | + """ + a b c d e f g + """ And the ways | nodes | highway | name | @@ -45,8 +49,10 @@ Feature: Testbot - Travel mode Scenario: Testbot - Modes in each direction, different forward/backward speeds Given the node map - | | 0 | 1 | | - | a | | | b | + """ + 0 1 + a b + """ And the ways | nodes | highway | oneway | @@ -65,8 +71,10 @@ Feature: Testbot - Travel mode Scenario: Testbot - Modes in each direction, same forward/backward speeds Given the node map - | | 0 | 1 | | - | a | | | b | + """ + 0 1 + a b + """ And the ways | nodes | highway | @@ -80,7 +88,9 @@ Feature: Testbot - Travel mode @oneway Scenario: Testbot - Modes for oneway, different forward/backward speeds Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | oneway | @@ -94,7 +104,9 @@ Feature: Testbot - Travel mode @oneway Scenario: Testbot - Modes for oneway, same forward/backward speeds Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | oneway | @@ -108,7 +120,9 @@ Feature: Testbot - Travel mode @oneway Scenario: Testbot - Modes for reverse oneway, different forward/backward speeds Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | oneway | @@ -122,7 +136,9 @@ Feature: Testbot - Travel mode @oneway Scenario: Testbot - Modes for reverse oneway, same forward/backward speeds Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | oneway | @@ -136,7 +152,9 @@ Feature: Testbot - Travel mode @via Scenario: Testbot - Mode should be set at via points Given the node map - | a | 1 | b | + """ + a 1 b + """ And the ways | nodes | highway | @@ -149,8 +167,10 @@ Feature: Testbot - Travel mode Scenario: Testbot - Starting at a tricky node Given the node map - | | a | | | | - | | | | b | c | + """ + a + b c + """ And the ways | nodes | highway | @@ -163,7 +183,9 @@ Feature: Testbot - Travel mode Scenario: Testbot - Mode changes on straight way without name change Given the node map - | a | 1 | b | 2 | c | + """ + a 1 b 2 c + """ And the ways | nodes | highway | name | @@ -179,8 +201,10 @@ Feature: Testbot - Travel mode Scenario: Testbot - Mode for routes Given the node map - | a | b | | | | - | | c | d | e | f | + """ + a b + c d e f + """ And the ways | nodes | highway | route | duration | @@ -202,13 +226,15 @@ Feature: Testbot - Travel mode Scenario: Testbot - Modes, triangle map Given the node map - | | | | | | | d | - | | | | | | 2 | | - | | | | | 6 | | 5 | - | a | 0 | b | c | | | | - | | | | | 4 | | 1 | - | | | | | | 3 | | - | | | | | | | e | + """ + d + 2 + 6 5 + a 0 b c + 4 1 + 3 + e + """ And the ways | nodes | highway | oneway | @@ -236,9 +262,11 @@ Feature: Testbot - Travel mode Scenario: Testbot - River in the middle Given the node map - | a | b | c | | | - | | | d | | | - | | | e | f | g | + """ + a b c + d + e f g + """ And the ways | nodes | highway | diff --git a/features/testbot/oneway.feature b/features/testbot/oneway.feature index 5165f2bd1..fb348e297 100644 --- a/features/testbot/oneway.feature +++ b/features/testbot/oneway.feature @@ -7,12 +7,14 @@ Feature: Testbot - oneways Scenario: Routing on a oneway roundabout Given the node map - | | | | | v | | - | x | | d | c | | | - | | e | | | b | | - | | f | | | a | | - | | | g | h | | y | - | | z | | | | | + """ + v + x d c + e b + f a + g h y + z + """ And the ways | nodes | oneway | @@ -60,8 +62,10 @@ Feature: Testbot - oneways Scenario: Testbot - Around the Block Given the node map - | | a | b | | - | e | d | c | f | + """ + a b + e d c f + """ And the ways | nodes | oneway | foot | @@ -92,7 +96,9 @@ Feature: Testbot - oneways Scenario: Testbot - Two consecutive oneways Given the node map - | a | b | c | + """ + a b c + """ And the ways | nodes | oneway | diff --git a/features/testbot/opposite.feature b/features/testbot/opposite.feature index de11e5ec1..bda63eae6 100644 --- a/features/testbot/opposite.feature +++ b/features/testbot/opposite.feature @@ -6,7 +6,9 @@ Feature: Separate settings for forward/backward direction Scenario: Testbot - Going against the flow Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | highway | diff --git a/features/testbot/overlap.feature b/features/testbot/overlap.feature index c76cff270..e772683f6 100644 --- a/features/testbot/overlap.feature +++ b/features/testbot/overlap.feature @@ -7,7 +7,9 @@ Feature: Testbot - overlapping ways 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 | + """ + a b c d + """ And the ways | nodes | highway | @@ -23,8 +25,10 @@ Feature: Testbot - overlapping ways Scenario: Testbot - area on top of way Given the node map - | x | a | b | y | - | | d | c | | + """ + x a b y + d c + """ And the ways | nodes | highway | area | diff --git a/features/testbot/penalty.feature b/features/testbot/penalty.feature index 8d86a17ca..6e30b326c 100644 --- a/features/testbot/penalty.feature +++ b/features/testbot/penalty.feature @@ -7,8 +7,10 @@ Feature: Penalties Scenario: Traffic signals should incur a delay, without changing distance Given the node map - | a | b | c | - | d | e | f | + """ + a b c + d e f + """ And the nodes | node | highway | @@ -26,9 +28,11 @@ Feature: Penalties Scenario: Signal penalty should not depend on way type Given the node map - | a | b | c | - | d | e | f | - | g | h | i | + """ + a b c + d e f + g h i + """ And the nodes | node | highway | @@ -50,7 +54,9 @@ Feature: Penalties Scenario: Passing multiple traffic signals should incur a accumulated delay Given the node map - | a | b | c | d | e | + """ + a b c d e + """ And the nodes | node | highway | @@ -69,9 +75,11 @@ Feature: Penalties @todo Scenario: Signal penalty should not depend on way type Given the node map - | a | b | c | - | d | e | f | - | g | h | i | + """ + a b c + d e f + g h i + """ And the nodes | node | highway | @@ -96,7 +104,9 @@ Feature: Penalties Scenario: Passing multiple traffic signals should incur a accumulated delay Given the node map - | a | b | c | d | e | + """ + a b c d e + """ And the nodes | node | highway | @@ -115,7 +125,9 @@ Feature: Penalties @todo Scenario: Starting or ending at a traffic signal should not incur a delay Given the node map - | a | b | c | + """ + a b c + """ And the nodes | node | highway | @@ -132,7 +144,9 @@ Feature: Penalties Scenario: Routing between signals on the same way should not incur a delay Given the node map - | a | b | c | d | + """ + a b c d + """ And the nodes | node | highway | @@ -151,8 +165,10 @@ Feature: Penalties Scenario: Prefer faster route without traffic signals Given a grid size of 50 meters And the node map - | a | | b | | c | - | | | d | | | + """ + a b c + d + """ And the nodes | node | highway | diff --git a/features/testbot/routes.feature b/features/testbot/routes.feature index bc1d75eb4..0d9b5348f 100644 --- a/features/testbot/routes.feature +++ b/features/testbot/routes.feature @@ -8,10 +8,12 @@ Feature: OSM Route Relation # This scenario assumes that the testbot uses an impedance of 0.5 for ways that are part of 'testbot' routes. Given the node map - | s | | | t | | | | - | a | | | b | | | c | - | | | | | | | | - | | | | u | | | v | + """ + s t + a b c + + u v + """ And the ways | nodes | diff --git a/features/testbot/side_bias.feature b/features/testbot/side_bias.feature index 1d6d629c7..d5f701eab 100644 --- a/features/testbot/side_bias.feature +++ b/features/testbot/side_bias.feature @@ -18,9 +18,11 @@ Feature: Testbot - side bias end """ Given the node map - | a | | b | | c | - | | | | | | - | | | d | | | + """ + a b c + + d + """ And the ways | nodes | | ab | @@ -42,9 +44,11 @@ Feature: Testbot - side bias end """ And the node map - | a | | b | | c | - | | | | | | - | | | d | | | + """ + a b c + + d + """ And the ways | nodes | | ab | @@ -59,11 +63,13 @@ Feature: Testbot - side bias Scenario: Roundabout exit counting for left sided driving And a grid size of 10 meters And the node map - | | | a | | | - | | | b | | | - | h | g | | c | d | - | | | e | | | - | | | f | | | + """ + a + b + h g c d + e + f + """ And the ways | nodes | junction | | ab | | @@ -81,11 +87,13 @@ Feature: Testbot - side bias Scenario: Mixed Entry and Exit And a grid size of 10 meters And the node map - | | c | | a | | - | j | | b | | f | - | | k | | e | | - | l | | h | | d | - | | g | | i | | + """ + c a + j b f + k e + l h d + g i + """ And the ways | nodes | junction | oneway | diff --git a/features/testbot/snap.feature b/features/testbot/snap.feature index 80c44bb88..eb0c46053 100644 --- a/features/testbot/snap.feature +++ b/features/testbot/snap.feature @@ -6,11 +6,13 @@ Feature: Snap start/end point to the nearest way Scenario: Snap to nearest protruding oneway Given the node map - | | 1 | | 2 | | - | 8 | | n | | 3 | - | | w | c | e | | - | 7 | | s | | 4 | - | | 6 | | 5 | | + """ + 1 2 + 8 n 3 + w c e + 7 s 4 + 6 5 + """ And the ways | nodes | @@ -32,10 +34,12 @@ Feature: Snap start/end point to the nearest way Scenario: Snap to nearest edge of a square Given the node map - | 4 | 5 | 6 | 7 | - | 3 | a | | u | - | 2 | | | | - | 1 | d | | b | + """ + 4 5 6 7 + 3 a u + 2 + 1 d b + """ And the ways | nodes | @@ -51,10 +55,12 @@ Feature: Snap start/end point to the nearest way Scenario: Snap to edge right under start/end point Given the node map - | d | e | f | g | - | c | | | h | - | b | | | i | - | a | l | k | j | + """ + d e f g + c h + b i + a l k j + """ And the ways | nodes | @@ -79,8 +85,10 @@ Feature: Snap start/end point to the nearest way Scenario: Snapping in viaroute Given the extract extra arguments "--small-component-size 4" Given the node map - | a | | c | e | - | b | | d | f | + """ + a c e + b d f + """ And the ways | nodes | @@ -99,9 +107,11 @@ Feature: Snap start/end point to the nearest way Scenario: Snap to correct way at large scales Given a grid size of 1000 meters Given the node map - | | | | a | - | x | | | b | - | | | | c | + """ + a + x b + c + """ And the ways | nodes | @@ -121,23 +131,25 @@ Feature: Snap start/end point to the nearest way Scenario: Find edges within 100m, and the same from 1km Given a grid size of 100 meters Given the node map - | p | | | | | | | | i | | | | | | | | j | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | 8 | | 1 | | 2 | | | | | | | - | | | | | | | | h | a | b | | | | | | | | - | o | | | | | | 7 | g | x | c | 3 | | | | | | k | - | | | | | | | | f | e | d | | | | | | | | - | | | | | | | 6 | | 5 | | 4 | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | | | | | | | | | | | | | | | | | | - | n | | | | | | | | m | | | | | | | | l | + """ + p i j + + + + + + 8 1 2 + h a b + o 7 g x c 3 k + f e d + 6 5 4 + + + + + + n m l + """ Given the ways | nodes | diff --git a/features/testbot/speed.feature b/features/testbot/speed.feature index 041641962..a71cce7b4 100644 --- a/features/testbot/speed.feature +++ b/features/testbot/speed.feature @@ -19,7 +19,9 @@ Feature: Testbot - speeds Scenario: Testbot - Speed on rivers, map Given the node map - | a | b | + """ + a b + """ And the ways | nodes | highway | diff --git a/features/testbot/status.feature b/features/testbot/status.feature index 2ecab270d..6320924e6 100644 --- a/features/testbot/status.feature +++ b/features/testbot/status.feature @@ -6,7 +6,9 @@ Feature: Status messages Scenario: Route found Given the node map - | a | b | + """ + a b + """ Given the ways | nodes | @@ -19,9 +21,11 @@ Feature: Status messages Scenario: No route found Given the node map - | a | b | - | | | - | c | d | + """ + a b + + c d + """ Given the ways | nodes | diff --git a/features/testbot/summary.feature b/features/testbot/summary.feature index 83c05684f..559e101e7 100644 --- a/features/testbot/summary.feature +++ b/features/testbot/summary.feature @@ -8,7 +8,9 @@ Feature: Basic Routing @smallest Scenario: Checking Given the node map - | a | b | 1 | c | d | e | + """ + a b 1 c d e + """ And the ways | nodes | @@ -28,8 +30,10 @@ Feature: Basic Routing @smallest Scenario: Check handling empty values Given the node map - | a | b | | c | | d | f | - | | | | | | e | | + """ + a b c d f + e + """ And the ways | nodes | name | @@ -46,7 +50,9 @@ Feature: Basic Routing @smallest @todo Scenario: Summaries when routing on a simple network Given the node map - | a | b | + """ + a b + """ And the ways | nodes | @@ -60,9 +66,11 @@ Feature: Basic Routing @repeated Scenario: Check handling empty values Given the node map - | f | | | x | | | - | b | c | d | e | 1 | g | - | a | | | y | | | + """ + f x + b c d e 1 g + a y + """ And the ways | nodes | name | # | diff --git a/features/testbot/time.feature b/features/testbot/time.feature index 6fa32e3e7..1bb8e66b1 100644 --- a/features/testbot/time.feature +++ b/features/testbot/time.feature @@ -11,9 +11,11 @@ Feature: Estimation of travel time Scenario: Basic travel time, 10m scale Given a grid size of 10 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | @@ -40,9 +42,11 @@ Feature: Estimation of travel time Scenario: Basic travel time, 100m scale Given a grid size of 100 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | @@ -69,9 +73,11 @@ Feature: Estimation of travel time Scenario: Basic travel time, 1km scale Given a grid size of 1000 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | @@ -98,9 +104,11 @@ Feature: Estimation of travel time Scenario: Basic travel time, 10km scale Given a grid size of 10000 meters Given the node map - | h | a | b | - | g | x | c | - | f | e | d | + """ + h a b + g x c + f e d + """ And the ways | nodes | highway | @@ -126,9 +134,11 @@ Feature: Estimation of travel time Scenario: Time of travel depending on way type Given the node map - | a | b | - | c | d | - | e | f | + """ + a b + c d + e f + """ And the ways | nodes | highway | @@ -145,8 +155,10 @@ Feature: Estimation of travel time Scenario: Time of travel on a series of ways Given the node map - | a | b | e | - | f | c | d | + """ + a b e + f c d + """ And the ways | nodes | highway | @@ -164,9 +176,11 @@ Feature: Estimation of travel time Scenario: Time of travel on a winding way Given the node map - | a | | i | h | - | b | c | | g | - | | d | e | f | + """ + a i h + b c g + d e f + """ And the ways | nodes | highway | @@ -180,9 +194,11 @@ Feature: Estimation of travel time Scenario: Time of travel on combination of road types Given the node map - | a | b | c | - | | | d | - | | | e | + """ + a b c + d + e + """ And the ways | nodes | highway | @@ -198,10 +214,12 @@ Feature: Estimation of travel time Scenario: Time of travel on part of a way Given the node map - | a | 1 | - | | 2 | - | | 3 | - | b | 4 | + """ + a 1 + 2 + 3 + b 4 + """ And the ways | nodes | highway | @@ -219,9 +237,11 @@ Feature: Estimation of travel time Scenario: Total travel time should match sum of times of individual ways Given a grid size of 1000 meters And the node map - | a | b | | | | - | | | | | | - | | c | | | d | + """ + a b + + c d + """ And the ways | nodes | highway | diff --git a/features/testbot/traffic_turn_penalties.feature b/features/testbot/traffic_turn_penalties.feature index 7ee9424ab..81b65ea39 100644 --- a/features/testbot/traffic_turn_penalties.feature +++ b/features/testbot/traffic_turn_penalties.feature @@ -3,10 +3,23 @@ Feature: Traffic - turn penalties applied to turn onto which a phantom node snap Background: Simple map with phantom nodes Given the node map - | | 1 | | 2 | | 3 | | - | a:1 | | b:2 | | c:3 | | d:4 | - | | | | | | | | - | | | e:5 | | f:6 | | g:7 | + """ + 1 2 3 + a b c d + + e f g + """ + + And the nodes + | node | id | + | a | 1 | + | b | 2 | + | c | 3 | + | d | 4 | + | e | 5 | + | f | 6 | + | g | 7 | + And the ways | nodes | highway | | ab | primary | diff --git a/features/testbot/trip.feature b/features/testbot/trip.feature index 33a1b4956..aae9691f7 100644 --- a/features/testbot/trip.feature +++ b/features/testbot/trip.feature @@ -7,8 +7,10 @@ Feature: Basic trip planning Scenario: Testbot - Trip planning with less than 10 nodes Given the node map - | a | b | - | c | d | + """ + a b + c d + """ And the ways | nodes | @@ -24,10 +26,12 @@ Feature: Basic trip planning Scenario: Testbot - Trip planning with more than 10 nodes Given the node map - | a | b | c | d | - | l | | | e | - | k | | | f | - | j | i | h | g | + """ + a b c d + l e + k f + j i h g + """ And the ways | nodes | @@ -51,13 +55,15 @@ Feature: Basic trip planning Scenario: Testbot - Trip planning with multiple scc Given the node map - | a | b | c | d | - | l | | | e | - | k | | | f | - | j | i | h | g | - | | | | | - | q | m | n | | - | | p | o | | + """ + a b c d + l e + k f + j i h g + + q m n + p o + """ And the ways | nodes | @@ -87,9 +93,11 @@ Feature: Basic trip planning # Test single node in each component #1850 Scenario: Testbot - Trip planning with less than 10 nodes Given the node map - | a | 1 | b | - | | | | - | c | 2 | d | + """ + a 1 b + + c 2 d + """ And the ways | nodes | diff --git a/features/testbot/utf.feature b/features/testbot/utf.feature index 7bf2422ed..36800db61 100644 --- a/features/testbot/utf.feature +++ b/features/testbot/utf.feature @@ -6,7 +6,9 @@ Feature: Handling of UTF characters Scenario: Streetnames with UTF characters Given the node map - | a | b | c | d | + """ + a b c d + """ And the ways | nodes | name | @@ -24,7 +26,9 @@ Feature: Handling of UTF characters @todo Scenario: Up to 255 Unicode Code Points (255 x Panda Code Point) Given the node map - | a | b | c | + """ + a b c + """ And the ways | nodes | name | highway | diff --git a/features/testbot/via.feature b/features/testbot/via.feature index 62699b8f0..e1716bd33 100644 --- a/features/testbot/via.feature +++ b/features/testbot/via.feature @@ -6,7 +6,9 @@ Feature: Via points Scenario: Simple via point Given the node map - | a | b | c | + """ + a b c + """ And the ways | nodes | @@ -19,7 +21,9 @@ Feature: Via points Scenario: Simple via point with core factor Given the contract extra arguments "--core 0.8" Given the node map - | a | b | c | + """ + a b c + """ And the ways | nodes | @@ -33,8 +37,10 @@ Feature: Via points Scenario: Via point at a dead end Given the node map - | a | b | c | - | | d | | + """ + a b c + d + """ And the ways | nodes | @@ -48,8 +54,10 @@ Feature: Via points Scenario: Multiple via points Given the node map - | a | | | | e | f | g | | - | | b | c | d | | | | h | + """ + a e f g + b c d h + """ And the ways | nodes | @@ -69,9 +77,11 @@ Feature: Via points Scenario: Duplicate via point Given the node map - | x | | | | | | - | a | 1 | 2 | 3 | 4 | b | - | | | | | | | + """ + x + a 1 2 3 4 b + + """ And the ways | nodes | @@ -85,9 +95,11 @@ Feature: Via points Scenario: Via points on ring of oneways # xa it to avoid only having a single ring, which cna trigger edge cases Given the node map - | | x | | | | | | g | | - | | a | 1 | b | 2 | c | 3 | d | | - | i | f | | | | | | e | h | + """ + x g + a 1 b 2 c 3 d + i f e h + """ And the ways | nodes | oneway | @@ -113,9 +125,11 @@ Feature: Via points Scenario: Via points on ring on the same oneway # xa it to avoid only having a single ring, which cna trigger edge cases Given the node map - | | x | | | | e | | - | | a | 1 | 2 | 3 | b | | - | g | d | | | | c | f | + """ + x e + a 1 2 3 b + g d c f + """ And the ways | nodes | oneway | @@ -139,9 +153,11 @@ Feature: Via points # See issue #1896 Scenario: Via point at a dead end with oneway Given the node map - | a | b | c | - | | d | | - | | e | | + """ + a b c + d + e + """ And the ways | nodes | oneway | @@ -157,9 +173,11 @@ Feature: Via points # See issue #2349 Scenario: Via point at a dead end with oneway Given the node map - | a | b | c | - | | d | | - | | e | | + """ + a b c + d + e + """ And the ways | nodes | oneway | @@ -176,10 +194,12 @@ Feature: Via points @todo Scenario: Via point at a dead end with oneway Given the node map - | a | b | c | - | | d | | - | | e | g | - | | f | | + """ + a b c + d + e g + f + """ And the ways | nodes | oneway | @@ -199,12 +219,14 @@ Feature: Via points Scenario: Via point at a dead end with barrier Given the profile "car" Given the node map - | a | b | c | - | | 1 | | - | | d | | - | | | | - | | | | - | f | e | | + """ + a b c + 1 + d + + + f e + """ And the nodes | node | barrier | @@ -223,10 +245,12 @@ Feature: Via points Scenario: Via points on ring on the same oneway, forces one of the vertices to be top node Given the node map - | a | 1 | 2 | b | - | 8 | | | 3 | - | 7 | | | 4 | - | d | 6 | 5 | c | + """ + a 1 2 b + 8 3 + 7 4 + d 6 5 c + """ And the ways | nodes | oneway | @@ -244,11 +268,13 @@ Feature: Via points Scenario: Multiple Via points on ring on the same oneway, forces one of the vertices to be top node Given the node map - | a | 1 | 2 | 3 | b | - | | | | | 4 | - | | | | | 5 | - | | | | | 6 | - | d | 9 | 8 | 7 | c | + """ + a 1 2 3 b + 4 + 5 + 6 + d 9 8 7 c + """ And the ways | nodes | oneway | @@ -269,8 +295,10 @@ Feature: Via points @todo Scenario: Incorrect ordering of nodes can produce multiple U-turns Given the node map - | | a | | | | - | e | b | c | d | f | + """ + a + e b c d f + """ And the ways | nodes | oneway | @@ -284,7 +312,9 @@ Feature: Via points @2798 Scenario: UTurns Enabled Given the node map - | a | b | c | d | e | + """ + a b c d e + """ And the query options | continue_straight | false |