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

Cross mwm adjust destination message fix.

Browse source
This commit is contained in:
Lev Dragunov 2015-09-03 10:57:06 +03:00 • committed by Alex Zolotarev
parent 04889e69bc
commit 8038c2b1c8
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
routing/osrm_router.cpp
View file

@ -531,28 +531,29 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRoute(m2::PointD const & startPoint,
RouterDelegate const & delegate, Route & route)
{
my::HighResTimer timer(true);
m_indexManager.Clear(); // TODO (Dragunov) make proper index manager cleaning
TRoutingMappingPtr startMapping = m_indexManager.GetMappingByPoint(startPoint);
TRoutingMappingPtr targetMapping = m_indexManager.GetMappingByPoint(finalPoint);
m_indexManager.Clear(); // TODO (Dragunov) make proper index manager cleaning
if (!startMapping->IsValid())
{
route.AddAbsentCountry(startMapping->GetCountryName());
ResultCode const code = startMapping->GetError();
if (code != NoError)
{
route.AddAbsentCountry(startMapping->GetCountryName());
return code;
}
return IRouter::StartPointNotFound;
}
if (!targetMapping->IsValid())
{
// Check if target is a neighbour
startMapping->LoadCrossContext();
auto out_iterators = startMapping->m_crossContext.GetOutgoingIterators();
for (auto i = out_iterators.first; i != out_iterators.second; ++i)
if (startMapping->m_crossContext.GetOutgoingMwmName(*i) ==
targetMapping->GetCountryName())
{
route.AddAbsentCountry(targetMapping->GetCountryName());
return IRouter::EndPointNotFound;
}
ResultCode const code = targetMapping->GetError();
if (code != NoError)
{
route.AddAbsentCountry(targetMapping->GetCountryName());
return code;
}
return IRouter::EndPointNotFound;
}