From 78bde32549e4e060081ccddab4aef89c70bb5406 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Fri, 18 Dec 2015 16:31:26 +0300 Subject: [PATCH] clang-format --- routing/routing_integration_tests/osrm_turn_test.cpp | 5 ++--- routing/turns_generator.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/routing/routing_integration_tests/osrm_turn_test.cpp b/routing/routing_integration_tests/osrm_turn_test.cpp index 089cafd14e..a1759b4c73 100644 --- a/routing/routing_integration_tests/osrm_turn_test.cpp +++ b/routing/routing_integration_tests/osrm_turn_test.cpp @@ -87,9 +87,8 @@ UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest) UNIT_TEST(SwedenBarlangeRoundaboutTurnTest) { TRouteResult const routeResult = integration::CalculateRoute( - integration::GetOsrmComponents(), - MercatorBounds::FromLatLon(60.48278, 15.42356), {0., 0.}, - MercatorBounds::FromLatLon(60.48462, 15.42120)); + integration::GetOsrmComponents(), MercatorBounds::FromLatLon(60.48278, 15.42356), {0., 0.}, + MercatorBounds::FromLatLon(60.48462, 15.42120)); Route const & route = *routeResult.first; IRouter::ResultCode const result = routeResult.second; diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp index 3db2f7dd62..3f03444d76 100644 --- a/routing/turns_generator.cpp +++ b/routing/turns_generator.cpp @@ -182,8 +182,8 @@ bool KeepTurnByHighwayClass(TurnDirection turn, TTurnCandidates const & possible * \brief Returns false when other possible turns leads to service roads; */ bool KeepRoundaboutTurnByHighwayClass(TurnDirection turn, TTurnCandidates const & possibleTurns, - TurnInfo const & turnInfo, Index const & index, - RoutingMapping & mapping) + TurnInfo const & turnInfo, Index const & index, + RoutingMapping & mapping) { for (auto const & t : possibleTurns) { @@ -881,7 +881,7 @@ void GetTurnDirection(Index const & index, RoutingMapping & mapping, TurnInfo & if (turnInfo.m_ingoing.m_onRoundabout || turnInfo.m_outgoing.m_onRoundabout) { - bool const keepTurnByHighwayClass = KeepRoundaboutTurnByHighwayClass(turn.m_turn, nodes, turnInfo, index, mapping); + bool const keepTurnByHighwayClass = KeepRoundaboutTurnByHighwayClass(turn.m_turn, nodes, turnInfo, index, mapping); turn.m_turn = GetRoundaboutDirection(turnInfo.m_ingoing.m_onRoundabout, turnInfo.m_outgoing.m_onRoundabout, hasMultiTurns, keepTurnByHighwayClass);