Skip to content

Commit 19f0058

Browse files
daniel-j-hPatrick Niklaus
daniel-j-h
authored and
Patrick Niklaus
committed
Removes constant speed offset from calibration two years ago, resolves Project-OSRM#3023.
Our fine-tuned profiles are better in modelling real speed by now. This constant offset is no longer needed. We still scale maxspeed, though. Project-OSRM#3053
1 parent 7f28a14 commit 19f0058

8 files changed

+145
-146
lines changed

‎features/car/advisory.feature

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ OSRM will use 4/5 of the projected free-flow speed.
1919

2020
When I route I should get
2121
| from | to | route | speed |
22-
| a | b | ab,ab | 47 km/h +- 1 |
23-
| b | c | bc,bc | 47 km/h +- 1 |
22+
| a | b | ab,ab | 36 km/h +- 1 |
23+
| b | c | bc,bc | 36 km/h +- 1 |
2424

2525
Scenario: Car - Advisory speed overwrites forward maxspeed
2626
Given the node map
@@ -35,8 +35,8 @@ OSRM will use 4/5 of the projected free-flow speed.
3535

3636
When I route I should get
3737
| from | to | route | speed |
38-
| a | b | ab,ab | 47 km/h +- 1 |
39-
| b | c | bc,bc | 47 km/h +- 1 |
38+
| a | b | ab,ab | 36 km/h +- 1 |
39+
| b | c | bc,bc | 36 km/h +- 1 |
4040

4141
Scenario: Car - Advisory speed overwrites backwards maxspeed
4242
Given the node map
@@ -51,8 +51,8 @@ OSRM will use 4/5 of the projected free-flow speed.
5151

5252
When I route I should get
5353
| from | to | route | speed |
54-
| b | a | ab,ab | 47 km/h +- 1 |
55-
| c | b | bc,bc | 47 km/h +- 1 |
54+
| b | a | ab,ab | 36 km/h +- 1 |
55+
| c | b | bc,bc | 36 km/h +- 1 |
5656

5757
Scenario: Car - Advisory speed overwrites backwards maxspeed
5858
Given the node map
@@ -68,8 +68,8 @@ OSRM will use 4/5 of the projected free-flow speed.
6868

6969
When I route I should get
7070
| from | to | route | speed |
71-
| c | b | bc,bc | 47 km/h +- 1 |
72-
| d | c | cd,cd | 47 km/h +- 1 |
71+
| c | b | bc,bc | 36 km/h +- 1 |
72+
| d | c | cd,cd | 36 km/h +- 1 |
7373

7474
Scenario: Car - Directional advisory speeds play nice with eachother
7575
Given the node map
@@ -84,9 +84,9 @@ OSRM will use 4/5 of the projected free-flow speed.
8484

8585
When I route I should get
8686
| from | to | route | speed |
87-
| a | b | ab,ab | 47 km/h +- 1 |
88-
| b | a | ab,ab | 59 km/h +- 1 |
89-
| b | c | bc,bc | 59 km/h +- 1 |
90-
| c | b | bc,bc | 47 km/h +- 1 |
87+
| a | b | ab,ab | 36 km/h +- 1 |
88+
| b | a | ab,ab | 48 km/h +- 1 |
89+
| b | c | bc,bc | 48 km/h +- 1 |
90+
| c | b | bc,bc | 36 km/h +- 1 |
9191

9292

‎features/car/bridge.feature

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Feature: Car - Handle driving
1919
| efg | primary | | |
2020

2121
When I route I should get
22-
| from | to | route | modes |
22+
| from | to | route | modes |
2323
| a | g | abc,cde,efg,efg | driving,driving,driving,driving |
2424
| b | f | abc,cde,efg,efg | driving,driving,driving,driving |
25-
| e | c | cde,cde | driving,driving |
25+
| e | c | cde,cde | driving,driving |
2626
| e | b | cde,abc,abc | driving,driving,driving |
2727
| e | a | cde,abc,abc | driving,driving,driving |
28-
| c | e | cde,cde | driving,driving |
28+
| c | e | cde,cde | driving,driving |
2929
| c | f | cde,efg,efg | driving,driving,driving |
3030
| c | g | cde,efg,efg | driving,driving,driving |
3131

