gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

clang-format

Browse source
This commit is contained in:
Lev Dragunov 2015-12-18 16:31:26 +03:00
parent b19a5208b1
commit 78bde32549
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
routing/routing_integration_tests/osrm_turn_test.cpp
View file

@ -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;

6
routing/turns_generator.cpp
View file

@ -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);