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

[search] Better logic in emitting results.

Browse source
This commit is contained in:
vng 2012-06-21 00:15:11 -07:00 • committed by Alex Zolotarev
parent f1bc620511
commit 4db1e24783
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
search/search_engine.cpp
View file

@ -246,6 +246,7 @@ void Engine::SearchAsync()
{
if (params.m_query.empty())
{
// Search for empty query only around viewport.
if (params.m_validPos)
{
double arrR[] = { 500, 1000, 2000 };
@ -266,11 +267,13 @@ void Engine::SearchAsync()
{
}
// Emit results in any way, even if search was canceled.
params.m_callback(res);
// Emit results even if search was canceled and we have something.
size_t const count = res.GetCount();
if (!m_pQuery->IsCanceled() || count > 0)
params.m_callback(res);
// Make additional search in whole mwm when not enough results.
if (!m_pQuery->IsCanceled() && res.GetCount() < RESULTS_COUNT)
// Make additional search in whole mwm when not enough results (only for non-empty query).
if (!params.m_query.empty() && !m_pQuery->IsCanceled() && count < RESULTS_COUNT)
{
try
{
@ -280,7 +283,9 @@ void Engine::SearchAsync()
{
}
params.m_callback(res);
// Emit if we have more results.
if (res.GetCount() > count)
params.m_callback(res);
}
}

2
search/search_query.cpp
View file

@ -96,6 +96,8 @@ void Query::SetViewport(m2::RectD viewport[], size_t count)
{
ASSERT_LESS_OR_EQUAL(count, static_cast<size_t>(RECTSCOUNT), ());
m_cancel = false;
MWMVectorT mwmInfo;
m_pIndex->GetMwmInfo(mwmInfo);