kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Bad turns data processing case for the next turn.

Browse source
This commit is contained in:
Lev Dragunov 2015-08-25 18:43:53 +03:00 • committed by Alex Zolotarev
parent 8ebaaece76
commit 46d30bcfd2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
routing/route.cpp
View file

@ -121,7 +121,7 @@ uint32_t Route::GetCurrentTimeToEndSec() const
return m_poly.GetDistanceM(m_poly.GetIterToIndex(start), m_poly.GetIterToIndex(end));
};
ASSERT_LESS_OR_EQUAL(m_times[idx].first, polySz, ());
ASSERT_LESS(m_times[idx].first, polySz, ());
double const dist = distFn(idx > 0 ? m_times[idx - 1].first : 0, m_times[idx].first);
if (!my::AlmostEqualULPs(dist, 0.))
@ -168,8 +168,10 @@ void Route::GetCurrentTurn(double & distanceToTurnMeters, turns::TurnItem & turn
void Route::GetNextTurn(turns::TurnItem & turn) const
{
auto it = GetCurrentTurn();
ASSERT(it != m_turns.end(), ());
++it;
if (it != m_turns.end())
++it;
else
ASSERT(it != m_turns.end(), ());
turn = it != m_turns.end() ? *it : turns::TurnItem();
}