Skip to content

Commit a30e31f

Browse files
ClaudeDennisOSRM
Claude
and
DennisOSRM
committed
Populate locations column with inferred values for 28 guidance files
Co-authored-by: DennisOSRM <1067895+DennisOSRM@users.noreply.github.com>
1 parent 2297786 commit a30e31f

28 files changed

+811
-811
lines changed

‎features/guidance/advanced-lanes.feature‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Feature: Turn Lane Guidance
3636

3737
When I route I should get
3838
| 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, | |
39+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false, | a,?,e |
40+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true, | a,i,g |
41+
| a,f | in,cross,cross | depart,continue right,arrive | ,;right:true, | a,?,f |
4242

4343
@sliproads
4444
Scenario: Separate Turn Lanes
@@ -69,9 +69,9 @@ Feature: Turn Lane Guidance
6969

7070
When I route I should get
7171
| 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, | |
72+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | a,?,e |
73+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | a,i,g |
74+
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | a,?,f |
7575

7676

7777
@sliproads
@@ -110,11 +110,11 @@ Feature: Turn Lane Guidance
110110

111111
When I route I should get
112112
| 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, | |
113+
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | a,?,e |
114+
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | a,i,g |
115+
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | a,?,f |
116+
| a,j | in,turn,other,other | depart,turn right,turn left,arrive | ,,left:true right:false, | a,n,t,j |
117+
| a,i | in,turn,other,other | depart,turn right,turn right,arrive | ,,left:false right:true, | a,n,t,i |
118118

119119

120120
@todo @2654 @none
@@ -144,8 +144,8 @@ Feature: Turn Lane Guidance
144144

145145
When I route I should get
146146
| 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, | |
147+
| a,f | ,ksd,ksd | depart,turn left,arrive | ,left:true none:true right:false, | a,?,f |
148+
| a,i | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, | a,?,i |
149149

150150
@todo @2650 @sliproads
151151
#market and haight in SF, restricted turn
@@ -190,10 +190,10 @@ Feature: Turn Lane Guidance
190190

191191
When I route I should get
192192
| 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, | |
193+
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | a,h,l |
194+
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | a,?,h |
195+
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | a,?,j |
196+
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | a,g,f |
197197

198198
@todo @2650 @sliproads
199199
#market and haight in SF, unrestricted
@@ -234,10 +234,10 @@ Feature: Turn Lane Guidance
234234

235235
When I route I should get
236236
| 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, | |
237+
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | a,h,l |
238+
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | a,?,h |
239+
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | a,?,j |
240+
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | a,g,f |
241241

242242

243243
Scenario: Check sliproad handler loop's exit condition, Issue #2896
@@ -254,4 +254,4 @@ Feature: Turn Lane Guidance
254254

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

‎features/guidance/bicycle-sliproads.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ Feature: Bike - Mode flag
3030

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Feature: Staggered Intersections
2525

2626
When I route I should get
2727
| 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 | |
28+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,pushing bike,cycling,cycling | a,a,a,g |
29+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |
3030

3131
Scenario: Staggered Intersection - pushing at start
3232
Given the node map
@@ -47,8 +47,8 @@ Feature: Staggered Intersections
4747

4848
When I route I should get
4949
| 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 | |
50+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,cycling,cycling | a,a,a,g |
51+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |
5252

5353
Scenario: Staggered Intersection - pushing at end
5454
Given the node map
@@ -69,8 +69,8 @@ Feature: Staggered Intersections
6969

7070
When I route I should get
7171
| 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 | |
72+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,cycling,pushing bike,pushing bike | a,a,a,g |
73+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |
7474

7575
Scenario: Staggered Intersection - pushing at start and end
7676
Given the node map
@@ -91,8 +91,8 @@ Feature: Staggered Intersections
9191

9292
When I route I should get
9393
| 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 | |
94+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | a,a,a,g |
95+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |
9696

9797
Scenario: Staggered Intersection - pushing at start and end
9898
Given the node map
@@ -113,8 +113,8 @@ Feature: Staggered Intersections
113113

114114
When I route I should get
115115
| 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 | |
116+
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | a,a,a,g |
117+
| g,a | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | g,a,a,a |
118118

