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

Fixes #89

Browse source 
Downloader works correctly when countries dialog is closed
This commit is contained in:
Alex Zolotarev 2011-01-28 01:16:19 +02:00 • committed by Alex Zolotarev
parent 1a645c5859
commit 0a193f6121
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
storage/storage.cpp
View file

@ -241,6 +241,26 @@ namespace storage
m_observerChange(index);
}
void Storage::ReInitCountries(bool forceReload)
{
if (forceReload)
m_countries.Clear();
if (m_countries.SiblingsCount() == 0)
{
TTilesContainer tiles;
if (LoadTiles(tiles, GetPlatform().ReadPathForFile(UPDATE_CHECK_FILE), m_currentVersion))
{
if (!LoadCountries(GetPlatform().ReadPathForFile(COUNTRIES_FILE), tiles, m_countries))
LOG(LWARNING, ("Can't load countries file", COUNTRIES_FILE));
}
else
{
LOG(LWARNING, ("Can't load update file", UPDATE_CHECK_FILE));
}
}
}
void Storage::Subscribe(TObserverChangeCountryFunction change, TObserverProgressFunction progress,
TUpdateCheckFunction check)
{
@ -248,16 +268,7 @@ namespace storage
m_observerProgress = progress;
m_observerUpdateCheck = check;
TTilesContainer tiles;
if (LoadTiles(tiles, GetPlatform().ReadPathForFile(UPDATE_CHECK_FILE), m_currentVersion))
{
if (!LoadCountries(GetPlatform().ReadPathForFile(COUNTRIES_FILE), tiles, m_countries))
LOG(LWARNING, ("Can't load countries file", COUNTRIES_FILE));
}
else
{
LOG(LWARNING, ("Can't load update file", UPDATE_CHECK_FILE));
}
ReInitCountries(false);
}
void Storage::Unsubscribe()
@ -265,7 +276,6 @@ namespace storage
m_observerChange.clear();
m_observerProgress.clear();
m_observerUpdateCheck.clear();
m_countries.Clear();
}
string FileFromUrl(string const & url)

1
storage/storage.hpp
View file

@ -86,6 +86,7 @@ namespace storage
void DownloadNextCountryFromQueue();
Country const & CountryByIndex(TIndex const & index) const;
string UpdateBaseUrl() const;
void ReInitCountries(bool forceReload);
public:
Storage() {}