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

Use .round instead of .to_i for cucumber speeds

Browse Source
This commit is contained in:
Lauren Budorick 2015-08-21 19:01:24 -07:00 committed by Patrick Niklaus
parent 2b5aa142fb
commit 0a53dccd4c
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/bicycle/bridge.feature
View File

@ -42,6 +42,6 @@ Feature: Bicycle - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg | 1,5,1 | 5 km/h | | a | g | abc,cde,efg | 1,5,1 | 5 km/h |
| b | f | abc,cde,efg | 1,5,1 | 3 km/h | | b | f | abc,cde,efg | 1,5,1 | 4 km/h |
| c | e | cde | 5 | 2 km/h | | c | e | cde | 5 | 2 km/h |
| e | c | cde | 5 | 2 km/h | | e | c | cde | 5 | 2 km/h |

4
features/car/bridge.feature
View File

@ -41,7 +41,7 @@ Feature: Car - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg | 1,3,1 | 6 km/h | | a | g | abc,cde,efg | 1,3,1 | 7 km/h |
| b | f | abc,cde,efg | 1,3,1 | 4 km/h | | b | f | abc,cde,efg | 1,3,1 | 5 km/h |
| c | e | cde | 3 | 2 km/h | | c | e | cde | 3 | 2 km/h |
| e | c | cde | 3 | 2 km/h | | e | c | cde | 3 | 2 km/h |

7
features/car/maxspeed.feature
View File

@ -23,10 +23,10 @@ OSRM will use 4/5 of the projected free-flow speed.
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 78 km/h | | a | b | ab | 78 km/h |
| b | c | bc | 59 km/h +- 1 | | b | c | bc | 59 km/h +- 1 |
| c | d | cd | 50 km/h | | c | d | cd | 51 km/h |
| d | e | de | 75 km/h | | d | e | de | 75 km/h |
| e | f | ef | 90 km/h | | e | f | ef | 90 km/h |
| f | g | fg | 105 km/h | | f | g | fg | 106 km/h |
Scenario: Car - Do not ignore maxspeed when higher than way speed Scenario: Car - Do not ignore maxspeed when higher than way speed
Given the node map Given the node map
@ -42,7 +42,7 @@ OSRM will use 4/5 of the projected free-flow speed.
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 31 km/h | | a | b | ab | 31 km/h |
| b | c | bc | 83 km/h +- 1 | | b | c | bc | 83 km/h +- 1 |
| c | d | cd | 50 km/h | | c | d | cd | 51 km/h |
Scenario: Car - Forward/backward maxspeed Scenario: Car - Forward/backward maxspeed
Given a grid size of 100 meters Given a grid size of 100 meters
@ -119,4 +119,3 @@ OSRM will use 4/5 of the projected free-flow speed.
| primary | 30 | 1 | -1 | | 34 km/h | | primary | 30 | 1 | -1 | | 34 km/h |
| primary | 30 | 1 | | 15 km/h | 15 km/h | | primary | 30 | 1 | | 15 km/h | 15 km/h |
| primary | 30 | 2 | | 34 km/h | 34 km/h | | primary | 30 | 2 | | 34 km/h | 34 km/h |

2
features/step_definitions/routing.rb
View File

@ -97,7 +97,7 @@ When /^I route I should get$/ do |table|
raise "*** Speed must be specied in km/h. (ex: 50 km/h)" unless row['speed'] =~ /\d+ km\/h/ raise "*** Speed must be specied in km/h. (ex: 50 km/h)" unless row['speed'] =~ /\d+ km\/h/
time = json['route_summary']['total_time'] time = json['route_summary']['total_time']
distance = json['route_summary']['total_distance'] distance = json['route_summary']['total_distance']
speed = time>0 ? (3.6*distance/time).to_i : nil speed = time>0 ? (3.6*distance/time).round : nil
got['speed'] = "#{speed} km/h" got['speed'] = "#{speed} km/h"
else else
got['speed'] = '' got['speed'] = ''

4
features/testbot/compression.feature
View File

@ -18,5 +18,5 @@ Feature: Geometry Compression
When I route I should get When I route I should get
| from | to | route | distance | speed | | from | to | route | distance | speed |
| b | e | abcdef | 589m | 35 km/h | | b | e | abcdef | 589m | 36 km/h |
| e | b | abcdef | 589m | 35 km/h | | e | b | abcdef | 589m | 36 km/h |