From 18f3f79a56946335f4db877940eb40d6b030930a Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Mon, 10 Jul 2017 18:31:46 +0300
Subject: [PATCH] Removing emptyPathWorkaround()

---
 routing/bicycle_directions.cpp    | 19 +++++--------------
 routing/pedestrian_directions.cpp |  6 ++----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index 1f238229d9..81c777614e 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -167,31 +167,22 @@ bool BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector<Junct
   segments.clear();
 
   size_t const pathSize = path.size();
-  auto emptyPathWorkaround = [&]()
-  {
-    turns.emplace_back(pathSize - 1, turns::TurnDirection::ReachedYourDestination);
-    // There's one ingoing edge to the finish.
-    this->m_adjacentEdges[UniNodeId(UniNodeId::Type::Mwm)] = AdjacentEdges(1);
-  };
 
   if (pathSize == 1)
-  {
-    emptyPathWorkaround();
     return false;
-  }
 
   IRoadGraph::TEdgeVector routeEdges;
   if (!ReconstructPath(graph, path, routeEdges, cancellable))
   {
-    LOG(LDEBUG, ("Couldn't reconstruct path."));
-    emptyPathWorkaround();
+    LOG(LINFO, ("Couldn't reconstruct path."));
     return false;
   }
+  
   if (routeEdges.empty())
-  {
-    emptyPathWorkaround();
     return false;
-  }
+
+  if (cancellable.IsCancelled())
+    return false;
 
   FillPathSegmentsAndAdjacentEdgesMap(graph, path, routeEdges, cancellable);
 
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp
index 9b987f39e2..3f514e022b 100644
--- a/routing/pedestrian_directions.cpp
+++ b/routing/pedestrian_directions.cpp
@@ -47,7 +47,7 @@ bool PedestrianDirectionsEngine::Generate(RoadGraphBase const & graph,
                                           vector<Segment> & segments)
 {
   CHECK(!path.empty(), ());
-  
+
   turns.clear();
   streetNames.clear();
   segments.clear();
@@ -57,9 +57,7 @@ bool PedestrianDirectionsEngine::Generate(RoadGraphBase const & graph,
   vector<Edge> routeEdges;
   if (!ReconstructPath(graph, path, routeEdges, cancellable))
   {
-    LOG(LDEBUG, ("Couldn't reconstruct path."));
-    // use only "arrival" direction
-    turns.emplace_back(path.size() - 1, turns::PedestrianDirection::ReachedYourDestination);
+    LOG(LINFO, ("Couldn't reconstruct path."));
     return false;
   }