diff --git a/features/testbot/projection.feature b/features/testbot/projection.feature index 960c084d5..4d0667ed1 100644 --- a/features/testbot/projection.feature +++ b/features/testbot/projection.feature @@ -24,12 +24,12 @@ Feature: Projection to nearest point on road Scenario: Projection onto way at high latitudes, 1km distance When I route I should get | from | to | route | bearing | distance | - | b | a | abc | 225 | 1000m +-7 | - | b | c | abc | 45 | 1000m +-7 | - | a | d | abc | 45 | 1000m +-7 | - | d | a | abc | 225 | 1000m +-7 | - | c | d | abc | 225 | 1000m +-8 | - | d | c | abc | 45 +-5 | 1000m +-8 | + | b | a | abc,abc | 225,0 | 1000m -7 | + | b | c | abc,abc | 45,0 | 1000m -7 | + | a | d | abc,abc | 45,0 | 1000m -7 | + | d | a | abc,abc | 225,0 | 1000m -7 | + | c | d | abc,abc | 225,0 | 1000m -8 | + | d | c | abc,abc | 45 -5 | 1000m -8 | Scenario: Projection onto way at high latitudes, no distance When I route I should get diff --git a/features/testbot/snap.feature b/features/testbot/snap.feature index 9b7bcbd0b..80c44bb88 100644 --- a/features/testbot/snap.feature +++ b/features/testbot/snap.feature @@ -21,14 +21,14 @@ Feature: Snap start/end point to the nearest way When I route I should get | from | to | route | - | 1 | c | nc | - | 2 | c | nc | - | 3 | c | ec | - | 4 | c | ec | - | 5 | c | sc | - | 6 | c | sc | - | 7 | c | wc | - | 8 | c | wc | + | 1 | c | nc,nc | + | 2 | c | nc,nc | + | 3 | c | ec,ec | + | 4 | c | ec,ec | + | 5 | c | sc,sc | + | 6 | c | sc,sc | + | 7 | c | wc,wc | + | 8 | c | wc,wc | Scenario: Snap to nearest edge of a square Given the node map @@ -43,11 +43,11 @@ Feature: Snap start/end point to the nearest way | adb | When I route I should get - | from | to | route | - | 1 | b | adb | - | 2 | b | adb | - | 6 | b | aub | - | 7 | b | aub | + | from | to | route | + | 1 | b | adb,adb | + | 2 | b | adb,adb | + | 6 | b | aub,aub | + | 7 | b | aub,aub | Scenario: Snap to edge right under start/end point Given the node map @@ -64,17 +64,17 @@ Feature: Snap start/end point to the nearest way | jkla | When I route I should get - | from | to | route | - | a | b | abcd | - | a | c | abcd | - | a | d | abcd | - | a | e | abcd,defg | - | a | f | abcd,defg | - | a | h | jkla,ghij | - | a | i | jkla,ghij | - | a | j | jkla | - | a | k | jkla | - | a | l | jkla | + | from | to | route | + | a | b | abcd,abcd | + | a | c | abcd,abcd | + | a | d | abcd,abcd | + | a | e | abcd,defg,defg | + | a | f | abcd,defg,defg | + | a | h | jkla,ghij,ghij | + | a | i | jkla,ghij,ghij | + | a | j | jkla,jkla | + | a | k | jkla,jkla | + | a | l | jkla,jkla | Scenario: Snapping in viaroute Given the extract extra arguments "--small-component-size 4" @@ -92,9 +92,9 @@ Feature: Snap start/end point to the nearest way When I route I should get | from | to | route | - | a | b | ab | - | a | d | cd | - | c | d | cd | + | a | b | ab,ab | + | a | d | cd,cd | + | c | d | cd,cd | Scenario: Snap to correct way at large scales Given a grid size of 1000 meters @@ -111,12 +111,12 @@ Feature: Snap start/end point to the nearest way When I route I should get | from | to | route | - | x | a | xa | - | x | b | xb | - | x | c | xc | - | a | x | xa | - | b | x | xb | - | c | x | xc | + | x | a | xa,xa | + | x | b | xb,xb | + | x | c | xc,xc | + | a | x | xa,xa | + | b | x | xb,xb | + | c | x | xc,xc | Scenario: Find edges within 100m, and the same from 1km Given a grid size of 100 meters @@ -152,19 +152,19 @@ Feature: Snap start/end point to the nearest way When I route I should get | from | to | route | - | x | 1 | xa | - | x | 2 | xb | - | x | 3 | xc | - | x | 4 | xd | - | x | 5 | xe | - | x | 6 | xf | - | x | 7 | xg | - | x | 8 | xh | - | x | i | xa | - | x | j | xb | - | x | k | xc | - | x | l | xd | - | x | m | xe | - | x | n | xf | - | x | o | xg | - | x | p | xh | + | x | 1 | xa,xa | + | x | 2 | xb,xb | + | x | 3 | xc,xc | + | x | 4 | xd,xd | + | x | 5 | xe,xe | + | x | 6 | xf,xf | + | x | 7 | xg,xg | + | x | 8 | xh,xh | + | x | i | xa,xa | + | x | j | xb,xb | + | x | k | xc,xc | + | x | l | xd,xd | + | x | m | xe,xe | + | x | n | xf,xf | + | x | o | xg,xg | + | x | p | xh,xh | diff --git a/features/testbot/turn_angles.feature b/features/testbot/turn_angles.feature index 57a4939f7..4d0ec636b 100644 --- a/features/testbot/turn_angles.feature +++ b/features/testbot/turn_angles.feature @@ -20,8 +20,8 @@ Feature: Via points | ehijk | yes | When I route I should get - | from | to | route | distance | turns | - | a | k | abcdefg,ehijk | 34m +-1 | depart,right,arrive | + | from | to | route | distance | turns | + | a | k | abcdefg,ehijk,ehijk | 34m +-1 | depart,right,arrive | Scenario: Slight Turn Given the node map @@ -36,8 +36,8 @@ Feature: Via points | ehijk | yes | When I route I should get - | from | to | route | distance | turns | - | a | k | abcdefg,ehijk | 34m +-1 | depart,slight_right,arrive | + | from | to | route | distance | turns | + | a | k | abcdefg,ehijk,ehijk | 34m +-1 | depart,slight_right,arrive | Scenario: Nearly Slight Turn Given the node map @@ -53,8 +53,8 @@ Feature: Via points | ehijk | yes | When I route I should get - | from | to | route | distance | turns | - | a | k | abcdefg,ehijk | 37m +-1 | depart,right,arrive | + | from | to | route | distance | turns | + | a | k | abcdefg,ehijk,ehijk | 37m +-1 | depart,right,arrive | Scenario: Nearly Slight Turn (Variation) Given the node map @@ -70,5 +70,5 @@ Feature: Via points | ehijk | yes | When I route I should get - | from | to | route | distance | turns | - | a | k | abcdefg,ehijk | 37m +-1 | depart,right,arrive | + | from | to | route | distance | turns | + | a | k | abcdefg,ehijk,ehijk | 37m +-1 | depart,right,arrive | diff --git a/features/testbot/turns.feature b/features/testbot/turns.feature index 6cbf70ba5..76ec5d370 100644 --- a/features/testbot/turns.feature +++ b/features/testbot/turns.feature @@ -24,70 +24,70 @@ Feature: Turn directions/codes | xg | When I route I should get - | from | to | route | turns | - | i | k | xi,xk | depart,sharp left,arrive | - | i | m | xi,xm | depart,left,arrive | - | i | o | xi,xo | depart,slight left,arrive | - | i | a | xi,xa | depart,straight,arrive | - | i | c | xi,xc | depart,slight right,arrive | - | i | e | xi,xe | depart,right,arrive | - | i | g | xi,xg | depart,sharp right,arrive | + | from | to | route | turns | + | i | k | xi,xk,xk | depart,sharp left,arrive | + | i | m | xi,xm,xm | depart,left,arrive | + | i | o | xi,xo,xo | depart,slight left,arrive | + | i | a | xi,xa,xa | depart,straight,arrive | + | i | c | xi,xc,xc | depart,slight right,arrive | + | i | e | xi,xe,xe | depart,right,arrive | + | i | g | xi,xg,xg | depart,sharp right,arrive | - | k | m | xk,xm | depart,sharp left,arrive | - | k | o | xk,xo | depart,left,arrive | - | k | a | xk,xa | depart,slight left,arrive | - | k | c | xk,xc | depart,straight,arrive | - | k | e | xk,xe | depart,slight right,arrive | - | k | g | xk,xg | depart,right,arrive | - | k | i | xk,xi | depart,sharp right,arrive | + | k | m | xk,xm,xm | depart,sharp left,arrive | + | k | o | xk,xo,xo | depart,left,arrive | + | k | a | xk,xa,xa | depart,slight left,arrive | + | k | c | xk,xc,xc | depart,straight,arrive | + | k | e | xk,xe,xe | depart,slight right,arrive | + | k | g | xk,xg,xg | depart,right,arrive | + | k | i | xk,xi,xi | depart,sharp right,arrive | - | m | o | xm,xo | depart,sharp left,arrive | - | m | a | xm,xa | depart,left,arrive | - | m | c | xm,xc | depart,slight left,arrive | - | m | e | xm,xe | depart,straight,arrive | - | m | g | xm,xg | depart,slight right,arrive | - | m | i | xm,xi | depart,right,arrive | - | m | k | xm,xk | depart,sharp right,arrive | + | m | o | xm,xo,xo | depart,sharp left,arrive | + | m | a | xm,xa,xa | depart,left,arrive | + | m | c | xm,xc,xc | depart,slight left,arrive | + | m | e | xm,xe,xe | depart,straight,arrive | + | m | g | xm,xg,xg | depart,slight right,arrive | + | m | i | xm,xi,xi | depart,right,arrive | + | m | k | xm,xk,xk | depart,sharp right,arrive | - | o | a | xo,xa | depart,sharp left,arrive | - | o | c | xo,xc | depart,left,arrive | - | o | e | xo,xe | depart,slight left,arrive | - | o | g | xo,xg | depart,straight,arrive | - | o | i | xo,xi | depart,slight right,arrive | - | o | k | xo,xk | depart,right,arrive | - | o | m | xo,xm | depart,sharp right,arrive | + | o | a | xo,xa,xa | depart,sharp left,arrive | + | o | c | xo,xc,xc | depart,left,arrive | + | o | e | xo,xe,xe | depart,slight left,arrive | + | o | g | xo,xg,xg | depart,straight,arrive | + | o | i | xo,xi,xi | depart,slight right,arrive | + | o | k | xo,xk,xk | depart,right,arrive | + | o | m | xo,xm,xm | depart,sharp right,arrive | - | a | c | xa,xc | depart,sharp left,arrive | - | a | e | xa,xe | depart,left,arrive | - | a | g | xa,xg | depart,slight left,arrive | - | a | i | xa,xi | depart,straight,arrive | - | a | k | xa,xk | depart,slight right,arrive | - | a | m | xa,xm | depart,right,arrive | - | a | o | xa,xo | depart,sharp right,arrive | + | a | c | xa,xc,xc | depart,sharp left,arrive | + | a | e | xa,xe,xe | depart,left,arrive | + | a | g | xa,xg,xg | depart,slight left,arrive | + | a | i | xa,xi,xi | depart,straight,arrive | + | a | k | xa,xk,xk | depart,slight right,arrive | + | a | m | xa,xm,xm | depart,right,arrive | + | a | o | xa,xo,xo | depart,sharp right,arrive | - | c | e | xc,xe | depart,sharp left,arrive | - | c | g | xc,xg | depart,left,arrive | - | c | i | xc,xi | depart,slight left,arrive | - | c | k | xc,xk | depart,straight,arrive | - | c | m | xc,xm | depart,slight right,arrive | - | c | o | xc,xo | depart,right,arrive | - | c | a | xc,xa | depart,sharp right,arrive | + | c | e | xc,xe,xe | depart,sharp left,arrive | + | c | g | xc,xg,xg | depart,left,arrive | + | c | i | xc,xi,xi | depart,slight left,arrive | + | c | k | xc,xk,xk | depart,straight,arrive | + | c | m | xc,xm,xm | depart,slight right,arrive | + | c | o | xc,xo,xo | depart,right,arrive | + | c | a | xc,xa,xa | depart,sharp right,arrive | - | e | g | xe,xg | depart,sharp left,arrive | - | e | i | xe,xi | depart,left,arrive | - | e | k | xe,xk | depart,slight left,arrive | - | e | m | xe,xm | depart,straight,arrive | - | e | o | xe,xo | depart,slight right,arrive | - | e | a | xe,xa | depart,right,arrive | - | e | c | xe,xc | depart,sharp right,arrive | + | e | g | xe,xg,xg | depart,sharp left,arrive | + | e | i | xe,xi,xi | depart,left,arrive | + | e | k | xe,xk,xk | depart,slight left,arrive | + | e | m | xe,xm,xm | depart,straight,arrive | + | e | o | xe,xo,xo | depart,slight right,arrive | + | e | a | xe,xa,xa | depart,right,arrive | + | e | c | xe,xc,xc | depart,sharp right,arrive | - | g | i | xg,xi | depart,sharp left,arrive | - | g | k | xg,xk | depart,left,arrive | - | g | m | xg,xm | depart,slight left,arrive | - | g | o | xg,xo | depart,straight,arrive | - | g | a | xg,xa | depart,slight right,arrive | - | g | c | xg,xc | depart,right,arrive | - | g | e | xg,xe | depart,sharp right,arrive | + | g | i | xg,xi,xi | depart,sharp left,arrive | + | g | k | xg,xk,xk | depart,left,arrive | + | g | m | xg,xm,xm | depart,slight left,arrive | + | g | o | xg,xo,xo | depart,straight,arrive | + | g | a | xg,xa,xa | depart,slight right,arrive | + | g | c | xg,xc,xc | depart,right,arrive | + | g | e | xg,xe,xe | depart,sharp right,arrive | Scenario: Turn instructions at high latitude # https://github.com/DennisOSRM/Project-OSRM/issues/532 @@ -108,8 +108,8 @@ Feature: Turn directions/codes | yz | When I route I should get - | from | to | route | turns | - | a | c | ab,bc | depart,straight,arrive | - | c | a | bc,ab | depart,straight,arrive | - | x | z | xy,yz | depart,straight,arrive | - | z | x | yz,xy | depart,straight,arrive | + | from | to | route | turns | + | a | c | ab,bc,bc | depart,straight,arrive | + | c | a | bc,ab,ab | depart,straight,arrive | + | x | z | xy,yz,yz | depart,straight,arrive | + | z | x | yz,xy,xy | depart,straight,arrive | diff --git a/features/testbot/utf.feature b/features/testbot/utf.feature index d979e9f92..b537163ee 100644 --- a/features/testbot/utf.feature +++ b/features/testbot/utf.feature @@ -15,7 +15,7 @@ Feature: Handling of UTF characters | cd | Cyrillic Москва | When I route I should get - | from | to | route | - | a | b | Scandinavian København | - | b | c | Japanese 東京 | - | c | d | Cyrillic Москва | + | from | to | route | + | a | b | Scandinavian København,Scandinavian København | + | b | c | Japanese 東京,Japanese 東京 | + | c | d | Cyrillic Москва,Cyrillic Москва | diff --git a/features/testbot/uturn.feature b/features/testbot/uturn.feature index b495fbd69..f00f5fc1f 100644 --- a/features/testbot/uturn.feature +++ b/features/testbot/uturn.feature @@ -20,8 +20,8 @@ Feature: U-turns at via points | fg | When I route I should get - | waypoints | route | turns | - | a,e,c | ab,be,be,ef,fg,dg,cd | depart,right,via,straight,straight,straight,straight,arrive | + | waypoints | route | turns | + | a,e,c | ab,be,be,ef,fg,dg,cd,cd | depart,right,arrive,depart,straight,left,left,arrive | Scenario: Query param to allow U-turns at all via points Given the node map @@ -42,8 +42,8 @@ Feature: U-turns at via points | fg | When I route I should get - | waypoints | route | - | a,e,c | ab,be,be,be,bc | + | waypoints | route | + | a,e,c | ab,be,be,be,bc,bc | @todo Scenario: Instructions at via points at u-turns @@ -65,8 +65,8 @@ Feature: U-turns at via points | fg | When I route I should get - | waypoints | route | turns | - | a,e,c | ab,be,be,bc | depart,right,uturn,right,arrive | + | waypoints | route | turns | + | a,e,c | ab,be,be,bc,bc | depart,right,uturn,right,arrive | Scenario: u-turn mixed with non-uturn vias Given the node map @@ -88,6 +88,6 @@ Feature: U-turns at via points | fg | When I route I should get - | waypoints | route | - | 1,2,3,4,5 | ab,be,be,be,bc,bc,cd,dg,dg,dg,cd | + | waypoints | route | + | 1,2,3,4,5 | ab,be,be,be,bc,bc,bc,be,ef,fg,dg,dg,dg,cd,cd |