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

[search] Allow empty strings in search.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-12-30 15:49:23 +03:00 • committed by Илья Гречухин
parent 115bc67bd5
commit 4ee2f30852
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
search/engine.cpp
View file

@ -242,7 +242,11 @@ void Engine::DoSearch(SearchParams const & params, m2::RectD const & viewport,
{
Results results;
results.SetEndMarker(true /* isCancelled */);
params.m_onResults(results);
if (params.m_onResults)
params.m_onResults(results);
else
LOG(LERROR, ("OnResults is not set."));
return;
}

1
search/processor.cpp
View file

@ -409,7 +409,6 @@ void Processor::Search(SearchParams const & params, m2::RectD const & viewport)
SetInputLocale(params.m_inputLocale);
ASSERT(!params.m_query.empty(), ());
SetQuery(params.m_query);
SetViewport(viewport, true /* forceUpdate */);
SetOnResults(params.m_onResults);

4
search/search_integration_tests/processor_test.cpp
View file

@ -172,6 +172,10 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke)
});
SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0)));
{
TRules rules = {};
TEST(ResultsMatch("", rules), ());
}
{
TRules rules = {ExactMatch(wonderlandId, busStop)};
TEST(ResultsMatch("Bus stop", rules), ());