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

[new downloader] Added reduced migration ability.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-02-18 12:53:41 +03:00 • committed by Sergey Yershov
parent 5dd8262dbc
commit e85947e862
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/framework.cpp
View file

@ -240,7 +240,7 @@ bool Framework::IsEnoughSpaceForMigrate() const
return GetPlatform().GetWritableStorageStatus(kSpaceSize) == Platform::TStorageStatus::STORAGE_OK;
}
void Framework::PreMigrate(ms::LatLon const & position,
bool Framework::PreMigrate(ms::LatLon const & position,
storage::Storage::TChangeCountryFunction const & change,
storage::Storage::TProgressFunction const & progress)
{
@ -251,11 +251,15 @@ void Framework::PreMigrate(ms::LatLon const & position,
TCountryId currentCountryId = infoGetter.GetRegionCountryId(MercatorBounds::FromLatLon(position));
if (currentCountryId == kInvalidCountryId)
return false;
Storage().m_prefetchStorage->Subscribe(change, progress);
Storage().m_prefetchStorage->DownloadNode(currentCountryId);
return true;
}
void Framework::Migrate()
void Framework::Migrate(bool keepDownloaded)
{
m_searchEngine.reset();
m_infoGetter.reset();
@ -263,7 +267,7 @@ void Framework::Migrate()
Storage().DeleteAllLocalMaps(&existedCountries);
DeregisterAllMaps();
m_model.Clear();
Storage().Migrate(existedCountries);
Storage().Migrate(keepDownloaded ? existedCountries : TCountriesVec());
InitCountryInfoGetter();
InitSearchEngine();
RegisterAllMaps();

4
map/framework.hpp
View file

@ -144,9 +144,9 @@ public:
/// Migrate to new version of very different data.
bool IsEnoughSpaceForMigrate() const;
void PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & change,
bool PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & change,
storage::Storage::TProgressFunction const & progress);
void Migrate();
void Migrate(bool keepDownloaded = true);
void InitWatchFrameRenderer(float visualScale);