diff --git a/features/bicycle/bridge.feature b/features/bicycle/bridge.feature index 232581647..8c26ee99d 100644 --- a/features/bicycle/bridge.feature +++ b/features/bicycle/bridge.feature @@ -42,6 +42,6 @@ Feature: Bicycle - Handle movable bridge When I route I should get | from | to | route | modes | speed | | 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 | | e | c | cde | 5 | 2 km/h | diff --git a/features/car/bridge.feature b/features/car/bridge.feature index 41dc10bdb..d3e470e41 100644 --- a/features/car/bridge.feature +++ b/features/car/bridge.feature @@ -41,7 +41,7 @@ Feature: Car - Handle movable bridge When I route I should get | from | to | route | modes | speed | - | a | g | abc,cde,efg | 1,3,1 | 6 km/h | - | b | f | abc,cde,efg | 1,3,1 | 4 km/h | + | a | g | abc,cde,efg | 1,3,1 | 7 km/h | + | b | f | abc,cde,efg | 1,3,1 | 5 km/h | | c | e | cde | 3 | 2 km/h | | e | c | cde | 3 | 2 km/h | diff --git a/features/car/maxspeed.feature b/features/car/maxspeed.feature index 764de728a..e2d26e0e0 100644 --- a/features/car/maxspeed.feature +++ b/features/car/maxspeed.feature @@ -23,10 +23,10 @@ OSRM will use 4/5 of the projected free-flow speed. | from | to | route | speed | | a | b | ab | 78 km/h | | 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 | | 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 Given the node map @@ -42,7 +42,7 @@ OSRM will use 4/5 of the projected free-flow speed. | from | to | route | speed | | a | b | ab | 31 km/h | | b | c | bc | 83 km/h +- 1 | - | c | d | cd | 50 km/h | + | c | d | cd | 51 km/h | Scenario: Car - Forward/backward maxspeed 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 | | 15 km/h | 15 km/h | | primary | 30 | 2 | | 34 km/h | 34 km/h | - diff --git a/features/step_definitions/routing.rb b/features/step_definitions/routing.rb index 597ea65d6..6a73d8604 100644 --- a/features/step_definitions/routing.rb +++ b/features/step_definitions/routing.rb @@ -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/ time = json['route_summary']['total_time'] 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" else got['speed'] = '' diff --git a/features/testbot/compression.feature b/features/testbot/compression.feature index 146ad63df..4c0121d6f 100644 --- a/features/testbot/compression.feature +++ b/features/testbot/compression.feature @@ -18,5 +18,5 @@ Feature: Geometry Compression When I route I should get | from | to | route | distance | speed | - | b | e | abcdef | 589m | 35 km/h | - | e | b | abcdef | 589m | 35 km/h | + | b | e | abcdef | 589m | 36 km/h | + | e | b | abcdef | 589m | 36 km/h |