From 320392c89e56adebe6dbf079fe7362932c0bb2d4 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Wed, 16 Mar 2016 13:22:22 +0300
Subject: [PATCH] [new downloader] Fixing Storage::CancelDownloadNode and
 Storage::RetryDownloadNode

---
 storage/storage.cpp | 10 +++++-----
 storage/storage.hpp | 17 +++++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/storage/storage.cpp b/storage/storage.cpp
index 3c3e573b99..11b9c94561 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -1210,7 +1210,7 @@ void Storage::DownloadNode(TCountryId const & countryId)
 
   auto downloadAction = [this](TCountryTreeNode const & descendantNode)
   {
-    if (descendantNode.ChildrenCount() == 0)
+    if (descendantNode.ChildrenCount() == 0 && GetNodeStatus(descendantNode).status != NodeStatus::OnDisk)
       this->DownloadCountry(descendantNode.Value().Name(), MapOptions::MapWithCarRouting);
   };
 
@@ -1408,8 +1408,8 @@ void Storage::CancelDownloadNode(TCountryId const & countryId)
 {
   ForEachInSubtreeAndInQueue(countryId, [this](TCountryId const & descendantId, bool groupNode)
   {
-    ASSERT(!groupNode, ());
-    DeleteNode(descendantId);
+    ASSERT(!groupNode, ("A group node is located in downloading queue."));
+    DeleteFromDownloader(descendantId);
   });
   SaveDownloadQueue();
 }
@@ -1418,8 +1418,8 @@ void Storage::RetryDownloadNode(TCountryId const & countryId)
 {
   ForEachInSubtree(countryId, [this](TCountryId const & descendantId, bool groupNode)
   {
-    ASSERT(!groupNode, ());
-    DownloadNode(descendantId);
+    if (!groupNode && m_failedCountries.count(descendantId) != 0)
+      DownloadNode(descendantId);
   });
 }
 
diff --git a/storage/storage.hpp b/storage/storage.hpp
index cf15258deb..42cd918d8e 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -317,7 +317,7 @@ public:
 
   /// \brief Downloads one node (expandable or not) by countryId.
   /// If node is expandable downloads all children (grandchildren) by the node
-  /// until they havn't been downloaded before. Update all downloaded mwm if it's necessary.
+  /// until they havn't been downloaded before. Update downloaded mwm if it's necessary.
   void DownloadNode(TCountryId const & countryId);
 
   /// \brief Delete node with all children (expandable or not).
@@ -328,15 +328,20 @@ public:
   /// borders or hierarchy just call UpdateNode(GetRootId()).
   void UpdateNode(TCountryId const & countryId);
 
-  /// \brief If the downloading is in process cancels downloading a node and deletes
-  /// downloaded part of the map. If the map is in queue, remove the map from the queue.
-  /// It works for leaf and for group mwms.
+  /// \brief If the downloading a new node is in process cancels downloading the node and deletes
+  /// the downloaded part of the map. If the map is in queue, remove the map from the queue.
+  /// If the downloading a updating map is in process cancels the downloading,
+  /// deletes the downloaded part of the map and leaves as is the old map (before the update)
+  /// had been downloaded. It works for leaf and for group mwms.
   void CancelDownloadNode(TCountryId const & countryId);
 
-  /// \brief Downloading process could be interupted because of bad internet connection.
+  /// \brief Downloading process could be interupted because of bad internet connection
+  /// and some other reason.
   /// In that case user could want to recover it. This method is done for it.
   /// This method works with leaf and group mwm.
-  /// In case of group mwm this method retries downloading ...
+  /// In case of a group mwm this method retries downloading all mwm in m_failedCountries list
+  /// which in the subtree with root |countryId|.
+  /// It means the call RetryDownloadNode(GetRootId()) retries all the failed mwms.
   void RetryDownloadNode(TCountryId const & countryId);
 
   /// \brief Get information for mwm update button.