From 330391094cac982d61729c0563588cca8358e130 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Fri, 13 Jul 2018 14:13:37 +0300
Subject: [PATCH] Fixed handling of mwm deleting.

---
 map/framework.cpp              | 9 ++++-----
 map/local_ads_manager.cpp      | 3 +--
 map/local_ads_manager.hpp      | 2 +-
 map/transit/transit_reader.cpp | 1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index 120393d846..2852778a82 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -605,10 +605,13 @@ bool Framework::OnCountryFileDelete(storage::TCountryId const & countryId, stora
   bool deferredDelete = false;
   if (localFile)
   {
-    m_localAdsManager.OnDeleteCountry(countryId);
     rect = m_infoGetter->GetLimitRectForLeaf(countryId);
+    auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile->GetCountryFile());
     m_model.DeregisterMap(platform::CountryFile(countryId));
     deferredDelete = true;
+    m_localAdsManager.OnMwmDeregistered(mwmId);
+    m_transitManager.OnMwmDeregistered(mwmId);
+    m_trafficManager.OnMwmDeregistered(mwmId);
   }
   InvalidateRect(rect);
 
@@ -629,10 +632,6 @@ void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
     action();
   else
     GetPlatform().RunTask(Platform::Thread::Gui, action);
-
-  auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile.GetCountryFile());
-  m_trafficManager.OnMwmDeregistered(mwmId);
-  m_transitManager.OnMwmDeregistered(mwmId);
 }
 
 bool Framework::HasUnsavedEdits(storage::TCountryId const & countryId)
diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp
index 900ddb497b..070b491b57 100644
--- a/map/local_ads_manager.cpp
+++ b/map/local_ads_manager.cpp
@@ -505,9 +505,8 @@ void LocalAdsManager::OnDownloadCountry(std::string const & countryName)
   });
 }
 
-void LocalAdsManager::OnDeleteCountry(std::string const & countryName)
+void LocalAdsManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
 {
-  auto const mwmId = m_getMwmIdByNameFn(countryName);
   GetPlatform().RunTask(Platform::Thread::File, [this, mwmId]
   {
     ProcessRequests({std::make_pair(mwmId, RequestType::Delete)});
diff --git a/map/local_ads_manager.hpp b/map/local_ads_manager.hpp
index c65aa56e76..3ff9ca80e4 100644
--- a/map/local_ads_manager.hpp
+++ b/map/local_ads_manager.hpp
@@ -52,7 +52,7 @@ public:
   void UpdateViewport(ScreenBase const & screen);
 
   void OnDownloadCountry(std::string const & countryName);
-  void OnDeleteCountry(std::string const & countryName);
+  void OnMwmDeregistered(MwmSet::MwmId const & mwmId);
 
   void Invalidate();
 
diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp
index 98ee6d40ec..79b5a5a25b 100644
--- a/map/transit/transit_reader.cpp
+++ b/map/transit/transit_reader.cpp
@@ -311,7 +311,6 @@ void TransitReadManager::ClearCache(MwmSet::MwmId const & mwmId)
 void TransitReadManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
 {
   ClearCache(mwmId);
-  Invalidate();
 }
 
 void TransitReadManager::Invalidate()