Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use bearing_before and bearing_after in the bearings field

Browse Source
This commit is contained in:
Patrick Niklaus 2016-05-18 17:52:05 +02:00
parent d150df1c5c
commit 3b37769624
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
5 changed files with 119 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
features/guidance/intersections.feature
View File

@ -18,7 +18,7 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,c | through,through | depart,arrive | true:90 true:270,true:90 true:180 false:270;true:90 true:270 | | a,c | through,through | depart,arrive | true:90,true:90 true:180 false:270;true:270 |
Scenario: Passing Three Way North Scenario: Passing Three Way North
Given the node map Given the node map
@ -33,7 +33,7 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,c | through,through | depart,arrive | true:90 true:270,true:0 true:90 false:270;true:90 true:270 | | a,c | through,through | depart,arrive | true:90,true:0 true:90 false:270;true:270 |
Scenario: Passing Oneway Street In Scenario: Passing Oneway Street In
Given the node map Given the node map
@ -48,7 +48,7 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,c | through,through | depart,arrive | true:90 true:270,false:0 true:90 false:270;true:90 true:270 | | a,c | through,through | depart,arrive | true:90,false:0 true:90 false:270;true:270 |
Scenario: Passing Oneway Street Out Scenario: Passing Oneway Street Out
Given the node map Given the node map
@ -63,7 +63,7 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,c | through,through | depart,arrive | true:90 true:270,true:0 true:90 false:270;true:90 true:270 | | a,c | through,through | depart,arrive | true:90,true:0 true:90 false:270;true:270 |
Scenario: Passing Two Intersections Scenario: Passing Two Intersections
Given the node map Given the node map
@ -81,7 +81,7 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,d | through,through | depart,arrive | true:90 true:270,true:0 true:90 false:270,true:90 true:180 false:270;true:90 true:270 | | a,d | through,through | depart,arrive | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 |
Scenario: Passing Two Intersections, Collapsing Scenario: Passing Two Intersections, Collapsing
Given the node map Given the node map
@ -99,8 +99,8 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| a,d | through,through | depart,arrive | true:90 true:270,true:0 true:90 false:270,true:90 true:180 false:270;true:90 true:270 | | a,d | through,through | depart,arrive | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 |
| f,a | corner,throughbridge,through | depart,end of road left,arrive | true:0 true:180;true:90 false:180 true:270,true:0 false:90 true:270;true:90 true:270 | | f,a | corner,throughbridge,through | depart,end of road left,arrive | true:0;true:90 false:180 true:270,true:0 false:90 true:270;true:90 |
Scenario: Roundabouts Scenario: Roundabouts
Given the node map Given the node map
@ -126,9 +126,9 @@ Feature: Intersections Data
When I route I should get When I route I should get
| waypoints | route | turns | intersections | | waypoints | route | turns | intersections |
| e,f | ea,fb,fb | depart,abcda-exit-1,arrive | true:0 true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:90 true:270 | | e,f | ea,fb,fb | depart,abcda-exit-1,arrive | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:90 |
| e,g | ea,gc,gc | depart,abcda-exit-2,arrive | true:0 true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:0 true:180 | | e,g | ea,gc,gc | depart,abcda-exit-2,arrive | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:0 |
| e,h | ea,hd,hd | depart,abcda-exit-3,arrive | true:0 true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330,true:90 false:210 true:330;true:90 true:270 | | e,h | ea,hd,hd | depart,abcda-exit-3,arrive | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330,true:90 false:210 true:330;true:270 |
| e,2 | ea,abcda,abcda | depart,abcda-exit-undefined,arrive | true:0 true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:146 false:326 | | e,2 | ea,abcda,abcda | depart,abcda-exit-undefined,arrive | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:326 |
| 1,g | abcda,gc,gc | depart,abcda-exit-2,arrive | false:34 true:214;false:34 true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:0 true:180 | | 1,g | abcda,gc,gc | depart,abcda-exit-2,arrive | true:214;true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:0 |
| 1,3 | abcda,abcda | depart,arrive | false:34 true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:34 false:214 | | 1,3 | abcda,abcda | depart,arrive | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214 |

4
features/support/route.js
View File

