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

Fix of the wrong distance on cross mwm route planning.

Browse source
This commit is contained in:
Lev Dragunov 2015-10-06 11:46:43 +03:00
parent ac73294ccc
commit d5d6c8bae8
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
routing/routing_session.cpp
View file

@ -85,7 +85,13 @@ void RoutingSession::DoReadyCallback::operator()(Route & route, IRouter::ResultC
threads::MutexGuard guard(m_routeSessionMutexInner);
UNUSED_VALUE(guard);
m_rs.AssignRoute(route, e);
if (e != IRouter::NeedMoreMaps)
m_rs.AssignRoute(route, e);
else
{
for (string const & country: route.GetAbsentCountries())
m_rs.m_route.AddAbsentCountry(country);
}
m_callback(m_rs.m_route, e);
}
@ -127,15 +133,8 @@ RoutingSession::State RoutingSession::OnLocationPositionChanged(m2::PointD const
ASSERT(m_state != RoutingNotActive, ());
ASSERT(m_router != nullptr, ());
if (m_state == RouteNotReady)
{
if (++m_moveAwayCounter > kOnRouteMissedCount)
return RouteNeedRebuild;
else
return RouteNotReady;
}
if (m_state == RouteNeedRebuild || m_state == RouteFinished || m_state == RouteBuilding)
if (m_state == RouteNeedRebuild || m_state == RouteFinished || m_state == RouteBuilding ||
m_state == RouteNotReady)
return m_state;
threads::MutexGuard guard(m_routeSessionMutex);