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

[routing] Cross mwm route instructions concatination fix.

Browse source
This commit is contained in:
Lev Dragunov 2015-08-19 16:46:34 +03:00 • committed by Alex Zolotarev
parent 20e99ffe09
commit 1eb8dc065b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/osrm_router.cpp
View file

@ -483,6 +483,14 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(TCheckedPath const &
if (!FindSingleRoute(cross.startNode, cross.finalNode, mwmMapping->m_dataFacade, routingResult))
return OsrmRouter::RouteNotFound;
if (!Points.empty())
{
// Remove road end point and turn instruction.
Points.pop_back();
TurnsDir.pop_back();
Times.pop_back();
}
// Get annotated route.
Route::TTurns mwmTurnsDir;
Route::TTimes mwmTimes;
@ -508,11 +516,6 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(TCheckedPath const &
Times.push_back(time);
}
if (!Points.empty())
{
// We're at the end point.
Points.pop_back();
}
Points.insert(Points.end(), mwmPoints.begin(), mwmPoints.end());
}