From ecd0052b31833e2d74f8e4a594230b1f7855fe14 Mon Sep 17 00:00:00 2001 From: Constantin Shalnev Date: Wed, 29 Apr 2015 13:52:51 +0300 Subject: [PATCH] recostruct path only if router had been succeeded --- routing/road_graph_router.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index e02c554208..20e6f1f419 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -90,14 +90,18 @@ IRouter::ResultCode RoadGraphRouter::CalculateRoute(m2::PointD const & startPoin m_roadGraph->AddFakeTurns(finalPos, finalVicinity); vector routePos; - IRouter::ResultCode resultCode = CalculateRoute(startPos, finalPos, routePos); - - ASSERT(routePos.back() == finalPos, ()); - ASSERT(routePos.front() == startPos, ()); + IRouter::ResultCode const resultCode = CalculateRoute(startPos, finalPos, routePos); LOG(LINFO, ("Route calculation time:", timer.ElapsedSeconds(), "result code:", resultCode)); - m_roadGraph->ReconstructPath(routePos, route); + if (IRouter::NoError == resultCode) + { + ASSERT(routePos.back() == finalPos, ()); + ASSERT(routePos.front() == startPos, ()); + + m_roadGraph->ReconstructPath(routePos, route); + } + return resultCode; }