diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp index 5d9af5a67a..1886899d06 100644 --- a/routing/routing_integration_tests/route_test.cpp +++ b/routing/routing_integration_tests/route_test.cpp @@ -402,7 +402,7 @@ namespace TEST_EQUAL(result, IRouter::NoError, ()); } - // Test on decreasing speed factor on roads with bad cover. + // Test of decreasing speed factor on roads with bad cover. UNIT_TEST(RussiaLenOblSpeedFactorsTest) { integration::CalculateRouteAndTestRouteLength( @@ -411,7 +411,7 @@ namespace MercatorBounds::FromLatLon(60.28975, 29.79399), 11618.1); } - // Test on decreasing speed factor on roads with bad cover. + // Test of decreasing speed factor on roads with bad cover. UNIT_TEST(RussiaMosOblSpeedFactorsTest) { integration::CalculateRouteAndTestRouteLength( diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp index 17c1f940a6..01bb603fb2 100644 --- a/routing_common/bicycle_model.cpp +++ b/routing_common/bicycle_model.cpp @@ -422,7 +422,7 @@ VehicleModel::SurfaceInitList const g_bicycleSurface = { {{"psurface", "paved_good"}, 1.0}, {{"psurface", "paved_bad"}, 0.8}, {{"psurface", "unpaved_good"}, 1.0}, - {{"psurface", "unpaved_bad"}, 0.6}, + {{"psurface", "unpaved_bad"}, 0.3}, }; } // namespace diff --git a/routing_common/car_model.cpp b/routing_common/car_model.cpp index 7017487667..cee375d37f 100644 --- a/routing_common/car_model.cpp +++ b/routing_common/car_model.cpp @@ -202,9 +202,9 @@ vector const kAdditionalTags = { VehicleModel::SurfaceInitList const g_carSurface = { {{"psurface", "paved_good"}, 1.0}, - {{"psurface", "paved_bad"}, 0.6}, + {{"psurface", "paved_bad"}, 0.5}, {{"psurface", "unpaved_good"}, 0.8}, - {{"psurface", "unpaved_bad"}, 0.4}, + {{"psurface", "unpaved_bad"}, 0.3}, }; } // namespace diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index ac41f108be..3474b4484d 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -97,7 +97,8 @@ double VehicleModel::GetMinTypeSpeed(feature::TypesHolder const & types) const speedFactor = min(speedFactor, itFactor->m_factor); } - if (speed <= m_maxSpeedKMpH && speedFactor <= 1.0) + ASSERT_LESS_OR_EQUAL(speedFactor, 1.0, ()); + if (speed <= m_maxSpeedKMpH) return speed * speedFactor; return 0.0 /* Speed */;