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

[search] Do not filter equal-by-distance results in Viewport mode.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-10-23 10:28:54 +03:00
parent 8356d3f59b
commit 9a516913ce
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
search/pre_ranker.cpp
View file

@ -246,16 +246,15 @@ void PreRanker::FilterForViewportSearch()
{
auto const & info = result.GetInfo();
// Interesting, is it possible when there is no center for a search result?
ASSERT(info.m_centerLoaded, (result.GetId()));
if (!info.m_centerLoaded || !m_params.m_viewport.IsPointInside(info.m_center))
if (!m_params.m_viewport.IsPointInside(info.m_center))
return true;
/// @todo Make some upper bound like for regular search, but not to erase partially matched results?
return result.GetMatchedTokensNumber() + 1 < m_params.m_numQueryTokens;
});
/// @todo Comment next statements to discard viewport filtering (displacement) at all.
// By VNG: Comment next statements to discard viewport filtering (displacement) for Debug purpose.
SweepNearbyResults(m_params.m_minDistanceOnMapBetweenResults, m_prevEmit, m_results);
for (auto const & result : m_results)

15
search/ranker.cpp
View file

@ -869,6 +869,8 @@ void Ranker::LoadCountriesTree() { m_regionInfoGetter.LoadCountriesTree(); }
void Ranker::MakeRankerResults()
{
bool const isViewportMode = m_geocoderParams.m_mode == Mode::Viewport;
RankerResultMaker maker(*this, m_dataSource, m_infoGetter, m_reverseGeocoder, m_geocoderParams);
for (auto const & r : m_preRankerResults)
{
@ -876,17 +878,10 @@ void Ranker::MakeRankerResults()
if (!p)
continue;
if (m_geocoderParams.m_mode == Mode::Viewport &&
!m_geocoderParams.m_pivot.IsPointInside(p->GetCenter()))
{
continue;
}
ASSERT(!isViewportMode || m_geocoderParams.m_pivot.IsPointInside(p->GetCenter()), (r));
/// @todo Do not filter "equal" results by distance in Mode::Viewport mode.
/// Strange when (for example bus stops) not all results are highlighted.
/// @todo Is it ok to make duplication check for O(N) here?
/// Especially when we make RemoveDuplicatingLinear later.
if (!ResultExists(*p, m_tentativeResults, m_params.m_minDistanceBetweenResultsM))
/// @todo Is it ok to make duplication check for O(N) here? Especially when we make RemoveDuplicatingLinear later.
if (isViewportMode || !ResultExists(*p, m_tentativeResults, m_params.m_minDistanceBetweenResultsM))
m_tentativeResults.push_back(move(*p));
};