diff --git a/features/guidance/advanced-lanes.feature b/features/guidance/advanced-lanes.feature index a61811224..7c76c9034 100644 --- a/features/guidance/advanced-lanes.feature +++ b/features/guidance/advanced-lanes.feature @@ -124,10 +124,10 @@ Feature: Turn Lane Guidance Given the node map """ g f - - j h e - - a b c + | | + j --- h - e + | | + a --- b - c i d """ @@ -154,21 +154,21 @@ Feature: Turn Lane Guidance Given the node map """ g j - - - - - - f - e - d - a b c - - - - - - + | | + | | + | | + | | + | | + | |,f + |,e + ,d | + a --------- b c | + / | | + / | | + / | | + | | | + | | | + | | | l h i """ @@ -202,21 +202,21 @@ Feature: Turn Lane Guidance Given the node map """ g j - - - - - - f - e - d - a b c - - - - - - + | | + | | + | | + | | + | | + | |,f + |,e + ,d | + a --------- b c | + / | | + / | | + / | | + | | | + | | | + | | | l h i """ diff --git a/features/guidance/continue.feature b/features/guidance/continue.feature index 235707631..47cdb1222 100644 --- a/features/guidance/continue.feature +++ b/features/guidance/continue.feature @@ -9,7 +9,7 @@ Feature: Continue Instructions Given the node map """ c - a b d + a - b-d """ And the ways @@ -26,7 +26,7 @@ Feature: Continue Instructions Given the node map """ c - a b d + a - b-d """ And the ways @@ -43,7 +43,7 @@ Feature: Continue Instructions Given the node map """ c - a b d + a - b-d e """ @@ -62,7 +62,7 @@ Feature: Continue Instructions Scenario: Road turning right Given the node map """ - a b d + a - b-d c """ @@ -80,9 +80,9 @@ Feature: Continue Instructions Given the node map """ c - - a b - d + / + a - b + `d """ And the ways @@ -98,9 +98,9 @@ Feature: Continue Instructions Scenario: Road turning slight right Given the node map """ - d - a b - + ,d + a - b + \ c """ @@ -117,11 +117,11 @@ 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 diff --git a/features/guidance/dedicated-turn-roads.feature b/features/guidance/dedicated-turn-roads.feature index 8c0e27716..3d78c99ed 100644 --- a/features/guidance/dedicated-turn-roads.feature +++ b/features/guidance/dedicated-turn-roads.feature @@ -9,13 +9,13 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ e - a b . . c d - `h . - ` - 1 ` - . - f - . + a b-----c d + `--h | + || + 1|| + || + `f + | g """ @@ -41,11 +41,11 @@ Feature: Slipways and Dedicated Turn Lanes """ e a-b-----c-------------------------d - `h | + `--h | || 1|| - `| - f + || + `f | g """ @@ -72,18 +72,18 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ e - a b c d - h - - - - - - - + a-b----]c[-d + `--h | + \| + | + | + | + | + | + | f - - + | + | g """ @@ -101,14 +101,14 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ e - a b c d - h - - - + a-b----]c[d + `--h | + \| + | + | f - - + | + | g """ @@ -125,15 +125,15 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Inner city expressway with on road Given the node map """ - a b . . . c g - `f . - ` - . - . + a b-------c g + `--f | + \| + | + | d - . - . - . + | + | + | e """ @@ -157,12 +157,12 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ a f - + | | b e - - - g - + |\ /| + | | | + | g | + | | c d """ @@ -180,11 +180,11 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ a f - + | | b e - g - - + |\g/| + | | + | | c d """ @@ -281,23 +281,23 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Self-Loop Given the node map """ - 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 @@ -316,23 +316,23 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Self-Loop - Bidirectional Given the node map """ - 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 @@ -349,31 +349,30 @@ Feature: Slipways and Dedicated Turn Lanes Given the node map """ j - a b c d - - - - - - e - - - - - - - - - - - - - - - 1 - - f g - + a-b ----------------------------------------- c ------------d + \ | + \ | + \ | + \ | + \ | + e | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ | + \ 1 + `---------- f ------- g ----------\ + | \ i h """ @@ -398,20 +397,20 @@ Feature: Slipways and Dedicated Turn Lanes Scenario: Turn Instead of Ramp Given the node map """ - f - g h - d e - i c j - - - - - - - - + /--------------------f + g-----------h--\ | + d-----e + i c-----------j--/ + | | + | | + | | + | | + | | + \ / + \ / + \ / b - + | a """ diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature index e86e22d26..d60d248bf 100644 --- a/features/guidance/motorway.feature +++ b/features/guidance/motorway.feature @@ -8,8 +8,8 @@ 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 @@ -25,9 +25,9 @@ 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 @@ -43,12 +43,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 | nodes | highway | oneway | | abcde | motorway | | @@ -63,8 +62,8 @@ 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 @@ -80,9 +79,9 @@ 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 @@ -98,9 +97,9 @@ 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 @@ -116,8 +115,8 @@ 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 @@ -133,8 +132,8 @@ 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 @@ -150,9 +149,9 @@ 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 @@ -168,9 +167,9 @@ 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 @@ -187,8 +186,8 @@ 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 @@ -207,8 +206,8 @@ 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 @@ -227,9 +226,9 @@ Feature: Motorway Guidance Scenario: Merging Motorways Given the node map """ - e - a b c - d + e\ + a-b-c + d/ """ And the ways @@ -246,8 +245,8 @@ Feature: Motorway Guidance Scenario: Handle 90 degree off ramps correctly Given the node map """ - a - x b c y + a\ + x-b---c-y d """ diff --git a/features/guidance/suppressed.feature b/features/guidance/suppressed.feature index 5f67201e9..b0580996a 100644 --- a/features/guidance/suppressed.feature +++ b/features/guidance/suppressed.feature @@ -8,8 +8,8 @@ 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 @@ -24,7 +24,7 @@ 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 @@ -43,7 +43,7 @@ Feature: Suppressed Turns Scenario: Don't Announce Turn on following major road class -- service Given the node map """ - a b d + a-b-d c """ @@ -59,7 +59,7 @@ Feature: Suppressed Turns Scenario: Don't Announce Turn on following major road class -- residential Given the node map """ - a b d + a-b-d c """