@@ -44,8 +44,8 @@ Feature: Car - Handle driving
4444
| efg | primary | | |
4545

4646
When I route I should get
47-
| from | to | route | modes | speed |
48-
| a | g | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h |
49-
| b | f | abc,cde,efg,efg | driving,driving,driving,driving | 5 km/h |
50-
| c | e | cde,cde | driving,driving | 2 km/h |
51-
| e | c | cde,cde | driving,driving | 2 km/h |
47+
| from | to | route | modes | speed |
48+
| a | g | abc,cde,efg,efg | driving,driving,driving,driving | 6 km/h |
49+
| b | f | abc,cde,efg,efg | driving,driving,driving,driving | 4 km/h |
50+
| c | e | cde,cde | driving,driving | 2 km/h |
51+
| e | c | cde,cde | driving,driving | 2 km/h |

‎features/car/ferry.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Feature: Car - Handle ferry routes
4545

4646
When I route I should get
4747
| from | to | route | modes | speed |
48-
| a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 24 km/h |
48+
| a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 23 km/h |
4949
| b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h |
5050
| c | e | cde,cde | ferry,ferry | 11 km/h |
5151
| e | c | cde,cde | ferry,ferry | 11 km/h |
@@ -66,7 +66,7 @@ Feature: Car - Handle ferry routes
6666

6767
When I route I should get
6868
| from | to | route | modes | speed |
69-
| a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 24 km/h |
69+
| a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 23 km/h |
7070
| b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h |
7171
| c | e | cde,cde | ferry,ferry | 11 km/h |
7272
| e | c | cde,cde | ferry,ferry | 11 km/h |

‎features/car/maxspeed.feature

+36-36
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ OSRM will use 4/5 of the projected free-flow speed.
2222
| fg | trunk | CH:motorway |
2323

2424
When I route I should get
25-
| from | to | route | speed |
26-
| a | b | ab,ab | 79 km/h |
27-
| b | c | bc,bc | 59 km/h +- 1 |
28-
| c | d | cd,cd | 51 km/h |
29-
| d | e | de,de | 75 km/h |
30-
| e | f | ef,ef | 91 km/h |
31-
| f | g | fg,fg | 107 km/h |
25+
| from | to | route | speed |
26+
| a | b | ab,ab | 68 km/h |
27+
| b | c | bc,bc | 48 km/h |
28+
| c | d | cd,cd | 40 km/h |
29+
| d | e | de,de | 64 km/h |
30+
| e | f | ef,ef | 80 km/h |
31+
| f | g | fg,fg | 96 km/h |
3232

3333
Scenario: Car - Do not ignore maxspeed when higher than way speed
3434
Given the node map
@@ -43,23 +43,23 @@ OSRM will use 4/5 of the projected free-flow speed.
4343
| cd | living_street | FR:urban |
4444

4545
When I route I should get
46-
| from | to | route | speed |
47-
| a | b | ab,ab | 31 km/h |
48-
| b | c | bc,bc | 83 km/h +- 1 |
49-
| c | d | cd,cd | 51 km/h |
46+
| from | to | route | speed |
47+
| a | b | ab,ab | 20 km/h |
48+
| b | c | bc,bc | 72 km/h |
49+
| c | d | cd,cd | 40 km/h |
5050

5151
Scenario: Car - Forward/backward maxspeed
5252
Given a grid size of 100 meters
5353

