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

Added reactions to country status buttons

Browse source
This commit is contained in:
r.kuznetsov 2015-05-18 12:04:58 +03:00
parent de4c1f8511
commit 2c9095792b
7 changed files with 107 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drape_frontend/drape_engine.cpp
View file

@ -14,6 +14,23 @@
namespace df
{
namespace
{
void ConnectDownloadFn(gui::CountryStatusHelper::EButtonType buttonType, MapDataProvider::TDownloadFn downloadFn)
{
gui::DrapeGui & guiSubsystem = gui::DrapeGui::Instance();
guiSubsystem.ConnectOnButtonPressedHandler(buttonType, [downloadFn, &guiSubsystem]()
{
storage::TIndex countryIndex = guiSubsystem.GetCountryStatusHelper().GetCountryIndex();
ASSERT(countryIndex != storage::TIndex::INVALID, ());
if (downloadFn != nullptr)
downloadFn(countryIndex);
});
}
}
DrapeEngine::DrapeEngine(Params const & params)
: m_viewport(params.m_viewport)
{
@ -33,6 +50,10 @@ DrapeEngine::DrapeEngine(Params const & params)
guiSubsystem.SetLocalizator(bind(&StringsBundle::GetString, params.m_stringsBundle.get(), _1));
guiSubsystem.SetStorageAccessor(params.m_storageAccessor);
ConnectDownloadFn(gui::CountryStatusHelper::BUTTON_TYPE_MAP, params.m_model.GetDownloadMapHandler());
ConnectDownloadFn(gui::CountryStatusHelper::BUTTON_TYPE_MAP_ROUTING, params.m_model.GetDownloadMapRoutingHandler());
ConnectDownloadFn(gui::CountryStatusHelper::BUTTON_TRY_AGAIN, params.m_model.GetDownloadRetryHandler());
m_textureManager = make_unique_dp<dp::TextureManager>();
m_threadCommutator = make_unique_dp<ThreadsCommutator>();

23
drape_frontend/map_data_provider.cpp
View file

@ -6,11 +6,17 @@ namespace df
MapDataProvider::MapDataProvider(TReadIDsFn const & idsReader,
TReadFeaturesFn const & featureReader,
TResolveCountryFn const & countryResolver,
TIsCountryLoadedFn const & isCountryLoadedFn)
TIsCountryLoadedFn const & isCountryLoadedFn,
TDownloadFn const & downloadMapHandler,
TDownloadFn const & downloadMapRoutingHandler,
TDownloadFn const & downloadRetryHandler)
: m_featureReader(featureReader)
, m_idsReader(idsReader)
, m_countryResolver(countryResolver)
, m_isCountryLoadedFn(isCountryLoadedFn)
, m_downloadMapHandler(downloadMapHandler)
, m_downloadMapRoutingHandler(downloadMapRoutingHandler)
, m_downloadRetryHandler(downloadRetryHandler)
{
}
@ -34,4 +40,19 @@ MapDataProvider::TIsCountryLoadedFn const & MapDataProvider::GetIsCountryLoadedF
return m_isCountryLoadedFn;
}
MapDataProvider::TDownloadFn const & MapDataProvider::GetDownloadMapHandler() const
{
return m_downloadMapHandler;
}
MapDataProvider::TDownloadFn const & MapDataProvider::GetDownloadMapRoutingHandler() const
{
return m_downloadMapRoutingHandler;
}
MapDataProvider::TDownloadFn const & MapDataProvider::GetDownloadRetryHandler() const
{
return m_downloadRetryHandler;
}
}

13
drape_frontend/map_data_provider.hpp
View file

@ -19,11 +19,15 @@ public:
using TReadIDsFn = function<void (TReadCallback<FeatureID> const & , m2::RectD const &, int)>;
using TResolveCountryFn = function<storage::TIndex (m2::PointF const &)>;
using TIsCountryLoadedFn = function<bool (m2::PointD const & pt)>;
using TDownloadFn = function<void (storage::TIndex const & countryIndex)>;
MapDataProvider(TReadIDsFn const & idsReader,
TReadFeaturesFn const & featureReader,
TResolveCountryFn const & countryResolver,
TIsCountryLoadedFn const & isCountryLoadedFn);
TIsCountryLoadedFn const & isCountryLoadedFn,
TDownloadFn const & downloadMapHandler,
TDownloadFn const & downloadMapRoutingHandler,
TDownloadFn const & downloadRetryHandler);
void ReadFeaturesID(TReadCallback<FeatureID> const & fn, m2::RectD const & r, int scale) const;
void ReadFeatures(TReadCallback<FeatureType> const & fn, vector<FeatureID> const & ids) const;
@ -31,11 +35,18 @@ public:
storage::TIndex FindCountry(m2::PointF const & pt);
TIsCountryLoadedFn const & GetIsCountryLoadedFn() const;
TDownloadFn const & GetDownloadMapHandler() const;
TDownloadFn const & GetDownloadMapRoutingHandler() const;
TDownloadFn const & GetDownloadRetryHandler() const;
private:
TReadFeaturesFn m_featureReader;
TReadIDsFn m_idsReader;
TResolveCountryFn m_countryResolver;
TIsCountryLoadedFn m_isCountryLoadedFn;
TDownloadFn m_downloadMapHandler;
TDownloadFn m_downloadMapRoutingHandler;
TDownloadFn m_downloadRetryHandler;
};
}

6
drape_gui/country_status_helper.cpp
View file

@ -105,6 +105,12 @@ void CountryStatusHelper::SetCountryIndex(storage::TIndex const & index)
SetState(state);
}
storage::TIndex CountryStatusHelper::GetCountryIndex() const
{
ASSERT(m_accessor != nullptr, ());
return m_accessor->GetCountryIndex();
}
void CountryStatusHelper::SetState(ECountryState state)
{
m_state = state;

1
drape_gui/country_status_helper.hpp
View file

@ -52,6 +52,7 @@ public:
void SetStorageAccessor(ref_ptr<StorageAccessor> accessor);
void SetCountryIndex(storage::TIndex const & index);
storage::TIndex GetCountryIndex() const;
void SetState(ECountryState state);
ECountryState GetState() const;

38
map/framework.cpp
View file

@ -858,6 +858,36 @@ void Framework::ClearAllCaches()
m_searchEngine->ClearAllCaches();
}
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"));
@ -1273,6 +1303,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
using TReadFeaturesFn = df::MapDataProvider::TReadFeaturesFn;
using TResolveCountryFn = df::MapDataProvider::TResolveCountryFn;
using TIsCountryLoadedFn = df::MapDataProvider::TIsCountryLoadedFn;
using TDownloadFn = df::MapDataProvider::TDownloadFn;
TReadIDsFn idReadFn = [this](df::MapDataProvider::TReadCallback<FeatureID> const & fn, m2::RectD const & r, int scale) -> void
{
@ -1291,11 +1322,16 @@ 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);
df::DrapeEngine::Params p(contextFactory,
make_ref(&m_stringsBundle),
make_ref(m_storageAccessor),
df::Viewport(0, 0, w, h),
df::MapDataProvider(idReadFn, featureReadFn, resolveCountry,isCountryLoadedFn),
df::MapDataProvider(idReadFn, featureReadFn, resolveCountry, isCountryLoadedFn,
downloadMapFn, downloadMapRoutingFn, downloadRetryFn),
vs);
m_drapeEngine = make_unique_dp<df::DrapeEngine>(p);

8
map/framework.hpp
View file

@ -298,6 +298,14 @@ 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;