Remove the "my position" route mark before inserting of another "my position" mark.beta-986

3 files changed, 19 insertions, 0 deletions

diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index f8d52fd255..72abae8360 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -590,6 +590,13 @@ void RoutingManager::AddRoutePoint(RouteMarkData && markData)
   if (markData.m_pointType == RouteMarkType::Start || markData.m_pointType == RouteMarkType::Finish)
     routePoints.RemoveRoutePoint(markData.m_pointType);
 
+  if (markData.m_isMyPosition)
+  {
+    RouteMarkPoint * mark = routePoints.GetMyPositionPoint();
+    if (mark != nullptr)
+      routePoints.RemoveRoutePoint(mark->GetRoutePointType(), mark->GetIntermediateIndex());
+  }
+
   markData.m_isVisible = !markData.m_isMyPosition;
   routePoints.AddRoutePoint(move(markData));
   ReorderIntermediatePoints();
diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
index 9550167279..128d2bb171 100644
--- a/map/routing_mark.cpp
+++ b/map/routing_mark.cpp
@@ -305,6 +305,17 @@ RouteMarkPoint * RoutePointsLayout::GetRoutePoint(RouteMarkType type, size_t int
   return nullptr;
 }
 
+RouteMarkPoint * RoutePointsLayout::GetMyPositionPoint()
+{
+  for (size_t i = 0, sz = m_routeMarks.GetUserMarkCount(); i < sz; ++i)
+  {
+    RouteMarkPoint * mark = GetRouteMarkForEdit(i);
+    if (mark->IsMyPosition())
+      return mark;
+  }
+  return nullptr;
+}
+
 std::vector<RouteMarkPoint *> RoutePointsLayout::GetRoutePoints()
 {
   std::vector<RouteMarkPoint *> points;
diff --git a/map/routing_mark.hpp b/map/routing_mark.hpp
index 40e05b116c..9d14f78e1e 100644
--- a/map/routing_mark.hpp
+++ b/map/routing_mark.hpp
@@ -88,6 +88,7 @@ public:
 
   RouteMarkPoint * AddRoutePoint(RouteMarkData && data);
   RouteMarkPoint * GetRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
+  RouteMarkPoint * GetMyPositionPoint();
   std::vector<RouteMarkPoint *> GetRoutePoints();
   size_t GetRoutePointsCount() const;
   bool RemoveRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);