Fixed problem with disputed countries status.

2 files changed, 10 insertions, 5 deletions

diff --git a/storage/storage.cpp b/storage/storage.cpp
index 69d900493b..515b0ce6dc 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -1196,7 +1196,9 @@ void Storage::GetChildrenInGroups(TCountryId const & parent, TCountriesVec & dow
   TCountriesVec allDisputedTerritories;
   parentNode->ForEachChild([&](TCountryTreeNode const & childNode) {
     vector<pair<TCountryId, NodeStatus>> disputedTerritoriesAndStatus;
-    StatusAndError const childStatus = GetNodeStatusInfo(childNode, disputedTerritoriesAndStatus);
+    StatusAndError const childStatus = GetNodeStatusInfo(childNode,
+                                                         disputedTerritoriesAndStatus,
+                                                         true /* isDisputedTerritoriesCounted */);
 
     TCountryId const & childValue = childNode.Value().Name();
     ASSERT_NOT_EQUAL(childStatus.status, NodeStatus::Undefined, ());
@@ -1298,7 +1300,7 @@ void Storage::DeleteNode(TCountryId const & countryId)
 StatusAndError Storage::GetNodeStatus(TCountryTreeNode const & node) const
 {
   vector<pair<TCountryId, NodeStatus>> disputedTerritories;
-  return GetNodeStatusInfo(node, disputedTerritories);
+  return GetNodeStatusInfo(node, disputedTerritories, false /* isDisputedTerritoriesCounted */);
 }
 
 bool Storage::IsDisputed(TCountryTreeNode const & node) const
@@ -1309,7 +1311,8 @@ bool Storage::IsDisputed(TCountryTreeNode const & node) const
 }
 
 StatusAndError Storage::GetNodeStatusInfo(
-    TCountryTreeNode const & node, vector<pair<TCountryId, NodeStatus>> & disputedTerritories) const
+    TCountryTreeNode const & node, vector<pair<TCountryId, NodeStatus>> & disputedTerritories,
+                                          bool isDisputedTerritoriesCounted) const
 {
   // Leaf node status.
   if (node.ChildrenCount() == 0)
@@ -1327,7 +1330,8 @@ StatusAndError Storage::GetNodeStatusInfo(
   auto groupStatusCalculator = [&](TCountryTreeNode const & nodeInSubtree) {
     StatusAndError const statusAndError =
         ParseStatus(CountryStatusEx(nodeInSubtree.Value().Name()));
-    if (IsDisputed(nodeInSubtree))
+
+    if (IsDisputed(nodeInSubtree) && isDisputedTerritoriesCounted)
     {
       disputedTerritories.push_back(make_pair(nodeInSubtree.Value().Name(), statusAndError.status));
       return;
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 1a96a2a171..57e9c8a92f 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -607,7 +607,8 @@ private:
   /// Returns status for a node (group node or not).
   /// Fills |disputedTeritories| with all disputed teritories in subtree with the root == |node|.
   StatusAndError GetNodeStatusInfo(TCountryTreeNode const & node,
-                                   vector<pair<TCountryId, NodeStatus>> & disputedTeritories) const;
+                                   vector<pair<TCountryId, NodeStatus>> & disputedTeritories,
+                                   bool isDisputedTerritoriesCounted) const;
 
   void NotifyStatusChanged(TCountryId const & countryId);
   void NotifyStatusChangedForHierarchy(TCountryId const & countryId);