From b0af73a13f7f1b8f819ae5692128c12a43637c92 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Fri, 9 Jun 2017 21:53:41 +0300
Subject: [PATCH] [iOS] Fixed point selection in new p2p mode

---
 iphone/Maps/Core/Routing/MWMRouter.mm | 10 ++++++++--
 map/routing_manager.cpp               |  8 ++++++++
 map/routing_manager.hpp               |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index 1bb05e3faa..99254a2b3e 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -165,6 +165,7 @@ m2::PointD getMercator(MWMRoutePoint * p)
   auto points = rm.GetRoutePoints();
   if (points.empty())
   {
+    // No more than 1 point exist.
     if (type == RouteMarkType::Start)
       self.startPoint = zeroRoutePoint();
     else if (type == RouteMarkType::Finish)
@@ -172,8 +173,13 @@ m2::PointD getMercator(MWMRoutePoint * p)
   }
   else
   {
-    self.startPoint = routePoint(points.front());
-    self.finishPoint = routePoint(points.back());
+    // At least 2 points exist, one of them may (or may not) be my position.
+    self.startPoint = rm.IsMyPosition(RouteMarkType::Start) ?
+                                      routePoint(points.front()) :
+                                      routePoint(points.front(), nil);
+    self.finishPoint = rm.IsMyPosition(RouteMarkType::Finish) ?
+                                       routePoint(points.back()) :
+                                       routePoint(points.back(), nil);
   }
 }
 
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 1b51dab79d..49c8cbbfc1 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -314,6 +314,14 @@ void RoutingManager::HideRoutePoint(RouteMarkType type, int8_t intermediateIndex
   }
 }
 
+bool RoutingManager::IsMyPosition(RouteMarkType type, int8_t intermediateIndex)
+{
+  UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
+  RoutePointsLayout routePoints(guard.m_controller);
+  RouteMarkPoint * mark = routePoints.GetRoutePoint(type, intermediateIndex);
+  return mark != nullptr ? mark->IsMyPosition() : false;
+}
+
 std::vector<m2::PointD> RoutingManager::GetRoutePoints() const
 {
   std::vector<m2::PointD> result;
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index 4f5bb6e5bf..1bdb42e991 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -161,6 +161,7 @@ public:
                       RouteMarkType targetType, int8_t targetIntermediateIndex);
   void HideRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
   bool CouldAddIntermediatePoint() const;
+  bool IsMyPosition(RouteMarkType type, int8_t intermediateIndex = 0);
 
   void SetRouterImpl(routing::RouterType type);
   void RemoveRoute(bool deactivateFollowing);