kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[new downloader] Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-03-29 13:42:01 +03:00 • committed by Alex Zolotarev
parent 2db3250f9b
commit 575fd8065b
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
storage/storage.cpp
View file

@ -1167,18 +1167,19 @@ void Storage::GetChildrenInGroups(TCountryId const & parent,
}
});
sort(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end());
TCountriesVec uniqueDisputed(disputedTerritoriesWithoutSiblings.begin(),
unique(disputedTerritoriesWithoutSiblings.begin(),
disputedTerritoriesWithoutSiblings.end()));
for (auto const & countryId : uniqueDisputed)
{
// Checking if the number of disputed territories with |countryId| in subtree with root == |parent|
// is equel to the number of disputed territories with out downloaded sibling
// Checks that the number of disputed territories with |countryId| in subtree with root == |parent|
// is equal to the number of disputed territories with out downloaded sibling
// with |countryId| in subtree with root == |parent| .
if (count(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end(), countryId)
== count(allDisputedTerritories.begin(), allDisputedTerritories.end(), countryId))
{
// |countryId| is downloaded without any other map it its group.
// |countryId| is downloaded without any other map in its group.
downloadedChildren.push_back(countryId);
}
}
@ -1241,22 +1242,21 @@ StatusAndError Storage::GetNodeStatus(TCountryTreeNode const & node) const
return GetNodeStatusInfo(node, disputedTerritories);
}
bool Storage::IsDisputed(TCountryTreeNode const & node) const
{
vector<TCountryTreeNode const *> found;
m_countries.Find(node.Value().Name(), found);
return found.size() > 1;
}
StatusAndError Storage::GetNodeStatusInfo(TCountryTreeNode const & node,
vector<pair<TCountryId, NodeStatus>> & disputedTerritories) const
{
// Returns true if |node.Value().Name()| is a disputed territory and false otherwise.
auto checkIfDisputed = [this](TCountryTreeNode const & node)
{
vector<TCountryTreeNode const *> found;
m_countries.Find(node.Value().Name(), found);
return found.size() > 1;
};
// Leaf node status.
if (node.ChildrenCount() == 0)
{
StatusAndError const statusAndError = ParseStatus(CountryStatusEx(node.Value().Name()));
if (checkIfDisputed(node))
if (IsDisputed(node))
disputedTerritories.push_back(make_pair(node.Value().Name(), statusAndError.status));
return statusAndError;
}
@ -1268,7 +1268,7 @@ StatusAndError Storage::GetNodeStatusInfo(TCountryTreeNode const & node,
auto groupStatusCalculator = [&](TCountryTreeNode const & nodeInSubtree)
{
StatusAndError const statusAndError = ParseStatus(CountryStatusEx(nodeInSubtree.Value().Name()));
if (checkIfDisputed(nodeInSubtree))
if (IsDisputed(nodeInSubtree))
{
disputedTerritories.push_back(make_pair(nodeInSubtree.Value().Name(), statusAndError.status));
return;

2
storage/storage.hpp
View file

@ -590,6 +590,8 @@ private:
void CorrectJustDownloadedAndQueue(TQueue::iterator justDownloadedItem);
template <class ToDo>
void ForEachAncestorExceptForTheRoot(vector<TCountryTreeNode const *> const & nodes, ToDo && toDo) const;
/// Returns true if |node.Value().Name()| is a disputed territory and false otherwise.
bool IsDisputed(TCountryTreeNode const & node) const;
};
void GetQueuedCountries(Storage::TQueue const & queue, TCountriesSet & resultCountries);