diff --git a/routing/osrm_router.hpp b/routing/osrm_router.hpp index 05493058cc..b9cf3d0128 100644 --- a/routing/osrm_router.hpp +++ b/routing/osrm_router.hpp @@ -85,9 +85,9 @@ protected: * \return routing operation result code. */ ResultCode MakeTurnAnnotation(RawRoutingResult const & routingResult, - TRoutingMappingPtr const & mapping, - RouterDelegate const & delegate, vector & points, - Route::TTurns & turnsDir, Route::TTimes & times, Route::TStreets & streets); + TRoutingMappingPtr const & mapping, RouterDelegate const & delegate, + vector & points, Route::TTurns & turnsDir, + Route::TTimes & times, Route::TStreets & streets); private: /*! diff --git a/routing/routing_integration_tests/osrm_street_names_test.cpp b/routing/routing_integration_tests/osrm_street_names_test.cpp index 945da30f07..a59aea2cd1 100644 --- a/routing/routing_integration_tests/osrm_street_names_test.cpp +++ b/routing/routing_integration_tests/osrm_street_names_test.cpp @@ -6,7 +6,6 @@ #include "platform/location.hpp" - using namespace routing; using namespace routing::turns; @@ -23,8 +22,7 @@ void MoveRoute(Route & route, ms::LatLon const & coords) UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest) { TRouteResult const routeResult = integration::CalculateRoute( - integration::GetOsrmComponents(), - MercatorBounds::FromLatLon(55.70839, 37.62145), {0., 0.}, + integration::GetOsrmComponents(), MercatorBounds::FromLatLon(55.70839, 37.62145), {0., 0.}, MercatorBounds::FromLatLon(55.73198, 37.63945)); Route & route = *routeResult.first; @@ -39,7 +37,6 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest) integration::TestCurrentStreetName(route, "Подольское шоссе"); integration::TestNextStreetName(route, "Валовая улица"); - MoveRoute(route, ms::LatLon(55.72059, 37.62766)); integration::TestCurrentStreetName(route, "Павловская улица"); diff --git a/routing/routing_tests/route_tests.cpp b/routing/routing_tests/route_tests.cpp index aa512729dd..bbb2c7a06f 100644 --- a/routing/routing_tests/route_tests.cpp +++ b/routing/routing_tests/route_tests.cpp @@ -18,7 +18,7 @@ static vector const kTestGeometry({{0, 0}, {0,1}, {1,1}, {1,2}, {1,3 static vector const kTestTurns({turns::TurnItem(1, turns::TurnDirection::TurnLeft), turns::TurnItem(2, turns::TurnDirection::TurnRight), turns::TurnItem(4, turns::TurnDirection::ReachedYourDestination)}); -static Route::TStreets const kTestNames({{0,"Street1"}, {1, "Street2"}, {4, "Street3"}}); +static Route::TStreets const kTestNames({{0, "Street1"}, {1, "Street2"}, {4, "Street3"}}); location::GpsInfo GetGps(double x, double y) {