5454
Then routability should be
55-
| highway | maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
56-
| primary | | | | 63 km/h | 63 km/h |
57-
| primary | 60 | | | 60 km/h +- 1 | 60 km/h +- 1 |
58-
| primary | | 60 | | 60 km/h +- 1 | 63 km/h |
59-
| primary | | | 60 | 63 km/h | 60 km/h +- 1 |
60-
| primary | 15 | 60 | | 60 km/h +- 1 | 23 km/h |
61-
| primary | 15 | | 60 | 23 km/h +- 1 | 60 km/h +- 1 |
62-
| primary | 15 | 30 | 60 | 34 km/h +- 1 | 60 km/h +- 1 |
55+
| highway | maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
56+
| primary | | | | 52 km/h | 52 km/h |
57+
| primary | 60 | | | 48 km/h | 48 km/h |
58+
| primary | | 60 | | 48 km/h | 48 km/h +- 5 |
59+
| primary | | | 60 | 52 km/h | 52 km/h +- 5 |
60+
| primary | 15 | 60 | | 48 km/h | 12 km/h |
61+
| primary | 15 | | 60 | 12 km/h | 48 km/h |
62+
| primary | 15 | 30 | 60 | 24 km/h | 48 km/h |
6363

6464
Scenario: Car - Maxspeed should not allow routing on unroutable ways
6565
Then routability should be
@@ -82,44 +82,44 @@ OSRM will use 4/5 of the projected free-flow speed.
8282
Then routability should be
8383

8484
| highway | maxspeed | width | maxspeed:forward | maxspeed:backward | forw | backw |
85-
| primary | | | | | 63 km/h | 63 km/h |
85+
| primary | | | | | 52 km/h | 52 km/h |
8686
| primary | | 3 | | | 32 km/h | 32 km/h |
87-
| primary | 60 | | | | 59 km/h | 59 km/h |
87+
| primary | 60 | | | | 47 km/h | 47 km/h |
8888
| primary | 60 | 3 | | | 29 km/h | 29 km/h |
89-
| primary | | | 60 | | 59 km/h | 63 km/h |
89+
| primary | | | 60 | | 47 km/h | 52 km/h |
9090
| primary | | 3 | 60 | | 29 km/h | 32 km/h |
91-
| primary | | | | 60 | 63 km/h | 59 km/h |
91+
| primary | | | | 60 | 52 km/h | 47 km/h |
9292
| primary | | 3 | | 60 | 32 km/h | 29 km/h |
93-
| primary | 15 | | 60 | | 59 km/h | 23 km/h |
93+
| primary | 15 | | 60 | | 47 km/h | 12 km/h |
9494
| primary | 15 | 3 | 60 | | 29 km/h | 7 km/h |
95-
| primary | 15 | | | 60 | 22 km/h | 59 km/h |
95+
| primary | 15 | | | 60 | 12 km/h | 47 km/h |
9696
| primary | 15 | 3 | | 60 | 7 km/h | 29 km/h |
97-
| primary | 15 | | 30 | 60 | 35 km/h | 59 km/h |
97+
| primary | 15 | | 30 | 60 | 23 km/h | 47 km/h |
9898
| primary | 15 | 3 | 30 | 60 | 14 km/h | 29 km/h |
9999

100100
Scenario: Car - Single lane streets be ignored or incur a penalty
101101
Then routability should be
102102

103103
| highway | maxspeed | lanes | maxspeed:forward | maxspeed:backward | forw | backw |
104-
| primary | | | | | 63 km/h | 63 km/h |
104+
| primary | | | | | 52 km/h | 52 km/h |
105105
| primary | | 1 | | | 32 km/h | 32 km/h |
106-
| primary | 60 | | | | 59 km/h | 59 km/h |
106+
| primary | 60 | | | | 47 km/h | 47 km/h |
107107
| primary | 60 | 1 | | | 29 km/h | 29 km/h |
108-
| primary | | | 60 | | 59 km/h | 63 km/h |
108+
| primary | | | 60 | | 47 km/h | 52 km/h |
109109
| primary | | 1 | 60 | | 29 km/h | 32 km/h |
110-
| primary | | | | 60 | 63 km/h | 59 km/h |
110+
| primary | | | | 60 | 52 km/h | 47 km/h |
111111
| primary | | 1 | | 60 | 32 km/h | 29 km/h |
112-
| primary | 15 | | 60 | | 59 km/h | 23 km/h |
112+
| primary | 15 | | 60 | | 47 km/h | 12 km/h |
113113
| primary | 15 | 1 | 60 | | 29 km/h | 7 km/h |
114-
| primary | 15 | | | 60 | 22 km/h | 59 km/h |
114+
| primary | 15 | | | 60 | 12 km/h | 47 km/h |
115115
| primary | 15 | 1 | | 60 | 7 km/h | 29 km/h |
116-
| primary | 15 | | 30 | 60 | 35 km/h | 59 km/h |
116+
| primary | 15 | | 30 | 60 | 23 km/h | 47 km/h |
117117
| primary | 15 | 1 | 30 | 60 | 14 km/h | 29 km/h |
118118

