[routing] Remove passed intermediate points when assembling a modified route mid-navigation

Fixes OM #9592

Signed-off-by: Michał Brzozowski <www.haxor@gmail.com>

map/routing_manager.cpp

@@ -328,7 +328,6 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
                         nullptr
 #endif
   );
-
   m_routingSession.SetRoutingCallbacks(
       [this](Route const & route, RouterResultCode code) { OnBuildRouteReady(route, code); },
       [this](Route const & route, RouterResultCode code) { OnRebuildRouteReady(route, code); },
@@ -554,8 +553,10 @@ void RoutingManager::RemoveRoute(bool deactivateFollowing)
       es.ClearGroup(UserMark::Type::SPEED_CAM);
       es.ClearGroup(UserMark::Type::ROAD_WARNING);
     }
-    if (deactivateFollowing)
+    if (deactivateFollowing) {
         SetPointsFollowingMode(false /* enabled */);
+        RemovePassedPoints();
+    }
   });
 
   if (deactivateFollowing)
@@ -954,6 +955,13 @@ void RoutingManager::SetPointsFollowingMode(bool enabled)
   routePoints.SetFollowingMode(enabled);
 }
 
+void RoutingManager::RemovePassedPoints()
+{
+    ASSERT(m_bmManager != nullptr, ());
+    RoutePointsLayout routePoints(*m_bmManager);
+    routePoints.RemovePassedPoints();
+}
+
 void RoutingManager::ReorderIntermediatePoints()
 {
   vector<RouteMarkPoint *> prevPoints;

map/routing_manager.hpp

@@ -354,6 +354,8 @@ private:
 
   void SetPointsFollowingMode(bool enabled);
 
+  void RemovePassedPoints();
+
   void ReorderIntermediatePoints();
 
   m2::RectD ShowPreviewSegments(std::vector<RouteMarkData> const & routePoints);

map/routing_mark.cpp

@@ -353,6 +353,16 @@ void RoutePointsLayout::SetFollowingMode(bool enabled)
     m_editSession.GetMarkForEdit<RouteMarkPoint>(markId)->SetFollowingMode(enabled);
 }
 
+void RoutePointsLayout::RemovePassedPoints()
+{
+    for (auto markId : m_manager.GetUserMarkIds(UserMark::Type::ROUTING)) {
+        auto * mark = m_editSession.GetMarkForEdit<RouteMarkPoint>(markId);
+        if (mark->IsPassed())
+            m_editSession.DeleteUserMark(mark->GetId());
+    }
+}
+
+
 RouteMarkPoint const * RoutePointsLayout::GetRoutePoint(RouteMarkType type, size_t intermediateIndex) const
 {
   for (auto markId : m_manager.GetUserMarkIds(UserMark::Type::ROUTING))

map/routing_mark.hpp

@@ -97,7 +97,7 @@ public:
                       RouteMarkType destType, size_t destIntermediateIndex);
   void PassRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
   void SetFollowingMode(bool enabled);
-
+  void RemovePassedPoints();
 private:
   using TRoutePointCallback = std::function<void (RouteMarkPoint * mark)>;
   void ForEachIntermediatePoint(TRoutePointCallback const & fn);