diff --git a/features/testbot/matching_turns.feature b/features/testbot/matching_turns.feature index 94de60e35..2dec2295e 100644 --- a/features/testbot/matching_turns.feature +++ b/features/testbot/matching_turns.feature @@ -26,54 +26,54 @@ Feature: Turn directions/codes | xo | When I match I should get - | trace | route | turns | matchings | - | im | xi,xm | depart,left,arrive | im | - | io | xi,xo | depart,slight_left,arrive | io | - | ia | xi,xa | depart,straight,arrive | ia | - | ic | xi,xc | depart,slight_right,arrive | ic | - | ie | xi,xe | depart,right,arrive | ie | + | trace | route | turns | matchings | + | im | xi,xm,xm | depart,left,arrive | im | + | io | xi,xo,xo | depart,slight_left,arrive | io | + | ia | xi,xa,xa | depart,straight,arrive | ia | + | ic | xi,xc,xc | depart,slight_right,arrive | ic | + | ie | xi,xe,xe | depart,right,arrive | ie | - | ko | xk,xo | depart,left,arrive | ko | - | ka | xk,xa | depart,slight_left,arrive | ka | - | kc | xk,xc | depart,straight,arrive | kc | - | ke | xk,xe | depart,slight_right,arrive | ke | - | kg | xk,xg | depart,right,arrive | kg | + | ko | xk,xo,xo | depart,left,arrive | ko | + | ka | xk,xa,xa | depart,slight_left,arrive | ka | + | kc | xk,xc,xc | depart,straight,arrive | kc | + | ke | xk,xe,xe | depart,slight_right,arrive | ke | + | kg | xk,xg,xg | depart,right,arrive | kg | - | ma | xm,xa | depart,left,arrive | ma | - | mc | xm,xc | depart,slight_left,arrive | mc | - | me | xm,xe | depart,straight,arrive | me | - | mg | xm,xg | depart,slight_right,arrive | mg | - | mi | xm,xi | depart,right,arrive | mi | + | ma | xm,xa,xa | depart,left,arrive | ma | + | mc | xm,xc,xc | depart,slight_left,arrive | mc | + | me | xm,xe,xe | depart,straight,arrive | me | + | mg | xm,xg,xg | depart,slight_right,arrive | mg | + | mi | xm,xi,xi | depart,right,arrive | mi | - | oc | xo,xc | depart,left,arrive | oc | - | oe | xo,xe | depart,slight_left,arrive | oe | - | og | xo,xg | depart,straight,arrive | og | - | oi | xo,xi | depart,slight_right,arrive | oi | - | ok | xo,xk | depart,right,arrive | ok | + | oc | xo,xc,xc | depart,left,arrive | oc | + | oe | xo,xe,xe | depart,slight_left,arrive | oe | + | og | xo,xg,xg | depart,straight,arrive | og | + | oi | xo,xi,xi | depart,slight_right,arrive | oi | + | ok | xo,xk,xk | depart,right,arrive | ok | - | ae | xa,xe | depart,left,arrive | ae | - | ag | xa,xg | depart,slight_left,arrive | ag | - | ai | xa,xi | depart,straight,arrive | ai | - | ak | xa,xk | depart,slight_right,arrive | ak | - | am | xa,xm | depart,right,arrive | am | + | ae | xa,xe,xe | depart,left,arrive | ae | + | ag | xa,xg,xg | depart,slight_left,arrive | ag | + | ai | xa,xi,xi | depart,straight,arrive | ai | + | ak | xa,xk,xk | depart,slight_right,arrive | ak | + | am | xa,xm,xm | depart,right,arrive | am | - | cg | xc,xg | depart,left,arrive | cg | - | ci | xc,xi | depart,slight_left,arrive | ci | - | ck | xc,xk | depart,straight,arrive | ck | - | cm | xc,xm | depart,slight_right,arrive | cm | - | co | xc,xo | depart,right,arrive | co | + | cg | xc,xg,xg | depart,left,arrive | cg | + | ci | xc,xi,xi | depart,slight_left,arrive | ci | + | ck | xc,xk,xk | depart,straight,arrive | ck | + | cm | xc,xm,xm | depart,slight_right,arrive | cm | + | co | xc,xo,xo | depart,right,arrive | co | - | ei | xe,xi | depart,left,arrive | ei | - | ek | xe,xk | depart,slight_left,arrive | ek | - | em | xe,xm | depart,straight,arrive | em | - | eo | xe,xo | depart,slight_right,arrive | eo | - | ea | xe,xa | depart,right,arrive | ea | + | ei | xe,xi,xi | depart,left,arrive | ei | + | ek | xe,xk,xk | depart,slight_left,arrive | ek | + | em | xe,xm,xm | depart,straight,arrive | em | + | eo | xe,xo,xo | depart,slight_right,arrive | eo | + | ea | xe,xa,xa | depart,right,arrive | ea | - | gk | xg,xk | depart,left,arrive | gk | - | gm | xg,xm | depart,slight_left,arrive | gm | - | go | xg,xo | depart,straight,arrive | go | - | ga | xg,xa | depart,slight_right,arrive | ga | - | gc | xg,xc | depart,right,arrive | gc | + | gk | xg,xk,xk | depart,left,arrive | gk | + | gm | xg,xm,xm | depart,slight_left,arrive | gm | + | go | xg,xo,xo | depart,straight,arrive | go | + | ga | xg,xa,xa | depart,slight_right,arrive | ga | + | gc | xg,xc,xc | depart,right,arrive | gc | Scenario: Turn directions Given the query options @@ -97,9 +97,9 @@ Feature: Turn directions/codes | xo | When I match I should get - | trace | route | turns | matchings | duration | - | im | xi,xm | depart,left,arrive | im | 80 | - | io | xi,xo | depart,slight_left,arrive | io | 88 | - | ia | xi,xa | depart,straight,arrive | ia | 80 | - | ic | xi,xc | depart,slight_right,arrive | ic | 88 | - | ie | xi,xe | depart,right,arrive | ie | 60 | + | trace | route | turns | matchings | duration | + | im | xi,xm,xm | depart,left,arrive | im | 80 | + | io | xi,xo,xo | depart,slight_left,arrive | io | 88 | + | ia | xi,xa,xa | depart,straight,arrive | ia | 80 | + | ic | xi,xc,xc | depart,slight_right,arrive | ic | 88 | + | ie | xi,xe,xe | depart,right,arrive | ie | 60 | diff --git a/features/testbot/mode.feature b/features/testbot/mode.feature index 5bccf2d24..108607ffc 100644 --- a/features/testbot/mode.feature +++ b/features/testbot/mode.feature @@ -24,9 +24,9 @@ Feature: Testbot - Travel mode | cd | residential | foo | When I route I should get - | from | to | route | modes | - | a | d | foo,foo,foo | driving,river downstream,driving | - | b | d | foo,foo | river downstream,driving | + | from | to | route | modes | + | a | d | foo,foo,foo,foo | driving,river downstream,driving,driving | + | b | d | foo,foo,foo | river downstream,driving,driving | @mokob @2166 Scenario: Testbot - Compressed Modes @@ -40,9 +40,9 @@ Feature: Testbot - Travel mode | efg | residential | solid | When I route I should get - | from | to | route | modes | turns | - | a | g | road,liquid,solid | driving,river downstream,driving | depart,straight,straight,arrive | - | c | g | liquid,solid | river downstream,driving | depart,straight,arrive | + | from | to | route | modes | turns | + | a | g | road,liquid,solid,solid | driving,river downstream,driving,driving | depart,straight,straight,arrive | + | c | g | liquid,solid,solid | river downstream,driving,driving | depart,straight,arrive | @mokob @2166 Scenario: Testbot - Modes in each direction, different forward/backward speeds @@ -55,15 +55,15 @@ Feature: Testbot - Travel mode | ab | river | | When I route I should get - | from | to | route | modes | - | a | 0 | ab | river downstream | - | a | b | ab | river downstream | - | 0 | 1 | ab | river downstream | - | 0 | b | ab | river downstream | - | b | 1 | ab | river upstream | - | b | a | ab | river upstream | - | 1 | 0 | ab | river upstream | - | 1 | a | ab | river upstream | + | from | to | route | modes | + | a | 0 | ab,ab | river downstream,river downstream | + | a | b | ab,ab | river downstream,river downstream | + | 0 | 1 | ab,ab | river downstream,river downstream | + | 0 | b | ab,ab | river downstream,river downstream | + | b | 1 | ab,ab | river upstream,river upstream | + | b | a | ab,ab | river upstream,river upstream | + | 1 | 0 | ab,ab | river upstream,river upstream | + | 1 | a | ab,ab | river upstream,river upstream | Scenario: Testbot - Modes in each direction, same forward/backward speeds Given the node map @@ -75,9 +75,9 @@ Feature: Testbot - Travel mode | ab | steps | When I route I should get - | from | to | route | modes | time | - | 0 | 1 | ab | steps down | 60s +-1 | - | 1 | 0 | ab | steps up | 60s +-1 | + | from | to | route | modes | time | + | 0 | 1 | ab,ab | steps down,steps down | 60s +-1 | + | 1 | 0 | ab,ab | steps up,steps up | 60s +-1 | @oneway @mokob @2166 Scenario: Testbot - Modes for oneway, different forward/backward speeds @@ -89,9 +89,9 @@ Feature: Testbot - Travel mode | ab | river | yes | When I route I should get - | from | to | route | modes | - | a | b | ab | river downstream | - | b | a | | | + | from | to | route | modes | + | a | b | ab,ab | river downstream,river downstream | + | b | a | | | @oneway Scenario: Testbot - Modes for oneway, same forward/backward speeds @@ -103,9 +103,9 @@ Feature: Testbot - Travel mode | ab | steps | yes | When I route I should get - | from | to | route | modes | - | a | b | ab | steps down | - | b | a | | | + | from | to | route | modes | + | a | b | ab,ab | steps down,steps down | + | b | a | | | @oneway @mokob @2166 Scenario: Testbot - Modes for reverse oneway, different forward/backward speeds @@ -117,9 +117,9 @@ Feature: Testbot - Travel mode | ab | river | -1 | When I route I should get - | from | to | route | modes | - | a | b | | | - | b | a | ab | river upstream | + | from | to | route | modes | + | a | b | | | + | b | a | ab,ab | river upstream,river upstream | @oneway Scenario: Testbot - Modes for reverse oneway, same forward/backward speeds @@ -131,9 +131,9 @@ Feature: Testbot - Travel mode | ab | steps | -1 | When I route I should get - | from | to | route | modes | - | a | b | | | - | b | a | ab | steps up | + | from | to | route | modes | + | a | b | | | + | b | a | ab,ab | steps up,steps up | @via @mokob @2166 Scenario: Testbot - Mode should be set at via points @@ -145,9 +145,9 @@ Feature: Testbot - Travel mode | ab | river | When I route I should get - | waypoints | route | modes | turns | - | a,1,b | ab,ab | river downstream,river downstream | depart,via,arrive | - | b,1,a | ab,ab | river upstream,river upstream | depart,via,arrive | + | waypoints | routes | modes | turns | + | a,1,b | ab,ab,ab | river downstream,river downstream,river downstream | depart,via,arrive | + | b,1,a | ab,ab,ab | river upstream,river upstream,river upstream | depart,via,arrive | @mokob @2166 Scenario: Testbot - Starting at a tricky node @@ -161,8 +161,8 @@ Feature: Testbot - Travel mode | bc | primary | When I route I should get - | from | to | route | modes | - | b | a | ab | river upstream | + | from | to | route | modes | + | b | a | ab,ab | river upstream,river upstream | @mokob @2166 Scenario: Testbot - Mode changes on straight way without name change @@ -175,11 +175,11 @@ Feature: Testbot - Travel mode | bc | river | Avenue | When I route I should get - | from | to | route | modes | turns | - | a | c | Avenue,Avenue | driving,river downstream | depart,straight,arrive | - | c | a | Avenue,Avenue | river upstream,driving | depart,straight,arrive | - | 1 | 2 | Avenue,Avenue | driving,river downstream | depart,straight,arrive | - | 2 | 1 | Avenue,Avenue | river upstream,driving | depart,straight,arrive | + | from | to | route | modes | turns | + | a | c | Avenue,Avenue,Avenue | driving,river downstream,river downstream | depart,straight,arrive | + | c | a | Avenue,Avenue,Avenue | river upstream,driving,driving | depart,straight,arrive | + | 1 | 2 | Avenue,Avenue,Avenue | driving,river downstream,river downstream | depart,straight,arrive | + | 2 | 1 | Avenue,Avenue,Avenue | river upstream,driving,driving | depart,straight,arrive | Scenario: Testbot - Mode for routes Given the node map @@ -195,14 +195,14 @@ Feature: Testbot - Travel mode | ef | primary | | | When I route I should get - | from | to | route | turns | modes | - | a | d | ab,bc,cd | depart,right,left,arrive | driving,route,driving | - | d | a | cd,bc,ab | depart,right,left,arrive | driving,route,driving | - | c | a | bc,ab | depart,left,arrive | route,driving | - | d | b | cd,bc | depart,right,arrive | driving,route | - | a | c | ab,bc | depart,right,arrive | driving,route | - | b | d | bc,cd | depart,left,arrive | route,driving | - | a | f | ab,bc,cd,de,ef | depart,right,left,straight,straight,arrive | driving,route,driving,driving,driving | + | from | to | route | turns | modes | + | a | d | ab,bc,cd,cd | depart,right,left,arrive | driving,route,driving,driving | + | d | a | cd,bc,ab,ab | depart,right,left,arrive | driving,route,driving,driving | + | c | a | bc,ab,ab | depart,left,arrive | route,driving,driving | + | d | b | cd,bc,bc | depart,right,arrive | driving,route,route | + | a | c | ab,bc,bc | depart,right,arrive | driving,route,route | + | b | d | bc,cd,cd | depart,left,arrive | route,driving,driving | + | a | f | ab,bc,cd,de,ef,ef | depart,right,left,straight,straight,arrive | driving,route,driving,driving,driving,driving | @mokob @2166 Scenario: Testbot - Modes, triangle map @@ -223,21 +223,21 @@ Feature: Testbot - Travel mode | de | primary | | When I route I should get - | from | to | route | modes | - | 0 | 1 | abc,ce,de | driving,river downstream,driving | - | 1 | 0 | de,ce,abc | driving,river upstream,driving | - | 0 | 2 | abc,cd | driving,driving | - | 2 | 0 | cd,de,ce,abc | driving,driving,river upstream,driving | - | 0 | 3 | abc,ce | driving,river downstream | - | 3 | 0 | ce,abc | river upstream,driving | - | 4 | 3 | ce | river downstream | - | 3 | 4 | ce | river upstream | - | 3 | 1 | ce,de | river downstream,driving | - | 1 | 3 | de,ce | driving,river upstream | - | a | e | abc,ce | driving,river downstream | - | e | a | ce,abc | river upstream,driving | - | a | d | abc,cd | driving,driving | - | d | a | de,ce,abc | driving,river upstream,driving | + | from | to | route | modes | + | 0 | 1 | abc,ce,de,de | driving,river downstream,driving,driving | + | 1 | 0 | de,ce,abc,abc | driving,river upstream,driving,driving | + | 0 | 2 | abc,cd,cd | driving,driving,driving | + | 2 | 0 | cd,de,ce,abc,abc | driving,driving,river upstream,driving,driving | + | 0 | 3 | abc,ce,ce | driving,river downstream,river downstream | + | 3 | 0 | ce,abc,abc | river upstream,driving,driving | + | 4 | 3 | ce,ce | river downstream,river downstream | + | 3 | 4 | ce,ce | river upstream,river upstream | + | 3 | 1 | ce,de,de | river downstream,driving,driving | + | 1 | 3 | de,ce,ce | driving,river upstream,river upstream | + | a | e | abc,ce,ce | driving,river downstream,river downstream | + | e | a | ce,abc,abc | river upstream,driving,driving | + | a | d | abc,cd,cd | driving,driving,driving | + | d | a | de,ce,abc,abc | driving,river upstream,driving,driving | @mokob @2166 Scenario: Testbot - River in the middle @@ -253,12 +253,12 @@ Feature: Testbot - Travel mode | efg | primary | When I route I should get - | from | to | route | modes | - | a | g | abc,cde,efg | driving,river downstream,driving | - | b | f | abc,cde,efg | driving,river downstream,driving | - | e | c | cde | river upstream | - | e | b | cde,abc | river upstream,driving | - | e | a | cde,abc | river upstream,driving | - | c | e | cde | river downstream | - | c | f | cde,efg | river downstream,driving | - | c | g | cde,efg | river downstream,driving | + | from | to | route | modes | + | a | g | abc,cde,efg,efg | driving,river downstream,driving,driving | + | b | f | abc,cde,efg,efg | driving,river downstream,driving,driving | + | e | c | cde,cde | river upstream,river upstream | + | e | b | cde,abc,abc | river upstream,driving,driving | + | e | a | cde,abc,abc | river upstream,driving,driving | + | c | e | cde,cde | river downstream,river downstream | + | c | f | cde,efg,efg | river downstream,driving,driving | + | c | g | cde,efg,efg | river downstream,driving,driving | diff --git a/features/testbot/opposite.feature b/features/testbot/opposite.feature index c19755cdc..de11e5ec1 100644 --- a/features/testbot/opposite.feature +++ b/features/testbot/opposite.feature @@ -13,6 +13,6 @@ Feature: Separate settings for forward/backward direction | abcd | river | When I route I should get - | from | to | route | distance | speed | - | a | d | abcd | 300 +- 1m | 36 km/h | - | d | a | abcd | 300 +- 1m | 16 km/h +- 1 | + | from | to | route | distance | speed | + | a | d | abcd,abcd | 300 +- 1m | 36 km/h | + | d | a | abcd,abcd | 300 +- 1m | 16 km/h +- 1 | diff --git a/features/testbot/origin.feature b/features/testbot/origin.feature index b5b194502..e56e94dc8 100644 --- a/features/testbot/origin.feature +++ b/features/testbot/origin.feature @@ -17,9 +17,9 @@ Feature: Routing close to the [0,0] origin | abcd | yes | When I route I should get - | from | to | route | distance | - | b | c | abcd | 100m +-1 | - | c | b | | | + | from | to | route | distance | + | b | c | abcd,abcd | 100m +-1 | + | c | b | | | Scenario: North-south oneways close to the origin Given the node locations @@ -34,9 +34,9 @@ Feature: Routing close to the [0,0] origin | abcd | yes | When I route I should get - | from | to | route | distance | - | b | c | abcd | 100m +-1 | - | c | b | | | + | from | to | route | distance | + | b | c | abcd,abcd | 100m +-1 | + | c | b | | | Scenario: East-west oneways crossing the origin Given the node locations @@ -52,9 +52,9 @@ Feature: Routing close to the [0,0] origin | abcde | yes | When I route I should get - | from | to | route | distance | - | b | d | abcde | 200m +-2 | - | d | b | | | + | from | to | route | distance | + | b | d | abcde,abcde | 200m +-2 | + | d | b | | | Scenario: North-south oneways crossing the origin Given the node locations @@ -70,6 +70,6 @@ Feature: Routing close to the [0,0] origin | abcde | yes | When I route I should get - | from | to | route | distance | - | b | d | abcde | 200m +-2 | - | d | b | | | + | from | to | route | distance | + | b | d | abcde,abcde | 200m +-2 | + | d | b | | |