Merge pull request #3360 from bykoianko/master-assert-in-case-long-bicycle-routes

Fixing asserts while generating turns for long routes.

2 files changed, 11 insertions, 4 deletions

diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index afb7e1195e..30db2041ba 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -36,8 +36,8 @@ public:
   // turns::IRoutingResult overrides:
   TUnpackedPathSegments const & GetSegments() const override { return m_pathSegments; }
 
-  void GetPossibleTurns(TNodeId node, m2::PointD const & ingoingPoint,
-                        m2::PointD const & junctionPoint, size_t & ingoingCount,
+  void GetPossibleTurns(TNodeId node, m2::PointD const & /* ingoingPoint */,
+                        m2::PointD const & /* junctionPoint */, size_t & ingoingCount,
                         TurnCandidates & outgoingTurns) const override
   {
     ingoingCount = 0;
@@ -51,7 +51,7 @@ public:
     }
 
     ingoingCount = adjacentEdges->second.m_ingoingTurnsCount;
-    outgoingTurns.candidates = adjacentEdges->second.m_outgoingTurns.candidates;
+    outgoingTurns = adjacentEdges->second.m_outgoingTurns;
   }
 
   double GetPathLength() const override { return m_routeLength; }
diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/routing/routing_integration_tests/bicycle_route_test.cpp
index afcd96f95e..106fa99d9c 100644
--- a/routing/routing_integration_tests/bicycle_route_test.cpp
+++ b/routing/routing_integration_tests/bicycle_route_test.cpp
@@ -11,5 +11,12 @@ UNIT_TEST(RussiaMoscowSevTushinoParkPreferingBicycleWay)
 {
   integration::CalculateRouteAndTestRouteLength(
       integration::GetBicycleComponents(), MercatorBounds::FromLatLon(55.87445, 37.43711), {0., 0.},
-      MercatorBounds::FromLatLon(55.87203, 37.44274), 460.);
+      MercatorBounds::FromLatLon(55.87203, 37.44274), 460.0);
+}
+
+UNIT_TEST(RussiaMoscowNahimovskyLongRoute)
+{
+  integration::CalculateRouteAndTestRouteLength(
+      integration::GetBicycleComponents(), MercatorBounds::FromLatLon(55.66151, 37.63320), {0., 0.},
+      MercatorBounds::FromLatLon(55.67695, 37.56220), 6938.0);
 }