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

[guides on map] zoom out for suggested zoom is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-05-29 16:57:51 +03:00 • committed by Daria Volvenkova
parent 2fc9d7d5c8
commit 4ac8c3d44f
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
map/guides_manager.cpp
View file

@ -126,7 +126,7 @@ void GuidesManager::SetEnabled(bool enabled)
return;
}
RequestGuides();
RequestGuides(true /* suggestZoom */);
}
bool GuidesManager::IsEnabled() const
@ -146,7 +146,7 @@ void GuidesManager::ChangeState(GuidesState newState)
TrackStatistics();
}
void GuidesManager::RequestGuides()
void GuidesManager::RequestGuides(bool suggestZoom)
{
if (!IsRequestParamsInitialized())
return;
@ -165,8 +165,8 @@ void GuidesManager::RequestGuides()
auto const requestNumber = ++m_requestCounter;
auto const id = m_api.GetGuidesOnMap(
corners, m_zoom, m_shownGuides.empty(),
[this, requestNumber](guides_on_map::GuidesOnMap const & guides) {
corners, m_zoom, suggestZoom,
[this, suggestZoom, requestNumber](guides_on_map::GuidesOnMap const & guides) {
if (m_state == GuidesState::Disabled || requestNumber != m_requestCounter)
return;
@ -176,7 +176,19 @@ void GuidesManager::RequestGuides()
if (!m_guides.m_nodes.empty())
ChangeState(GuidesState::HasData);
else
ChangeState(GuidesState::NoData);
{
if (suggestZoom && m_zoom > m_guides.m_suggestedZoom)
{
m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewCenter,
m_lastShownViewport.GetGlobalRect().Center(),
m_guides.m_suggestedZoom,
true /* isAnim */, false /* trackVisibleViewport */);
}
else
{
ChangeState(GuidesState::NoData);
}
}
UpdateGuidesMarks();

2
map/guides_manager.hpp
View file

@ -115,7 +115,7 @@ public:
private:
void ChangeState(GuidesState newState);
void RequestGuides();
void RequestGuides(bool suggestZoom = false);
void Clear();
bool IsGuideDownloaded(std::string const & guideId) const;

6
partners_api/guides_on_map_api.hpp
View file

@ -65,9 +65,9 @@ public:
void SetDelegate(std::unique_ptr<Delegate> delegate);
base::TaskLoop::TaskId GetGuidesOnMap(m2::AnyRectD::Corners const & corners, uint8_t zoomLevel,
bool suggestZoom, GuidesOnMapCallback const & onSuccess,
OnError const & onError) const;
base::TaskLoop::TaskId GetGuidesOnMap(m2::AnyRectD::Corners const & corners, uint8_t zoomLevel,
bool suggestZoom, GuidesOnMapCallback const & onSuccess,
OnError const & onError) const;
private:
std::unique_ptr<Delegate> m_delegate;