map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Repeat search Near My Position if not enough results for current viewport.

Browse source
This commit is contained in:
vng 2012-02-14 12:23:10 +03:00 • committed by Alex Zolotarev
parent 0acd6d0d35
commit 8efd58305d
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
search/search_engine.cpp
View file

@ -148,7 +148,8 @@ void Engine::SearchAsync()
}
// Initialize query.
if (params.IsNearMeMode())
bool const nearMe = params.IsNearMeMode();
if (nearMe)
m_pQuery->SetViewport(GetViewportRect(params.m_lat, params.m_lon));
else
m_pQuery->SetViewport(viewport);
@ -158,15 +159,32 @@ void Engine::SearchAsync()
else
m_pQuery->NullPosition();
unsigned int const resultsNeeded = 10;
Results res;
// Run first search with needed params.
try
{
m_pQuery->Search(params.m_query, res);
m_pQuery->Search(params.m_query, res, resultsNeeded);
}
catch (Query::CancelException const &)
{
}
// If not enough results, run second search with "Near Me" viewport.
if (!m_pQuery->IsCanceled() && !nearMe && params.m_validPos && (res.Count() < resultsNeeded))
{
m_pQuery->SetViewport(GetViewportRect(params.m_lat, params.m_lon));
try
{
m_pQuery->Search(params.m_query, res, resultsNeeded);
}
catch (Query::CancelException const &)
{
}
}
// Emit results in any way, even if search was canceled.
params.m_callback(res);
}

1
search/search_query.hpp
View file

@ -60,6 +60,7 @@ public:
void ClearCache();
inline void DoCancel() { m_cancel = true; }
inline bool IsCanceled() const { return m_cancel; }
struct CancelException {};
private: