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

Merge pull request #134 from gardster/routing_fix

Browse source 
[routing] Cross mwm fix for routes with absent countries.
This commit is contained in:
Viktor Govako 2015-10-07 12:46:51 +03:00
commit 240003bab2
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -349,7 +349,7 @@
[self showStatePlanning];
break;
case MWMNavigationDashboardStateError:
NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (error)");
NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (error)");
[self handleError];
break;
case MWMNavigationDashboardStateReady:

21
routing/routing_session.cpp
View file

@ -81,7 +81,15 @@ 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);
}
@ -123,15 +131,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);