gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[new downloader] Storage. Implementation ForEachInSubtree method which calls a function for each node in a subtree with a defined parent.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-02-09 08:16:53 +03:00 • committed by Sergey Yershov
parent df5259cc8c
commit 590fd5031c
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
storage/storage.cpp
View file

@ -1145,4 +1145,19 @@ void Storage::DoClickOnDownloadMap(TCountryId const & countryId)
if (m_downloadMapOnTheMap)
m_downloadMapOnTheMap(countryId);
}
void Storage::ForEachInSubtree(TCountryId const & parent, TForEachFunction && forEach) const
{
TCountriesContainer const * parentNode = m_countries.Find(Country(parent));
if (parentNode == nullptr)
{
ASSERT(false, ("TCountryId =", parent, "not found in m_countries."));
return;
}
parentNode->ForEachInSubtree([&forEach](TCountriesContainer const & countryContainer)
{
Country const & value = countryContainer.Value();
forEach(value.Name(), value.GetSubtreeMwmCounter() != 1 /* It's a leaf. */);
});
}
} // namespace storage

7
storage/storage.hpp
View file

@ -25,7 +25,8 @@ struct NodeAttrs
m_downloadingMwmSize(0), m_downloadingProgress(0),
m_status(NodeStatus::Undefined), m_error(NodeErrorCode::NoError) {}
/// If the node is expandable (a big country) |m_mwmCounter| is number of mwm files (leaves)
/// belongs to the node. If the node isn't expandable |m_mapsDownloaded| == 1.
/// belongs to the node. If the node isn't expandable |m_mwmCounter| == 1.
/// Note. For every expandable node |m_mwmCounter| >= 2.
uint32_t m_mwmCounter;
/// Number of mwms belonging to the node which has been donwloaded.
@ -75,6 +76,7 @@ public:
using TUpdate = function<void(platform::LocalCountryFile const &)>;
using TChangeCountryFunction = function<void(TCountryId const &)>;
using TProgressFunction = function<void(TCountryId const &, TLocalAndRemoteSize const &)>;
using TForEachFunction = function<void(TCountryId const & /* descendantCountryId */, bool /* expandableNode */)>;
private:
/// We support only one simultaneous request at the moment
@ -230,6 +232,9 @@ public:
/// a list of available maps. They are all available countries expect for fully downloaded
/// countries. That means all mwm of the countries have been downloaded.
void GetCountyListToDownload(TCountriesVec & countryList) const;
/// \brief Calls |forEach| for each node for subtree with parent == |parent|.
/// For example GetAllLeavesInSubtree(GetRootId()) calls |forEach| for every node including the root.
void ForEachInSubtree(TCountryId const & parent, TForEachFunction && forEach) const;
/// \brief Returns current version for mwms which are available on the server.
inline int64_t GetCurrentDataVersion() const { return m_currentVersion; }