@ -138,9 +138,7 @@ module.exports = function () {
}; };
this.bearingList = (instructions) => { this.bearingList = (instructions) => {
return this.extractInstructionList(instructions, s => (typeof s.intersections[0].out !== 'undefined') return this.extractInstructionList(instructions, s => s.maneuver.bearing_before + '->' + s.maneuver.bearing_after);
? s.intersections[0].bearings[s.intersections[0].out]
: 0);
}; };
this.annotationList = (instructions) => { this.annotationList = (instructions) => {

134
features/testbot/bearing.feature
View File

@ -15,7 +15,7 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | b | ab,ab | 315,0 | | a | b | ab,ab | 0->315,315->0|
Scenario: Bearing when going west Scenario: Bearing when going west
Given the node map Given the node map
@ -27,7 +27,7 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | b | ab,ab | 270,0 | | a | b | ab,ab | 0->270,270->0|
Scenario: Bearing af 45 degree intervals Scenario: Bearing af 45 degree intervals
Given the node map Given the node map
@ -48,14 +48,14 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| x | a | xa,xa | 0,0 | | x | a | xa,xa | 0->0,0->0|
| x | b | xb,xb | 315,0 | | x | b | xb,xb | 0->315,315->0|
| x | c | xc,xc | 270,0 | | x | c | xc,xc | 0->270,270->0|
| x | d | xd,xd | 225,0 | | x | d | xd,xd | 0->225,225->0|
| x | e | xe,xe | 180,0 | | x | e | xe,xe | 0->180,180->0|
| x | f | xf,xf | 135,0 | | x | f | xf,xf | 0->135,135->0|
| x | g | xg,xg | 90,0 | | x | g | xg,xg | 0->90,90->0|
| x | h | xh,xh | 45,0 | | x | h | xh,xh | 0->45,45->0|
Scenario: Bearing in a roundabout Scenario: Bearing in a roundabout
Given the node map Given the node map
@ -77,8 +77,8 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| c | b | cd,de,ef,fg,gh,ha,ab,ab | 270,225,180,135,90,45,0,0 | | c | b | cd,de,ef,fg,gh,ha,ab,ab | 0->270,270->225,225->180,180->135,135->90,90->45,45->0,0->0 |
| g | f | gh,ha,ab,bc,cd,de,ef,ef | 90,45,0,315,270,225,180,0 | | g | f | gh,ha,ab,bc,cd,de,ef,ef | 0->90,90->45,45->0,0->315,315->270,270->225,225->180,180->0 |
Scenario: Bearing should stay constant when zig-zagging Scenario: Bearing should stay constant when zig-zagging
Given the node map Given the node map
@ -97,7 +97,7 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | h | ab,bc,cd,de,ef,fg,gh,gh | 0,135,0,135,0,135,0,0 | | a | h | ab,bc,cd,de,ef,fg,gh,gh | 0->0,0->135,135->0,0->135,135->0,0->135,135->0,0->0 |
Scenario: Bearings on an east-west way. Scenario: Bearings on an east-west way.
Given the node map Given the node map
@ -109,36 +109,36 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | b | abcdef,abcdef | 90,0 | | a | b | abcdef,abcdef | 0->90,90->0 |
| a | c | abcdef,abcdef | 90,0 | | a | c | abcdef,abcdef | 0->90,90->0 |
| a | d | abcdef,abcdef | 90,0 | | a | d | abcdef,abcdef | 0->90,90->0 |
| a | e | abcdef,abcdef | 90,0 | | a | e | abcdef,abcdef | 0->90,90->0 |
| a | f | abcdef,abcdef | 90,0 | | a | f | abcdef,abcdef | 0->90,90->0 |
| b | a | abcdef,abcdef | 270,0 | | b | a | abcdef,abcdef | 0->270,270->0 |
| b | c | abcdef,abcdef | 90,0 | | b | c | abcdef,abcdef | 0->90,90->0 |
| b | d | abcdef,abcdef | 90,0 | | b | d | abcdef,abcdef | 0->90,90->0 |
| b | e | abcdef,abcdef | 90,0 | | b | e | abcdef,abcdef | 0->90,90->0 |
| b | f | abcdef,abcdef | 90,0 | | b | f | abcdef,abcdef | 0->90,90->0 |
| c | a | abcdef,abcdef | 270,0 | | c | a | abcdef,abcdef | 0->270,270->0 |
| c | b | abcdef,abcdef | 270,0 | | c | b | abcdef,abcdef | 0->270,270->0 |
| c | d | abcdef,abcdef | 90,0 | | c | d | abcdef,abcdef | 0->90,90->0 |
| c | e | abcdef,abcdef | 90,0 | | c | e | abcdef,abcdef | 0->90,90->0 |
| c | f | abcdef,abcdef | 90,0 | | c | f | abcdef,abcdef | 0->90,90->0 |
| d | a | abcdef,abcdef | 270,0 | | d | a | abcdef,abcdef | 0->270,270->0 |
| d | b | abcdef,abcdef | 270,0 | | d | b | abcdef,abcdef | 0->270,270->0 |
| d | c | abcdef,abcdef | 270,0 | | d | c | abcdef,abcdef | 0->270,270->0 |
| d | e | abcdef,abcdef | 90,0 | | d | e | abcdef,abcdef | 0->90,90->0 |
| d | f | abcdef,abcdef | 90,0 | | d | f | abcdef,abcdef | 0->90,90->0 |
| e | a | abcdef,abcdef | 270,0 | | e | a | abcdef,abcdef | 0->270,270->0 |
| e | b | abcdef,abcdef | 270,0 | | e | b | abcdef,abcdef | 0->270,270->0 |
| e | c | abcdef,abcdef | 270,0 | | e | c | abcdef,abcdef | 0->270,270->0 |
| e | d | abcdef,abcdef | 270,0 | | e | d | abcdef,abcdef | 0->270,270->0 |
| e | f | abcdef,abcdef | 90,0 | | e | f | abcdef,abcdef | 0->90,90->0 |
| f | a | abcdef,abcdef | 270,0 | | f | a | abcdef,abcdef | 0->270,270->0 |
| f | b | abcdef,abcdef | 270,0 | | f | b | abcdef,abcdef | 0->270,270->0 |
| f | c | abcdef,abcdef | 270,0 | | f | c | abcdef,abcdef | 0->270,270->0 |
| f | d | abcdef,abcdef | 270,0 | | f | d | abcdef,abcdef | 0->270,270->0 |
| f | e | abcdef,abcdef | 270,0 | | f | e | abcdef,abcdef | 0->270,270->0 |
Scenario: Bearings at high latitudes Scenario: Bearings at high latitudes
# The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html,
@ -162,18 +162,18 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | b | ab,ab | 0,0 | | a | b | ab,ab | 0->0,0->0 |
| b | c | bc,bc | 90,0 | | b | c | bc,bc | 0->90,90->0 |
| c | d | cd,cd | 180,0 | | c | d | cd,cd | 0->180,180->0 |
| d | a | da,da | 270,0 | | d | a | da,da | 0->270,270->0 |
| b | a | ab,ab | 180,0 | | b | a | ab,ab | 0->180,180->0 |
| c | b | bc,bc | 270,0 | | c | b | bc,bc | 0->270,270->0 |
| d | c | cd,cd | 0,0 | | d | c | cd,cd | 0->0,0->0 |
| a | d | da,da | 90,0 | | a | d | da,da | 0->90,90->0 |
| a | c | ac,ac | 45,0 | | a | c | ac,ac | 0->45,45->0 |
| c | a | ac,ac | 225,0 | | c | a | ac,ac | 0->225,225->0 |
| b | d | bd,bd | 135,0 | | b | d | bd,bd | 0->135,135->0 |
| d | b | bd,bd | 315,0 | | d | b | bd,bd | 0->315,315->0 |
Scenario: Bearings at high negative latitudes Scenario: Bearings at high negative latitudes
# The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html,
@ -197,15 +197,15 @@ Feature: Compass bearing
When I route I should get When I route I should get
| from | to | route | bearing | | from | to | route | bearing |
| a | b | ab,ab | 180,0 | | a | b | ab,ab | 0->180,180->0 |
| b | c | bc,bc | 90,0 | | b | c | bc,bc | 0->90,90->0 |
| c | d | cd,cd | 0,0 | | c | d | cd,cd | 0->0,0->0 |
| d | a | da,da | 270,0 | | d | a | da,da | 0->270,270->0 |
| b | a | ab,ab | 0,0 | | b | a | ab,ab | 0->0,0->0 |
| c | b | bc,bc | 270,0 | | c | b | bc,bc | 0->270,270->0 |
| d | c | cd,cd | 180,0 | | d | c | cd,cd | 0->180,180->0 |
| a | d | da,da | 90,0 | | a | d | da,da | 0->90,90->0 |
| a | c | ac,ac | 135,0 | | a | c | ac,ac | 0->135,135->0 |
| c | a | ac,ac | 315,0 | | c | a | ac,ac | 0->315,315->0 |
| b | d | bd,bd | 45,0 | | b | d | bd,bd | 0->45,45->0 |
| d | b | bd,bd | 225,0 | | d | b | bd,bd | 0->225,225->0 |

40
features/testbot/bearing_param.feature
View File

@ -15,11 +15,11 @@ Feature: Bearing parameter
When I route I should get When I route I should get
| from | to | bearings | route | bearing | | from | to | bearings | route | bearing |
| b | c | 90 90 | ad,ad | 90,0 | | b | c | 90 90 | ad,ad | 0->90,90->0|
| b | c | 180 90 | | | | b | c | 180 90 | | |
| b | c | 80 100 | ad,ad | 90,0 | | b | c | 80 100 | ad,ad | 0->90,90->0|
| b | c | 79 100 | | | | b | c | 79 100 | | |
| b | c | 79,11 100 | ad,ad | 90,0 | | b | c | 79,11 100 | ad,ad | 0->90,90->0|
Scenario: Testbot - Intial bearing in simple case Scenario: Testbot - Intial bearing in simple case
Given the node map Given the node map
@ -35,10 +35,10 @@ Feature: Bearing parameter
When I route I should get When I route I should get
| from | to | bearings | route | bearing | | from | to | bearings | route | bearing |
| 0 | c | 0 0 | | | | 0 | c | 0 0 | | |
| 0 | c | 45 45 | bc,bc | 45 ~3% | | 0 | c | 45 45 | bc,bc | 0->45,45->0|
| 0 | c | 85 85 | | | | 0 | c | 85 85 | | |
| 0 | c | 95 95 | | | | 0 | c | 95 95 | | |
| 0 | c | 135 135 | ac,ac | 135 ~1% | | 0 | c | 135 135 | ac,ac | 0->136,136->0 |
| 0 | c | 180 180 | | | | 0 | c | 180 180 | | |
Scenario: Testbot - Initial bearing on split way Scenario: Testbot - Initial bearing on split way
@ -55,19 +55,19 @@ Feature: Bearing parameter
When I route I should get When I route I should get
| from | to | bearings | route | bearing | | from | to | bearings | route | bearing |
| 0 | b | 10 10 | bc,bc | 0,0 | | 0 | b | 10 10 | bc,bc | 0->0,0->0 |
| 0 | b | 90 90 | ab,ab | 90,0 | | 0 | b | 90 90 | ab,ab | 0->90,90->0 |
# The returned bearing is wrong here, it's based on the snapped # The returned bearing is wrong here, it's based on the snapped
# coordinates, not the acutal edge bearing. This should be # coordinates, not the acutal edge bearing. This should be
# fixed one day, but it's only a problem when we snap two vias # fixed one day, but it's only a problem when we snap two vias
# to the same point - DP # to the same point - DP
#| 0 | b | 170 170 | da | 180 | #| 0 | b | 170 170 | da | 180 |
#| 0 | b | 189 189 | da | 180 | #| 0 | b | 189 189 | da | 180 |
| 0 | 1 | 90 270 | ab,bc,cd,cd | 90,0,270,0 | | 0 | 1 | 90 270 | ab,bc,cd,cd | 0->90,90->0,0->270,270->0 |
| 1 | d | 10 10 | bc,bc | 0,0 | | 1 | d | 10 10 | bc,bc | 0->0,0->0 |
| 1 | d | 90 90 | ab,bc,cd,da,da | 90,0,270,180,0 | | 1 | d | 90 90 | ab,bc,cd,da,da | 0->90,90->0,0->270,270->180,180->0 |
| 1 | 0 | 189 189 | da,da | 180,0 | | 1 | 0 | 189 189 | da,da | 0->180,180->0 |
| 1 | d | 270 270 | cd,cd | 270,0 | | 1 | d | 270 270 | cd,cd | 0->270,270->0 |
| 1 | d | 349 349 | | | | 1 | d | 349 349 | | |
Scenario: Testbot - Initial bearing in all direction Scenario: Testbot - Initial bearing in all direction
@ -101,11 +101,11 @@ Feature: Bearing parameter
When I route I should get When I route I should get
| from | to | bearings | route | bearing | | from | to | bearings | route | bearing |
| 0 | q | 0 90 | ia,ab,bc,cd,de,ef,fg,gh,ha,ha | 0,90,180,180,270,270,0,0,90,0 | | 0 | q | 0 90 | ia,ab,bc,cd,de,ef,fg,gh,ha,ha | 0->0,0->90,90->180,180->180,180->270,270->270,270->0,0->0,0->90,90->0 |
| 0 | a | 45 90 | jb,bc,cd,de,ef,fg,gh,ha,ha | 45,180,180,270,270,0,0,90,0 | | 0 | a | 45 90 | jb,bc,cd,de,ef,fg,gh,ha,ha | 0->45,45->180,180->180,180->270,270->270,270->0,0->0,0->90,90->0 |
| 0 | q | 90 90 | kc,cd,de,ef,fg,gh,ha,ha | 90,180,270,270,0,0,90,0 | | 0 | q | 90 90 | kc,cd,de,ef,fg,gh,ha,ha | 0->90,90->180,180->270,270->270,270->0,0->0,0->90,90->0 |
| 0 | a | 135 90 | ld,de,ef,fg,gh,ha,ha | 135,270,270,0,0,90,0 | | 0 | a | 135 90 | ld,de,ef,fg,gh,ha,ha | 0->135,135->270,270->270,270->0,0->0,0->90,90->0 |
| 0 | a | 180 90 | me,ef,fg,gh,ha,ha | 180,270,0,0,90,0 | | 0 | a | 180 90 | me,ef,fg,gh,ha,ha | 0->180,180->270,270->0,0->0,0->90,90->0 |
| 0 | a | 225 90 | nf,fg,gh,ha,ha | 225,0,0,90,0 | | 0 | a | 225 90 | nf,fg,gh,ha,ha | 0->225,225->0,0->0,0->90,90->0 |
| 0 | a | 270 90 | og,gh,ha,ha | 270,0,90,0 | | 0 | a | 270 90 | og,gh,ha,ha | 0->270,270->0,0->90,90->0 |
| 0 | a | 315 90 | ph,ha,ha | 315,90,0 | | 0 | a | 315 90 | ph,ha,ha | 0->315,315->90,90->0 |

12
features/testbot/projection.feature
View File

@ -24,12 +24,12 @@ Feature: Projection to nearest point on road
Scenario: Projection onto way at high latitudes, 1km distance Scenario: Projection onto way at high latitudes, 1km distance
When I route I should get When I route I should get
| from | to | route | bearing | distance | | from | to | route | bearing | distance |
| b | a | abc,abc | 225,0 +-1 | 1000m +- 7 | | b | a | abc,abc | 0->225,225->0 | 1000m +- 7 |
| b | c | abc,abc | 45,0 +-1 | 1000m +- 7 | | b | c | abc,abc | 0->45,45->0 | 1000m +- 7 |
| a | d | abc,abc | 45,0 +-1 | 1000m +- 7 | | a | d | abc,abc | 0->45,45->0 | 1000m +- 7 |
| d | a | abc,abc | 225,0 +-1 | 1000m +- 7 | | d | a | abc,abc | 0->225,225->0 | 1000m +- 7 |
| c | d | abc,abc | 225,0 +-1 | 1000m +- 8 | | c | d | abc,abc | 0->225,224->0 | 1000m +- 8 |
| d | c | abc,abc | 45 +-1 | 1000m +- 8 | | d | c | abc,abc | 0->44,45->0 | 1000m +- 8 |
Scenario: Projection onto way at high latitudes, no distance Scenario: Projection onto way at high latitudes, no distance
When I route I should get When I route I should get