Refactoring of maps update after downloading:

- Delay maps deleting and updating if mwm is busy;
- Fix bugs with different mwm maps status;
- Add better function for country bounds;
- Simplify Storage logic;

1 files changed, 83 insertions, 0 deletions

diff --git a/indexer/index.cpp b/indexer/index.cpp
index 42536b6d75..69de20d718 100644
--- a/indexer/index.cpp
+++ b/indexer/index.cpp
@@ -3,6 +3,8 @@
 
 #include "../platform/platform.hpp"
 
+#include "../coding/internal/file_data.hpp"
+
 
 MwmValue::MwmValue(string const & name)
   : m_cont(GetPlatform().GetReader(name)), m_name(name)
@@ -37,3 +39,84 @@ Index::~Index()
 {
   Cleanup();
 }
+
+namespace
+{
+  void DeleteMapFiles(string const & path, bool deleteReady)
+  {
+    (void)my::DeleteFileX(path);
+    (void)my::DeleteFileX(path + RESUME_FILE_EXTENSION);
+    (void)my::DeleteFileX(path + DOWNLOADING_FILE_EXTENSION);
+
+    if (deleteReady)
+      (void)my::DeleteFileX(path + READY_FILE_EXTENSION);
+  }
+
+  string GetFullPath(string const & fileName)
+  {
+    return GetPlatform().WritablePathForFile(fileName);
+  }
+
+  void ReplaceFileWithReady(string const & fileName)
+  {
+    string const path = GetFullPath(fileName);
+    DeleteMapFiles(path, false);
+    CHECK ( my::RenameFileX(path + READY_FILE_EXTENSION, path), (path) );
+  }
+}
+
+bool Index::DeleteMap(string const & fileName)
+{
+  threads::MutexGuard mutexGuard(m_lock);
+  UNUSED_VALUE(mutexGuard);
+
+  if (!RemoveImpl(fileName))
+    return false;
+
+  DeleteMapFiles(GetFullPath(fileName), true);
+  return true;
+}
+
+bool Index::UpdateMap(string const & fileName, m2::RectD & rect)
+{
+  threads::MutexGuard mutexGuard(m_lock);
+  UNUSED_VALUE(mutexGuard);
+
+  MwmId const id = GetIdByName(fileName);
+  if (id != INVALID_MWM_ID)
+  {
+    m_info[id].m_status = MwmInfo::STATUS_UPDATE;
+    return false;
+  }
+
+  ReplaceFileWithReady(fileName);
+
+  (void)AddImpl(fileName, rect);
+  return true;
+}
+
+void Index::UpdateMwmInfo(MwmId id)
+{
+  switch (m_info[id].m_status)
+  {
+  case MwmInfo::STATUS_TO_REMOVE:
+    if (m_info[id].m_lockCount == 0)
+    {
+      DeleteMapFiles(m_name[id], true);
+
+      CHECK(RemoveImpl(id), ());
+    }
+    break;
+
+  case MwmInfo::STATUS_UPDATE:
+    if (m_info[id].m_lockCount == 0)
+    {
+      ClearCache(id);
+
+      ReplaceFileWithReady(m_name[id]);
+
+      m_info[id].m_status = MwmInfo::STATUS_ACTIVE;
+    }
+    break;
+  }
+}