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

[new downloader] Prefetch and fast migrate support

Browse source
This commit is contained in:
Sergey Yershov 2016-02-03 13:41:34 +03:00
parent f5d0c3b12e
commit f3ef627d45
5 changed files with 62 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
map/framework.cpp
View file

@ -236,15 +236,30 @@ void Framework::StopLocationFollow()
CallDrapeFunction(bind(&df::DrapeEngine::StopLocationFollow, _1));
}
void Framework::PreMigrate(ms::LatLon const & position,
storage::Storage::TChangeCountryFunction const & change,
storage::Storage::TProgressFunction const & progress)
{
Storage().PrefetchMigrateData();
storage::CountryInfoReader infoGetter(GetPlatform().GetReader(PACKED_POLYGONS_MIGRATE_FILE),
GetPlatform().GetReader(COUNTRIES_MIGRATE_FILE));
TCountryId currentCountryId = infoGetter.GetRegionCountryId(MercatorBounds::FromLatLon(position));
Storage().m_prefetchStorage->Subscribe(change, progress);
Storage().m_prefetchStorage->DownloadNode(currentCountryId);
}
void Framework::Migrate()
{
m_searchEngine.reset();
m_infoGetter.reset();
Storage().DeleteAllLocalMaps();
TCountriesVec existedCountries;
Storage().DeleteAllLocalMaps(&existedCountries);
DeregisterAllMaps();
m_model.Clear();
// @TODO(syershov) Implement it correctly please.
// Storage().Migrate();
Storage().Migrate(existedCountries);
InitCountryInfoGetter();
InitSearchEngine();
RegisterAllMaps();
@ -522,12 +537,11 @@ void Framework::RegisterAllMaps()
{
bool disableFastMigrate = false;
Settings::Get("DisableFastMigrate", disableFastMigrate);
// @TODO(syershov) Implement it correctly please.
// if (!disableFastMigrate && !m_storage.HaveDownloadedCountries())
// {
// Migrate();
// return;
// }
if (!disableFastMigrate && !m_storage.HaveDownloadedCountries())
{
Migrate();
return;
}
}
int minFormat = numeric_limits<int>::max();

3
map/framework.hpp
View file

@ -150,6 +150,9 @@ public:
Framework();
virtual ~Framework();
/// Migrate to new version of very different data.
void PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & change,
storage::Storage::TProgressFunction const & progress);
void Migrate();
void InitWatchFrameRenderer(float visualScale);

21
qt/search_panel.cpp
View file

@ -217,8 +217,27 @@ bool SearchPanel::TryMigrate(QString const & str)
m_pEditor->setText("");
parentWidget()->hide();
m_pDrawWidget->GetFramework().Migrate();
auto stateChanged = [&](storage::TCountryId const & id)
{
storage::TStatus const nextStatus = m_pDrawWidget->GetFramework().Storage().m_prefetchStorage->CountryStatusEx(id);
LOG_SHORT(LINFO, (id, "status :", nextStatus));
if (nextStatus == storage::TStatus::EOnDisk)
{
LOG_SHORT(LINFO, ("Prefetch done. Ready to migrate."));
m_pDrawWidget->GetFramework().Migrate();
}
};
auto progressChanged = [](storage::TCountryId const & id, storage::LocalAndRemoteSizeT const & sz)
{
LOG(LINFO, (id, "downloading progress:", sz));
};
ms::LatLon curPos(55.7, 37.7);
m_pDrawWidget->GetFramework().PreMigrate(curPos, stateChanged, progressChanged);
return true;
}
void SearchPanel::OnSearchTextChanged(QString const & str)

5
storage/storage.cpp
View file

@ -123,6 +123,11 @@ void Storage::DeleteAllLocalMaps(TCountriesVec * existedCountries /* = nullptr *
}
}
bool Storage::HaveDownloadedCountries() const
{
return !m_localFiles.empty();
}
void Storage::PrefetchMigrateData()
{
m_prefetchStorage.reset(new Storage(COUNTRIES_MIGRATE_FILE, "migrate"));

16
storage/storage.hpp
View file

@ -208,11 +208,6 @@ public:
TOnStatusChangedCallback m_onStatusChanged;
};
unique_ptr<Storage> m_prefetchStorage;
void PrefetchMigrateData();
void SaveDownloadQueue();
void RestoreDownloadQueue();
/// \brief Returns root country id of the county tree.
TCountryId const GetRootId() const;
/// \param childrenId is filled with children node ids by a parent. For example GetChildren(GetRootId())
@ -303,6 +298,17 @@ public:
void Init(TUpdate const & update);
/// Do we have downloaded countries
bool HaveDownloadedCountries() const;
/// Prefetch MWMs before migrate
unique_ptr<Storage> m_prefetchStorage;
void PrefetchMigrateData();
void SaveDownloadQueue();
void RestoreDownloadQueue();
/// Delete local maps and aggregate their Id if needed
void DeleteAllLocalMaps(TCountriesVec * existedCountries = nullptr);