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

[search] Fixed viewport search.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-10-31 17:38:54 +03:00 • committed by mpimenov
parent 44f92f69ce
commit e7bc9928ea
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
map/framework.cpp
View file

@ -284,25 +284,25 @@ void Framework::OnUserPositionChanged(m2::PointD const & position, bool hasPosit
void Framework::OnViewportChanged(ScreenBase const & screen)
{
double constexpr kEps = 1.0E-4;
if (!screen.GlobalRect().EqualDxDy(m_currentModelView.GlobalRect(), kEps))
UpdateUserViewportChanged();
m_currentModelView = screen;
if (!m_isViewportInitialized)
{
m_isViewportInitialized = true;
for (size_t i = 0; i < static_cast<size_t>(search::Mode::Count); i++)
{
auto & intent = m_searchIntents[i];
if (intent.m_isDelayed)
{
intent.m_params.m_viewport = GetCurrentViewport();
Search(intent);
}
// Viewport search will be triggered below, in UpdateUserViewportChanged().
if (!intent.m_isDelayed || static_cast<search::Mode>(i) == search::Mode::Viewport)
continue;
SetViewportIfPossible(intent.m_params);
SetCurrentPositionIfPossible(intent.m_params);
Search(intent);
}
}
UpdateUserViewportChanged();
m_trafficManager.UpdateViewport(m_currentModelView);
m_localAdsManager.UpdateViewport(m_currentModelView);
@ -1329,10 +1329,12 @@ void Framework::SetCurrentCountryChangedListener(TCurrentCountryChanged const &
void Framework::UpdateUserViewportChanged()
{
if (!IsViewportSearchActive())
if (!m_isViewportInitialized || !IsViewportSearchActive())
return;
auto & params = m_searchIntents[static_cast<size_t>(search::Mode::Viewport)].m_params;
// Copy is intended here, for correct checking of duplicating requests.
auto params = m_searchIntents[static_cast<size_t>(search::Mode::Viewport)].m_params;
SetViewportIfPossible(params);
SetCurrentPositionIfPossible(params);
Search(params);
}