fix messed up cherry-pick

This commit is contained in:
Moritz Kobitzsch 2016-11-07 18:20:02 +01:00
parent 3bde88eec5
commit 1e0ec0ab8f

View File

@ -403,36 +403,6 @@ Feature: Basic Roundabout
#| w,x | ll,egg,egg,tr,tr | depart,roundabout-exit-1,roundabout-exit-2,arrive | #| w,x | ll,egg,egg,tr,tr | depart,roundabout-exit-1,roundabout-exit-2,arrive |
| w,x | ll,egg,egg,tr,tr | depart,turn right,continue left,turn slight left,arrive | | w,x | ll,egg,egg,tr,tr | depart,turn right,continue left,turn slight left,arrive |
<<<<<<< HEAD
=======
Scenario: Use Lane in Roundabout
Given the node map
"""
. i . . . .. .
.' '.
a - b. f - g
. |
'. 1 /
'. /
j - - - c . . e
' d '
' h
"""
#using roundabout as name, we can ignore whether we see a roundabout or a rotary here. Cucumber output will be the same
And the ways
| nodes | junction | name | oneway | turn:lanes:forward |
| ba | | left-out | yes | |
| jc | | left-in | yes | |
| dh | | right-bot-out | yes | |
| fg | | right-top-out | yes | |
| bc | roundabout | roundabout | yes | left;through\|through |
| cdefib | roundabout | roundabout | yes | |
When I route I should get
| waypoints | route | turns |
| 1,h | roundabout,right-bot-out,right-bot-out | depart,roundabout-exit-1,arrive |
@3254 @3254
Scenario: Driving up to and through a roundabout Scenario: Driving up to and through a roundabout
Given the node map Given the node map