diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp index 2dd184370e..e8e81f19f8 100644 --- a/routing/bicycle_directions.cpp +++ b/routing/bicycle_directions.cpp @@ -157,18 +157,22 @@ bool BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector & routeGeometry, vector & segments) { + m_adjacentEdges.clear(); + m_pathSegments.clear(); + turns.clear(); + streetNames.clear(); + routeGeometry.clear(); + segments.clear(); + size_t const pathSize = path.size(); // Note. According to Route::IsValid() method route of zero or one point is invalid. if (pathSize < 1) return false; - m_adjacentEdges.clear(); - m_pathSegments.clear(); - IRoadGraph::TEdgeVector routeEdges; if (!ReconstructPath(graph, path, routeEdges, cancellable)) { - LOG(LWARNING, ("Couldn't reconstruct path.")); + LOG(LWARNING, ("Can't reconstruct path.")); return false; } @@ -186,11 +190,6 @@ bool BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector & routeGeometry, vector & segments) { + turns.clear(); + streetNames.clear(); + segments.clear(); + routeGeometry = path; + // Note. According to Route::IsValid() method route of zero or one point is invalid. if (path.size() < 1) return false; - turns.clear(); - streetNames.clear(); - segments.clear(); - - routeGeometry = path; - vector routeEdges; if (!ReconstructPath(graph, path, routeEdges, cancellable)) { - LOG(LWARNING, ("Couldn't reconstruct path.")); + LOG(LWARNING, ("Can't reconstruct path.")); return false; }