From 84f6b9b0a8951e468040bb2c8b01db363c5f4d04 Mon Sep 17 00:00:00 2001
From: Roman Kuznetsov <r.kuznetsow@gmail.com>
Date: Sun, 16 Jul 2017 10:37:40 +0300
Subject: [PATCH] Fixed crash on location update before drape engine creation

---
 map/routing_manager.cpp | 25 +++++++++++++++++++++----
 map/routing_manager.hpp |  3 +++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 2ffae24114..ed80ccc777 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -644,20 +644,37 @@ void RoutingManager::MatchLocationToRoute(location::GpsInfo & location,
 
 void RoutingManager::OnLocationUpdate(location::GpsInfo & info)
 {
-  location::RouteMatchingInfo routeMatchingInfo;
-  CheckLocationForRouting(info);
+  if (m_drapeEngine == nullptr)
+    m_gpsInfoCache = my::make_unique<location::GpsInfo>(info);
 
-  MatchLocationToRoute(info, routeMatchingInfo);
+  auto routeMatchingInfo = GetRouteMatchingInfo(info);
 
-  m_drapeEngine->SetGpsInfo(info, m_routingSession.IsNavigable(), routeMatchingInfo);
+  if (m_drapeEngine != nullptr)
+    m_drapeEngine->SetGpsInfo(info, m_routingSession.IsNavigable(), routeMatchingInfo);
   if (IsTrackingReporterEnabled())
     m_trackingReporter.AddLocation(info, m_routingSession.MatchTraffic(routeMatchingInfo));
 }
 
+location::RouteMatchingInfo RoutingManager::GetRouteMatchingInfo(location::GpsInfo & info)
+{
+  location::RouteMatchingInfo routeMatchingInfo;
+  CheckLocationForRouting(info);
+  MatchLocationToRoute(info, routeMatchingInfo);
+  return routeMatchingInfo;
+}
+
 void RoutingManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine, bool is3dAllowed)
 {
   m_drapeEngine = engine;
 
+  // Apply gps info which was set before drape engine creation.
+  if (m_gpsInfoCache != nullptr)
+  {
+    auto routeMatchingInfo = GetRouteMatchingInfo(*m_gpsInfoCache);
+    m_drapeEngine->SetGpsInfo(*m_gpsInfoCache, m_routingSession.IsNavigable(), routeMatchingInfo);
+    m_gpsInfoCache.reset();
+  }
+
   // In case of the engine reinitialization recover route.
   if (IsRoutingActive())
   {
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index 56e57c3175..7bef0a7146 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -220,6 +220,7 @@ private:
   bool IsTrackingReporterEnabled() const;
   void MatchLocationToRoute(location::GpsInfo & info,
                             location::RouteMatchingInfo & routeMatchingInfo) const;
+  location::RouteMatchingInfo GetRouteMatchingInfo(location::GpsInfo & info);
 
   RouteBuildingCallback m_routingCallback = nullptr;
   Callbacks m_callbacks;
@@ -233,5 +234,7 @@ private:
   std::vector<dp::DrapeID> m_drapeSubroutes;
   std::mutex m_drapeSubroutesMutex;
 
+  std::unique_ptr<location::GpsInfo> m_gpsInfoCache;
+
   DECLARE_THREAD_CHECKER(m_threadChecker);
 };