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

Fixed handling of mwm deleting.

Browse source
This commit is contained in:
Daria Volvenkova 2018-07-13 14:13:37 +03:00 • committed by Vlad Mihaylenko
parent 3586f9bc86
commit 330391094c
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -605,10 +605,13 @@ bool Framework::OnCountryFileDelete(storage::TCountryId const & countryId, stora
bool deferredDelete = false;
if (localFile)
{
m_localAdsManager.OnDeleteCountry(countryId);
rect = m_infoGetter->GetLimitRectForLeaf(countryId);
auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile->GetCountryFile());
m_model.DeregisterMap(platform::CountryFile(countryId));
deferredDelete = true;
m_localAdsManager.OnMwmDeregistered(mwmId);
m_transitManager.OnMwmDeregistered(mwmId);
m_trafficManager.OnMwmDeregistered(mwmId);
}
InvalidateRect(rect);
@ -629,10 +632,6 @@ void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
action();
else
GetPlatform().RunTask(Platform::Thread::Gui, action);
auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile.GetCountryFile());
m_trafficManager.OnMwmDeregistered(mwmId);
m_transitManager.OnMwmDeregistered(mwmId);
}
bool Framework::HasUnsavedEdits(storage::TCountryId const & countryId)

3
map/local_ads_manager.cpp
View file

@ -505,9 +505,8 @@ void LocalAdsManager::OnDownloadCountry(std::string const & countryName)
});
}
void LocalAdsManager::OnDeleteCountry(std::string const & countryName)
void LocalAdsManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
{
auto const mwmId = m_getMwmIdByNameFn(countryName);
GetPlatform().RunTask(Platform::Thread::File, [this, mwmId]
{
ProcessRequests({std::make_pair(mwmId, RequestType::Delete)});

2
map/local_ads_manager.hpp
View file

@ -52,7 +52,7 @@ public:
void UpdateViewport(ScreenBase const & screen);
void OnDownloadCountry(std::string const & countryName);
void OnDeleteCountry(std::string const & countryName);
void OnMwmDeregistered(MwmSet::MwmId const & mwmId);
void Invalidate();

1
map/transit/transit_reader.cpp
View file

@ -311,7 +311,6 @@ void TransitReadManager::ClearCache(MwmSet::MwmId const & mwmId)
void TransitReadManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
{
ClearCache(mwmId);
Invalidate();
}
void TransitReadManager::Invalidate()