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

[search] Prefer result from prevEmit over result with better filterPassed.

Browse source
This commit is contained in:
tatiana-yan 2020-09-28 19:12:22 +03:00 • committed by mpimenov
parent e289834e55
commit 5b946910a1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
search/pre_ranker.cpp
View file

@ -39,11 +39,12 @@ void SweepNearbyResults(double xEps, double yEps, set<FeatureID> const & prevEmi
auto const & p = results[i].GetInfo().m_center;
uint8_t const rank = results[i].GetInfo().m_rank;
uint8_t const popularity = results[i].GetInfo().m_popularity;
uint8_t const prevCount = prevEmit.count(results[i].GetId()) ? 1 : 0;
uint8_t const exactMatch = results[i].GetInfo().m_exactMatch ? 1 : 0;
// We prefer result which passed the filter even if it has lower rank / popularity / prevCount /
// exactMatch.
// We prefer result which passed the filter even if it has lower rank / popularity / exactMatch.
uint8_t const filterPassed = results[i].GetInfo().m_refusedByFilter ? 0 : 2;
// We prefer result from prevEmit over result with better filterPassed because otherwise we have
// lots of blinking results.
uint8_t const prevCount = prevEmit.count(results[i].GetId()) == 0 ? 0 : 3;
uint8_t const priority = max({rank, prevCount, popularity, exactMatch}) + filterPassed;
sweeper.Add(p.x, p.y, i, priority);
}