Skip to content

Commit 2297786

Browse files
ClaudeDennisOSRM
Claude
and
DennisOSRM
committed
Add locations column structure to 34 guidance feature files
Co-authored-by: DennisOSRM <1067895+DennisOSRM@users.noreply.github.com>
1 parent c9650c3 commit 2297786

34 files changed

+1177
-1177
lines changed

‎features/guidance/advanced-lanes.feature‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ Feature: Turn Lane Guidance
3535
| restriction | bc | cd | c | no_right_turn |
3636

3737
When I route I should get
38-
| waypoints | route | turns | lanes |
39-
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false, |
40-
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true, |
41-
| a,f | in,cross,cross | depart,continue right,arrive | ,;right:true, |
38+
| waypoints | route | turns | lanes | locations |
39+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false, | |
40+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true, | |
41+
| a,f | in,cross,cross | depart,continue right,arrive | ,;right:true, | |
4242

4343
@sliproads
4444
Scenario: Separate Turn Lanes
@@ -68,10 +68,10 @@ Feature: Turn Lane Guidance
6868
| restriction | bc | cd | c | no_right_turn |
6969

7070
When I route I should get
71-
| waypoints | route | turns | lanes |
72-
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, |
73-
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, |
74-
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, |
71+
| waypoints | route | turns | lanes | locations |
72+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | |
73+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | |
74+
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | |
7575

7676

7777
@sliproads
@@ -109,12 +109,12 @@ Feature: Turn Lane Guidance
109109
| restriction | bc | cd | c | no_right_turn |
110110

111111
When I route I should get
112-
| waypoints | route | turns | lanes |
113-
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, |
114-
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, |
115-
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, |
116-
| a,j | in,turn,other,other | depart,turn right,turn left,arrive | ,,left:true right:false, |
117-
| a,i | in,turn,other,other | depart,turn right,turn right,arrive | ,,left:false right:true, |
112+
| waypoints | route | turns | lanes | locations |
113+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | |
114+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | |
115+
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | |
116+
| a,j | in,turn,other,other | depart,turn right,turn left,arrive | ,,left:true right:false, | |
117+
| a,i | in,turn,other,other | depart,turn right,turn right,arrive | ,,left:false right:true, | |
118118

119119

120120
@todo @2654 @none
@@ -143,9 +143,9 @@ Feature: Turn Lane Guidance
143143
| hbi | ksd | secondary | yes | |
144144

145145
When I route I should get
146-
| waypoints | route | turns | lanes |
147-
| a,f | ,ksd,ksd | depart,turn left,arrive | ,left:true none:true right:false, |
148-
| a,i | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, |
146+
| waypoints | route | turns | lanes | locations |
147+
| a,f | ,ksd,ksd | depart,turn left,arrive | ,left:true none:true right:false, | |
148+
| a,i | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, | |
149149

150150
@todo @2650 @sliproads
151151
#market and haight in SF, restricted turn
@@ -189,11 +189,11 @@ Feature: Turn Lane Guidance
189189
| relation | bd | dc | d | no_right_turn |
190190

191191
When I route I should get
192-
| waypoints | route | turns | lanes |
193-
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, |
194-
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, |
195-
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, |
196-
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, |
192+
| waypoints | route | turns | lanes | locations |
193+
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | |
194+
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | |
195+
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | |
196+
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | |
197197

198198
@todo @2650 @sliproads
199199
#market and haight in SF, unrestricted
@@ -233,11 +233,11 @@ Feature: Turn Lane Guidance
233233
| bl | haight | residential | yes | left\|none |
234234

235235
When I route I should get
236-
| waypoints | route | turns | lanes |
237-
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, |
238-
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, |
239-
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, |
240-
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, |
236+
| waypoints | route | turns | lanes | locations |
237+
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | |
238+
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | |
239+
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | |
240+
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | |
241241

242242

243243
Scenario: Check sliproad handler loop's exit condition, Issue #2896
@@ -253,5 +253,5 @@ Feature: Turn Lane Guidance
253253
| cbac | |
254254

255255
When I route I should get
256-
| from | to | route | turns |
257-
| a | c | , | depart,arrive |
256+
| from | to | route | turns | locations |
257+
| a | c | , | depart,arrive | |

‎features/guidance/bicycle-sliproads.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ Feature: Bike - Mode flag
2929
| geh | secondary | street | | |
3030

3131
When I route I should get
32-
| waypoints | route | turns |
33-
| a,f | street,,road,road | depart,turn right,turn right,arrive |
32+
| waypoints | route | turns | locations |
33+
| a,f | street,,road,road | depart,turn right,turn right,arrive | |

‎features/guidance/bike-staggered-intersections.feature‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Feature: Staggered Intersections
2424
| ihedcj | residential | Cedar Dr | yes |
2525

2626
When I route I should get
27-
| waypoints | route | turns | modes |
28-
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,pushing bike,cycling,cycling |
29-
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
27+
| waypoints | route | turns | modes | locations |
28+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,pushing bike,cycling,cycling | |
29+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | |
3030

3131
Scenario: Staggered Intersection - pushing at start
3232
Given the node map
@@ -46,9 +46,9 @@ Feature: Staggered Intersections
4646
| ihedcj | residential | Cedar Dr | |
4747

4848
When I route I should get
49-
| waypoints | route | turns | modes |
50-
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,cycling,cycling |
51-
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
49+
| waypoints | route | turns | modes | locations |
50+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,cycling,cycling | |
51+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | |
5252

5353
Scenario: Staggered Intersection - pushing at end
5454
Given the node map
@@ -68,9 +68,9 @@ Feature: Staggered Intersections
6868
| ihedcj | residential | Cedar Dr | |
6969

7070
When I route I should get
71-
| waypoints | route | turns | modes |
72-
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,cycling,pushing bike,pushing bike |
73-
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
71+
| waypoints | route | turns | modes | locations |
72+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,cycling,pushing bike,pushing bike | |
73+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | |
7474

7575
Scenario: Staggered Intersection - pushing at start and end
7676
Given the node map
@@ -90,9 +90,9 @@ Feature: Staggered Intersections
9090
| ihedcj | residential | Cedar Dr | |
9191

9292
When I route I should get
93-
| waypoints | route | turns | modes |
94-
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
95-
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
93+
| waypoints | route | turns | modes | locations |
94+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | |
95+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | |
9696

9797
Scenario: Staggered Intersection - pushing at start and end
9898
Given the node map
@@ -112,9 +112,9 @@ Feature: Staggered Intersections
112112
| ihedcj | residential | Cedar Dr |
113113

114114
When I route I should get
115-
| waypoints | route | turns | modes |
116-
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
117-
| g,a | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
115+
| waypoints | route | turns | modes | locations |
116+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | |
117+
| g,a | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | |
118118

119119
Scenario: Staggered Intersection - control, all cycling on staggered intersection
120120
Given the node map
@@ -134,6 +134,6 @@ Feature: Staggered Intersections
134134
| ihedcj | residential | Cedar Dr |
135135

136136
When I route I should get
137-
| waypoints | route | turns | modes |
138-
| a,g | Oak St,Oak St | depart,arrive | cycling,cycling |
139-
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
137+
| waypoints | route | turns | modes | locations |
138+
| a,g | Oak St,Oak St | depart,arrive | cycling,cycling | |
139+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | |

0 commit comments

Comments
 (0)