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

[editor] disable editing during download maps

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-11-30 13:09:30 +03:00 • committed by Vlad Mihaylenko
parent 564670a25e
commit 8ea130aefe
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
map/framework.cpp
View file

@ -453,6 +453,7 @@ Framework::Framework(FrameworkParams const & params)
bind(&Framework::OnCountryFileDownloaded, this, _1, _2),
bind(&Framework::OnCountryFileDelete, this, _1, _2));
m_storage.SetDownloadingPolicy(&m_storageDownloadingPolicy);
m_storage.SetStartDownloadingCallback([this]() { UpdatePlacePageInfoForCurrentSelection(); });
LOG(LDEBUG, ("Storage initialized"));
// Local ads manager should be initialized after storage initialization.
@ -2829,7 +2830,10 @@ void SetHostingBuildingAddress(FeatureID const & hostingBuildingFid, Index const
}
} // namespace
bool Framework::CanEditMap() const { return version::IsSingleMwm(GetCurrentDataVersion()); }
bool Framework::CanEditMap() const
{
return version::IsSingleMwm(GetCurrentDataVersion()) && !GetStorage().IsDownloadInProgress();
}
bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const featureType,
osm::EditableMapObject & emo) const

13
storage/storage.cpp
View file

@ -497,9 +497,15 @@ void Storage::DownloadCountry(TCountryId const & countryId, MapOptions opt)
m_failedCountries.erase(countryId);
m_queue.push_back(QueuedCountry(countryId, opt));
if (m_queue.size() == 1)
{
if (m_startDownloadingCallback)
m_startDownloadingCallback();
DownloadNextCountryFromQueue();
}
else
{
NotifyStatusChangedForHierarchy(countryId);
}
SaveDownloadQueue();
}
@ -1440,6 +1446,13 @@ bool Storage::IsPossibleToAutoupdate() const
return m_diffManager.IsPossibleToAutoupdate();
}
void Storage::SetStartDownloadingCallback(StartDownloadingCallback const & cb)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
m_startDownloadingCallback = cb;
}
void Storage::OnDiffStatusReceived(diffs::Status const status)
{
if (status != diffs::Status::NotAvailable)

5
storage/storage.hpp
View file

@ -141,6 +141,7 @@ class Storage : public diffs::Manager::Observer
{
public:
struct StatusCallback;
using StartDownloadingCallback = function<void()>;
using TUpdateCallback = function<void(storage::TCountryId const &, TLocalFilePtr const)>;
using TDeleteCallback = function<bool(storage::TCountryId const &, TLocalFilePtr const)>;
using TChangeCountryFunction = function<void(TCountryId const &)>;
@ -251,6 +252,8 @@ private:
vector<vector<string>> m_deferredDownloads;
StartDownloadingCallback m_startDownloadingCallback;
void DownloadNextCountryFromQueue();
void LoadCountriesFile(string const & pathToCountriesFile, string const & dataDir,
@ -557,6 +560,8 @@ public:
/// diffs.
bool IsPossibleToAutoupdate() const;
void SetStartDownloadingCallback(StartDownloadingCallback const & cb);
private:
friend struct UnitClass_StorageTest_DeleteCountry;
friend struct UnitClass_TwoComponentStorageTest_DeleteCountry;