119119
Scenario: Staggered Intersection - control, all cycling on staggered intersection
120120
Given the node map
@@ -135,5 +135,5 @@ Feature: Staggered Intersections
135135

136136
When I route I should get
137137
| 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 | |
138+
| a,g | Oak St,Oak St | depart,arrive | cycling,cycling | a,g |
139+
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |

‎features/guidance/bridges_and_tunnels.feature‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Feature: Car - Guidance - Bridges and Tunnels
1818

1919
When I route I should get
2020
| from | to | route | turns | locations |
21-
| a | d | Hauptstraße,Hauptstraße | depart,arrive | |
21+
| a | d | Hauptstraße,Hauptstraße | depart,arrive | a,d |
2222

2323
Scenario: Bridge with Immediate Turn
2424
Given the node map
@@ -36,10 +36,10 @@ Feature: Car - Guidance - Bridges and Tunnels
3636

3737
When I route I should get
3838
| from | to | route | turns | locations |
39-
| a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,arrive | |
40-
| a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,arrive | |
41-
| e | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive | |
42-
| d | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive | |
39+
| a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,arrive | a,e,d |
40+
| a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,arrive | a,e,e |
41+
| e | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive | e,e,a |
42+
| d | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive | d,e,a |
4343

4444
Scenario: Bridge with Immediate Turn Front and Back
4545
Given the node map
@@ -58,14 +58,14 @@ Feature: Car - Guidance - Bridges and Tunnels
5858

5959
When I route I should get
6060
| from | to | route | turns | locations |
61-
| f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | |
62-
| f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | |
63-
| g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | |
64-
| g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | |
65-
| e | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | |
66-
| e | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | |
67-
| d | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | |
68-
| d | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | |
61+
| f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | f,e,e,d |
62+
| f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | f,e,e,e |
63+
| g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | g,e,e,d |
64+
| g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | g,e,e,e |
65+
| e | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | e,e,e,f |
66+
| e | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | e,e,e,g |
67+
| d | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | d,e,e,f |
68+
| d | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | d,e,e,g |
6969

7070
Scenario: Simple Tunnel
7171
Given the node map
@@ -81,7 +81,7 @@ Feature: Car - Guidance - Bridges and Tunnels
8181

8282
When I route I should get
8383
| from | to | route | turns | locations |
84-
| a | d | Hauptstraße,Hauptstraße | depart,arrive | |
84+
| a | d | Hauptstraße,Hauptstraße | depart,arrive | a,d |
8585

8686
Scenario: Tunnel with Immediate Turn
8787
Given the node map
@@ -99,10 +99,10 @@ Feature: Car - Guidance - Bridges and Tunnels
9999

100100
When I route I should get
101101
| from | to | route | turns | locations |
102-
| a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road left,arrive | |
103-
| a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road right,arrive | |
104-
| e | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive | |
105-
| d | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive | |
102+
| a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road left,arrive | a,e,d |
103+
| a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road right,arrive | a,e,e |
104+
| e | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive | e,e,a |
105+
| d | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive | d,e,a |
106106

107107
Scenario: Tunnel with Immediate Turn Front and Back
108108
Given the node map
@@ -121,11 +121,11 @@ Feature: Car - Guidance - Bridges and Tunnels
121121

122122
When I route I should get
123123
| from | to | route | turns | locations |
124-
| f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | |
125-
| f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | |
126-
| g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | |
127-
| g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | |
128-
| e | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | |
129-
| e | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | |
130-
| d | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | |
131-
| d | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | |
124+
| f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | f,e,e,d |
125+
| f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | f,e,e,e |
126+
| g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | g,e,e,d |
127+
| g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | g,e,e,e |
128+
| e | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | e,e,a,f |
129+
| e | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | e,e,a,g |
130+
| d | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | d,e,a,f |
131+
| d | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | d,e,a,g |

‎features/guidance/bugs.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Feature: Features related to bugs
3434

3535
When I route I should get
3636
| waypoints | route | turns | locations |
37-
| 1,2 | top,right | depart,arrive | |
37+
| 1,2 | top,right | depart,arrive | 1,2 |
3838

3939
@3156
4040
Scenario: Incorrect lanes tag

0 commit comments

Comments
 (0)