From e5025665fc7261a59e8745be42cc8a78a9110c24 Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Thu, 31 Mar 2016 16:45:03 -0700 Subject: [PATCH] Update foot features to reflect not cutting off arrive instruction --- features/foot/area.feature | 62 ++++++++++---------- features/foot/ferry.feature | 24 ++++---- features/foot/names.feature | 8 +-- features/foot/ref.feature | 10 ++-- features/foot/restrictions.feature | 94 +++++++++++++++--------------- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/features/foot/area.feature b/features/foot/area.feature index 6edd585d6..1e226ee99 100644 --- a/features/foot/area.feature +++ b/features/foot/area.feature @@ -17,15 +17,15 @@ Feature: Foot - Squares and other areas | abcda | yes | residential | When I route I should get - | from | to | route | - | a | b | abcda | - | a | d | abcda | - | b | c | abcda | - | c | b | abcda | - | c | d | abcda | - | d | c | abcda | - | d | a | abcda | - | a | d | abcda | + | from | to | route | + | a | b | abcda,abcda | + | a | d | abcda,abcda | + | b | c | abcda,abcda | + | c | b | abcda,abcda | + | c | d | abcda,abcda | + | d | c | abcda,abcda | + | d | a | abcda,abcda | + | a | d | abcda,abcda | @building Scenario: Foot - Don't route on buildings @@ -65,17 +65,17 @@ Feature: Foot - Squares and other areas | abcda | (nil) | parking | When I route I should get - | from | to | route | - | x | y | xa,abcda,by | - | y | x | by,abcda,xa | - | a | b | abcda | - | a | d | abcda | - | b | c | abcda | - | c | b | abcda | - | c | d | abcda | - | d | c | abcda | - | d | a | abcda | - | a | d | abcda | + | from | to | route | + | x | y | xa,abcda,by,by | + | y | x | by,abcda,xa,xa | + | a | b | abcda,abcda | + | a | d | abcda,abcda | + | b | c | abcda,abcda | + | c | b | abcda,abcda | + | c | d | abcda,abcda | + | d | c | abcda,abcda | + | d | a | abcda,abcda | + | a | d | abcda,abcda | @train @platform Scenario: Foot - railway platforms @@ -90,14 +90,14 @@ Feature: Foot - Squares and other areas | abcda | (nil) | platform | When I route I should get - | from | to | route | - | x | y | xa,abcda,by | - | y | x | by,abcda,xa | - | a | b | abcda | - | a | d | abcda | - | b | c | abcda | - | c | b | abcda | - | c | d | abcda | - | d | c | abcda | - | d | a | abcda | - | a | d | abcda | + | from | to | route | + | x | y | xa,abcda,by,by | + | y | x | by,abcda,xa,xa | + | a | b | abcda,abcda | + | a | d | abcda,abcda | + | b | c | abcda,abcda | + | c | b | abcda,abcda | + | c | d | abcda,abcda | + | d | c | abcda,abcda | + | d | a | abcda,abcda | + | a | d | abcda,abcda | diff --git a/features/foot/ferry.feature b/features/foot/ferry.feature index bcdeed8b8..9ad1c9d74 100644 --- a/features/foot/ferry.feature +++ b/features/foot/ferry.feature @@ -17,15 +17,15 @@ Feature: Foot - Handle ferry routes | efg | primary | | | When I route I should get - | from | to | route | modes | - | a | g | abc,cde,efg | walking,ferry,walking | - | b | f | abc,cde,efg | walking,ferry,walking | - | e | c | cde | ferry | - | e | b | cde,abc | ferry,walking | - | e | a | cde,abc | ferry,walking | - | c | e | cde | ferry | - | c | f | cde,efg | ferry,walking | - | c | g | cde,efg | ferry,walking | + | from | to | route | modes | + | a | g | abc,cde,efg,efg | walking,ferry,walking,walking | + | b | f | abc,cde,efg,efg | walking,ferry,walking,walking | + | e | c | cde,cde | ferry,ferry | + | e | b | cde,abc,abc | ferry,walking,walking | + | e | a | cde,abc,abc | ferry,walking,walking | + | c | e | cde,cde | ferry,ferry | + | c | f | cde,efg,efg | ferry,walking,walking | + | c | g | cde,efg,efg | ferry,walking,walking | Scenario: Foot - Ferry duration, single node Given the node map @@ -58,6 +58,6 @@ Feature: Foot - Handle ferry routes | abcd | | ferry | yes | 1:00 | When I route I should get - | from | to | route | time | - | a | d | abcd | 3600s +-10 | - | d | a | abcd | 3600s +-10 | + | from | to | route | time | + | a | d | abcd,abcd | 3600s +-10 | + | d | a | abcd,abcd | 3600s +-10 | diff --git a/features/foot/names.feature b/features/foot/names.feature index d5fdcc7e4..a765de682 100644 --- a/features/foot/names.feature +++ b/features/foot/names.feature @@ -15,8 +15,8 @@ Feature: Foot - Street names in instructions | bc | Your Way | When I route I should get - | from | to | route | - | a | c | My Way,Your Way | + | from | to | route | + | a | c | My Way,Your Way,Your Way | @unnamed Scenario: Foot - Use way type to describe unnamed ways @@ -29,5 +29,5 @@ Feature: Foot - Street names in instructions | bcd | track | | When I route I should get - | from | to | route | - | a | d | {highway:footway},{highway:track} | + | from | to | route | + | a | d | {highway:footway},{highway:track},{highway:track} | diff --git a/features/foot/ref.feature b/features/foot/ref.feature index bc0c77e14..8fed58692 100644 --- a/features/foot/ref.feature +++ b/features/foot/ref.feature @@ -13,8 +13,8 @@ Feature: Foot - Way ref | ab | Utopia Drive | E7 | When I route I should get - | from | to | route | - | a | b | Utopia Drive / E7 | + | from | to | route | + | a | b | Utopia Drive / E7,Utopia Drive / E7 | Scenario: Foot - Way with only ref Given the node map @@ -26,7 +26,7 @@ Feature: Foot - Way ref When I route I should get | from | to | route | - | a | b | E7 | + | a | b | E7,E7 | Scenario: Foot - Way with only name Given the node map @@ -37,5 +37,5 @@ Feature: Foot - Way ref | ab | Utopia Drive | When I route I should get - | from | to | route | - | a | b | Utopia Drive | + | from | to | route | + | a | b | Utopia Drive,Utopia Drive | diff --git a/features/foot/restrictions.feature b/features/foot/restrictions.feature index 8d6a0297f..ae66658a6 100644 --- a/features/foot/restrictions.feature +++ b/features/foot/restrictions.feature @@ -24,10 +24,10 @@ Feature: Foot - Turn restrictions | restriction | sj | wj | j | no_left_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Foot - No right turn @@ -48,10 +48,10 @@ Feature: Foot - Turn restrictions | restriction | sj | ej | j | no_right_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Foot - No u-turn @@ -72,10 +72,10 @@ Feature: Foot - Turn restrictions | restriction | sj | wj | j | no_u_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Foot - Handle any no_* relation @@ -96,10 +96,10 @@ Feature: Foot - Turn restrictions | restriction | sj | wj | j | no_weird_zigzags | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @only_turning Scenario: Foot - Only left turn @@ -120,10 +120,10 @@ Feature: Foot - Turn restrictions | restriction | sj | wj | j | only_left_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @only_turning Scenario: Foot - Only right turn @@ -144,10 +144,10 @@ Feature: Foot - Turn restrictions | restriction | sj | ej | j | only_right_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @only_turning Scenario: Foot - Only straight on @@ -168,10 +168,10 @@ Feature: Foot - Turn restrictions | restriction | sj | nj | j | only_straight_on | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Foot - Handle any only_* restriction @@ -192,10 +192,10 @@ Feature: Foot - Turn restrictions | restriction | sj | nj | j | only_weird_zigzags | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @except Scenario: Foot - Except tag and on no_ restrictions @@ -221,11 +221,11 @@ Feature: Foot - Turn restrictions | restriction | sj | dj | j | no_right_turn | foot | When I route I should get - | from | to | route | - | s | a | sj,aj | - | s | b | sj,bj | - | s | c | sj,cj | - | s | d | sj,dj | + | from | to | route | + | s | a | sj,aj,aj | + | s | b | sj,bj,bj | + | s | c | sj,cj,cj | + | s | d | sj,dj,dj | @except Scenario: Foot - Except tag and on only_ restrictions @@ -245,9 +245,9 @@ Feature: Foot - Turn restrictions | restriction | sj | aj | j | only_straight_on | foot | When I route I should get - | from | to | route | - | s | a | sj,aj | - | s | b | sj,bj | + | from | to | route | + | s | a | sj,aj,aj | + | s | b | sj,bj,bj | @except Scenario: Foot - Multiple except tag values @@ -279,10 +279,10 @@ Feature: Foot - Turn restrictions | restriction | sj | jf | j | no_straight_on | foot, bus | When I route I should get - | from | to | route | - | s | a | sj,ja | - | s | b | sj,jb | - | s | c | sj,jc | - | s | d | sj,jd | - | s | e | sj,je | - | s | f | sj,jf | + | from | to | route | + | s | a | sj,ja,ja | + | s | b | sj,jb,jb | + | s | c | sj,jc,jc | + | s | d | sj,jd,jd | + | s | e | sj,je,je | + | s | f | sj,jf,jf |