119119
Scenario: Car - Single lane streets only incure a penalty for two-way streets
120120
Then routability should be
121121
| highway | maxspeed | lanes | oneway | forw | backw |
122-
| primary | 30 | 1 | yes | 35 km/h | |
123-
| primary | 30 | 1 | -1 | | 35 km/h |
122+
| primary | 30 | 1 | yes | 23 km/h | |
123+
| primary | 30 | 1 | -1 | | 23 km/h |
124124
| primary | 30 | 1 | | 15 km/h | 15 km/h |
125-
| primary | 30 | 2 | | 35 km/h | 35 km/h |
125+
| primary | 30 | 2 | | 23 km/h | 23 km/h |

‎features/car/speed.feature

+21-21
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ Feature: Car - speeds
77

88
Scenario: Car - speed of various way types
99
Then routability should be
10-
| highway | oneway | bothw |
11-
| motorway | no | 82 km/h +- 1 |
12-
| motorway_link | no | 47 km/h +- 1 |
13-
| trunk | no | 79 km/h +- 1 |
14-
| trunk_link | no | 43 km/h +- 1 |
15-
| primary | no | 63 km/h +- 1 |
16-
| primary_link | no | 35 km/h +- 1 |
17-
| secondary | no | 54 km/h +- 1 |
18-
| secondary_link | no | 31 km/h +- 1 |
19-
| tertiary | no | 43 km/h +- 1 |
20-
| tertiary_link | no | 27 km/h +- 1 |
21-
| unclassified | no | 31 km/h +- 1 |
22-
| residential | no | 31 km/h +- 1 |
23-
| living_street | no | 18 km/h +- 1 |
24-
| service | no | 23 km/h +- 1 |
10+
| highway | oneway | bothw |
11+
| motorway | no | 71 km/h |
12+
| motorway_link | no | 36 km/h |
13+
| trunk | no | 68 km/h |
14+
| trunk_link | no | 31 km/h |
15+
| primary | no | 52 km/h |
16+
| primary_link | no | 23 km/h |
17+
| secondary | no | 44 km/h |
18+
| secondary_link | no | 19 km/h |
19+
| tertiary | no | 31 km/h |
20+
| tertiary_link | no | 16 km/h |
21+
| unclassified | no | 19 km/h |
22+
| residential | no | 19 km/h |
23+
| living_street | no | 8 km/h |
24+
| service | no | 11 km/h |
2525

2626
# Alternating oneways have to take average waiting time into account.
2727
Scenario: Car - scaled speeds for oneway=alternating
2828
Then routability should be
2929
| highway | oneway | junction | forw | backw | # |
30-
| tertiary | | | 43 km/h | 43 km/h | |
31-
| tertiary | alternating | | 20 km/h +- 5 | 20 km/h +- 5 | |
32-
| motorway | | | 82 km/h | | implied oneway |
33-
| motorway | alternating | | 30 km/h +- 5 | | implied oneway |
30+
| tertiary | | | 31 km/h | 31 km/h | |
31+
| tertiary | alternating | | 12 km/h +- 1 | 12 km/h +- 1 | |
32+
| motorway | | | 71 km/h | | implied oneway |
33+
| motorway | alternating | | 28 km/h +- 1 | | implied oneway |
3434
| motorway | reversible | | | | unroutable |
35-
| primary | | roundabout | 63 km/h | | implied oneway |
36-
| primary | alternating | roundabout | 25 km/h +- 5 | | implied oneway |
35+
| primary | | roundabout | 52 km/h | | implied oneway |
36+
| primary | alternating | roundabout | 20 km/h +- 1 | | implied oneway |
3737
| primary | reversible | roundabout | | | unroutable |

0 commit comments

Comments
 (0)