From c696d010e4ab18bbacb9c8beeb44fecc36b715d1 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Thu, 18 Feb 2016 12:03:08 +0300
Subject: [PATCH] [new downloader] Code cleanup

---
 map/framework.cpp | 42 ------------------------------------------
 map/framework.hpp | 12 ------------
 2 files changed, 54 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index af44b8d332..2bda4bdaa9 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -443,48 +443,6 @@ bool Framework::IsWatchFrameRendererInited() const
   return m_cpuDrawer != nullptr;
 }
 
-void Framework::DeleteCountry(storage::TCountryId const & index, MapOptions opt)
-{
-  switch (opt)
-  {
-    case MapOptions::Nothing:
-      return;
-    case MapOptions::Map:  // fall through
-    case MapOptions::MapWithCarRouting:
-    {
-      CountryFile const & countryFile = m_storage.GetCountryFile(index);
-      // m_model will notify us when latest map file will be deleted via
-      // OnMapDeregistered call.
-      if (m_model.DeregisterMap(countryFile))
-        InvalidateRect(GetCountryBounds(countryFile.GetName()));
-
-      // TODO (@ldragunov, @gorshenin): rewrite routing session to use MwmHandles. Thus,
-      // it won' be needed to reset it after maps update.
-      m_routingSession.Reset();
-      return;
-    }
-    case MapOptions::CarRouting:
-      m_routingSession.Reset();
-      m_storage.DeleteCountry(index, opt);
-      return;
-  }
-}
-
-void Framework::DownloadCountry(storage::TCountryId const & index, MapOptions opt)
-{
-  m_storage.DownloadCountry(index, opt);
-}
-
-Status Framework::GetCountryStatus(storage::TCountryId const & index) const
-{
-  return m_storage.CountryStatusEx(index);
-}
-
-string Framework::GetCountryName(storage::TCountryId const & countryId) const
-{
-  return countryId;
-}
-
 m2::RectD Framework::GetCountryBounds(storage::TCountryId const & countryId) const
 {
   CountryFile const & file = m_storage.GetCountryFile(countryId);
diff --git a/map/framework.hpp b/map/framework.hpp
index 3b5bbbf0e2..cb358f7571 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -179,18 +179,6 @@ public:
       platform::LocalCountryFile const & localFile);
   //@}
 
-  /// Deletes all disk files corresponding to country.
-  ///
-  /// @name This functions is used by Downloader UI.
-  //@{
-  /// options - flags that signal about parts of map that must be deleted
-  void DeleteCountry(storage::TCountryId const & index, MapOptions opt);
-  /// options - flags that signal about parts of map that must be downloaded
-  void DownloadCountry(storage::TCountryId const & index, MapOptions opt);
-
-  storage::Status GetCountryStatus(storage::TCountryId const & index) const;
-  string GetCountryName(storage::TCountryId const & index) const;
-
   /// Get country rect from borders (not from mwm file).
   /// @param[in] file Pass country file name without extension as an id.
   m2::RectD GetCountryBounds(storage::TCountryId const & countryId) const;