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

Restore cross-mwm routing.

Browse source
This commit is contained in:
vng 2015-03-12 15:14:18 +03:00 • committed by Alex Zolotarev
parent b9c2d4285e
commit a3b914af00
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/osrm_router.cpp
View file

@ -842,6 +842,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
MY_SCOPE_GUARD(targetMappingGuard, [&]() {targetMapping->FreeCrossContext();});
// Check if mwms are neighbours
/*
bool left_neighbour = false, right_neighbour = false;
auto start_out_iterators = startMapping->m_crossContext.GetOutgoingIterators();
auto target_out_iterators = targetMapping->m_crossContext.GetOutgoingIterators();
@ -857,6 +858,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
left_neighbour = true;
break;
}
if (!left_neighbour && !right_neighbour)
{
LOG(LWARNING, ("MWMs not a neighbours!"));
@ -874,6 +876,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
}
LOG(LINFO, ("Mwms are neighbours"));
*/
// Load source data
auto out_iterators = startMapping->m_crossContext.GetOutgoingIterators();
@ -1128,7 +1131,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(RawRoutingResultT const &
{
PathData const & path_data = routingResult.m_routePath.unpacked_path_segments[i][j];
if (j > 0)
if (j > 0 && !points.empty())
{
Route::TurnItem t;
t.m_index = points.size() - 1;
@ -1139,7 +1142,6 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(RawRoutingResultT const &
if (t.m_turn != turns::NoTurn)
turnsDir.push_back(t);
// osrm multiple seconds to 10, so we need to divide it back
double const sTime = TIME_OVERHEAD * path_data.segment_duration / 10.0;
#ifdef _DEBUG