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

[search] Continue MatchAroundPivot untill result with all tokens used found.

Browse source
This commit is contained in:
tatiana-yan 2020-04-03 16:01:58 +03:00 • committed by mpimenov
parent 148e00ff5d
commit a9eb81f76e
3 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
search/geocoder.cpp
View file

@ -585,7 +585,7 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> const & infos, bool inViewport
auto const mwmType = m_context->GetType();
CHECK(mwmType, ());
if (mwmType->m_viewportIntersected || mwmType->m_containsUserPosition ||
m_preRanker.Size() == 0)
!m_preRanker.HaveFullResult())
{
MatchAroundPivot(ctx);
}

5
search/pre_ranker.hpp
View file

@ -72,6 +72,8 @@ public:
return;
m_results.emplace_back(std::forward<Args>(args)...);
if (m_results.back().GetInfo().m_allTokensUsed)
m_haveFullResult = true;
}
// Computes missing fields for all pre-results.
@ -86,6 +88,7 @@ public:
size_t Size() const { return m_results.size(); }
size_t BatchSize() const { return m_params.m_batchSize; }
size_t NumSentResults() const { return m_numSentResults; }
bool HaveFullResult() const { return m_haveFullResult; }
size_t Limit() const { return m_params.m_limit; }
template <typename Fn>
@ -110,6 +113,8 @@ private:
// Amount of results sent up the pipeline.
size_t m_numSentResults = 0;
bool m_haveFullResult = false;
// Cache of nested rects used to estimate distance from a feature to the pivot.
NestedRectsCache m_pivotFeatures;

35
search/search_integration_tests/processor_test.cpp
View file

@ -2792,5 +2792,40 @@ UNIT_CLASS_TEST(ProcessorTest, MatchedFraction)
TEST(ResultsMatch("8 ", rules), ());
}
}
UNIT_CLASS_TEST(ProcessorTest, AvoidMathcAroundPivotInMwmWithCity)
{
string const minskCountryName = "Minsk";
TestCity minsk(m2::PointD(-10.0, -10.0), "Minsk", "en", 10 /* rank */);
// World.mwm should intersect viewport.
TestPOI dummy(m2::PointD(10.0, 10.0), "", "en");
auto worldId = BuildWorld([&](TestMwmBuilder & builder) {
builder.Add(minsk);
builder.Add(dummy);
});
TestCafe minskCafe(m2::PointD(-9.99, -9.99), "Minsk cafe", "en");
auto minskId = BuildCountry(minskCountryName, [&](TestMwmBuilder & builder) {
builder.Add(minsk);
builder.Add(minskCafe);
});
SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0)));
{
// Minsk cafe should not appear here because we have (worldId, minsk) result with all tokens
// used.
Rules rules = {ExactMatch(worldId, minsk)};
TEST(ResultsMatch("Minsk ", rules), ());
TEST(ResultsMatch("Minsk", rules), ());
}
{
// We search for pois until we find result with all tokens used. We do not emit relaxed result
// from world.
Rules rules = {ExactMatch(minskId, minskCafe)};
TEST(ResultsMatch("Minsk cafe", rules), ());
}
}
} // namespace
} // namespace search