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

Old/new mwm cross mwm fix

Browse source
This commit is contained in:
Lev Dragunov 2015-04-02 18:12:23 +03:00 • committed by Alex Zolotarev
parent e8d1b5c316
commit da11771c3a
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
routing/osrm_router.cpp
View file

@ -698,9 +698,13 @@ public:
}
}
bool IsValid()
OsrmRouter::ResultCode GetError() const
{
return (!m_weights.empty());
if (m_sources.empty())
return OsrmRouter::RouteFileNotExist;
if (m_weights.empty())
return OsrmRouter::EndPointNotFound;
return OsrmRouter::NoError;
}
bool MakeLastCrossSegment(size_t const incomeNodeId, OsrmRouter::RoutePathCross & outCrossTask)
@ -866,6 +870,12 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
auto const mwmOutsIter = startMapping->m_crossContext.GetOutgoingIterators();
MultiroutingTaskPointT sources(1), targets(distance(mwmOutsIter.first, mwmOutsIter.second));
if (targets.empty())
{
route.AddAbsentCountry(startMapping->GetName());
return RouteFileNotExist;
}
size_t index = 0;
for (auto j = mwmOutsIter.first; j < mwmOutsIter.second; ++j, ++index)
OsrmRouter::GenerateRoutingTaskFromNodeId(j->m_nodeId, false /*isStartNode*/, targets[index]);
@ -889,8 +899,13 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
// Load target data
LastCrossFinder targetFinder(targetMapping, m_CachedTargetTask);
if(!targetFinder.IsValid())
return EndPointNotFound;
ResultCode const targetResult = targetFinder.GetError();
if (targetResult != NoError)
{
if (targetResult == RouteFileNotExist)
route.AddAbsentCountry(targetMapping->GetName());
return targetResult;
}
EdgeWeight finalWeight = INVALID_EDGE_WEIGHT;
CheckedPathT finalPath;