clang-format

This commit is contained in:
Lev Dragunov 2016-04-04 16:34:12 +03:00
parent 5c83b3debd
commit b5efa95330
3 changed files with 5 additions and 8 deletions

View file

@ -85,9 +85,9 @@ protected:
* \return routing operation result code.
*/
ResultCode MakeTurnAnnotation(RawRoutingResult const & routingResult,
TRoutingMappingPtr const & mapping,
RouterDelegate const & delegate, vector<m2::PointD> & points,
Route::TTurns & turnsDir, Route::TTimes & times, Route::TStreets & streets);
TRoutingMappingPtr const & mapping, RouterDelegate const & delegate,
vector<m2::PointD> & points, Route::TTurns & turnsDir,
Route::TTimes & times, Route::TStreets & streets);
private:
/*!

View file

@ -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, "Павловская улица");

View file

@ -18,7 +18,7 @@ static vector<m2::PointD> const kTestGeometry({{0, 0}, {0,1}, {1,1}, {1,2}, {1,3
static vector<turns::TurnItem> 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)
{