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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-05-18 13:26:57 +03:00
parent 2c9095792b
commit 85255b3c05
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
map/framework.cpp
View file

@ -863,31 +863,16 @@ void Framework::OnDownloadMapCallback(storage::TIndex const & countryIndex)
m_activeMaps->DownloadMap(countryIndex, TMapOptions::EMapOnly);
}
void Framework::OnDownloadMapCallbackUI(storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapCallback, this, countryIndex));
}
void Framework::OnDownloadMapRoutingCallback(storage::TIndex const & countryIndex)
{
m_activeMaps->DownloadMap(countryIndex, TMapOptions::EMapWithCarRouting);
}
void Framework::OnDownloadMapRoutingCallbackUI(storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapRoutingCallback, this, countryIndex));
}
void Framework::OnDownloadRetryCallback(storage::TIndex const & countryIndex)
{
m_activeMaps->RetryDownloading(countryIndex);
}
void Framework::OnDownloadRetryCallbackUI(storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadRetryCallback, this, countryIndex));
}
void Framework::MemoryWarning()
{
LOG(LINFO, ("MemoryWarning"));
@ -1322,9 +1307,20 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
TIsCountryLoadedFn isCountryLoadedFn = bind(&Framework::IsCountryLoaded, this, _1);
TDownloadFn downloadMapFn = bind(&Framework::OnDownloadMapCallbackUI, this, _1);
TDownloadFn downloadMapRoutingFn = bind(&Framework::OnDownloadMapRoutingCallbackUI, this, _1);
TDownloadFn downloadRetryFn = bind(&Framework::OnDownloadRetryCallbackUI, this, _1);
TDownloadFn downloadMapFn = [this](storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapCallback, this, countryIndex));
};
TDownloadFn downloadMapRoutingFn = [this](storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapRoutingCallback, this, countryIndex));
};
TDownloadFn downloadRetryFn = [this](storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadRetryCallback, this, countryIndex));
};
df::DrapeEngine::Params p(contextFactory,
make_ref(&m_stringsBundle),

4
map/framework.hpp
View file

@ -298,13 +298,9 @@ private:
void FillSearchResultsMarks(search::Results const & results);
void OnDownloadMapCallback(storage::TIndex const & countryIndex);
void OnDownloadMapCallbackUI(storage::TIndex const & countryIndex);
void OnDownloadMapRoutingCallback(storage::TIndex const & countryIndex);
void OnDownloadMapRoutingCallbackUI(storage::TIndex const & countryIndex);
void OnDownloadRetryCallback(storage::TIndex const & countryIndex);
void OnDownloadRetryCallbackUI(storage::TIndex const & countryIndex);
public:
using TSearchRequest = search::QuerySaver::TSearchRequest;