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

[search] Match highways from different classes for removig duplicating linear search results.

Browse source
This commit is contained in:
tatiana-yan 2019-04-23 11:27:08 +03:00 • committed by mpimenov
parent bfeb85425b
commit 980d407d50
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
search/intermediate_result.cpp
View file

@ -146,7 +146,16 @@ bool RankerResult::GetCountryId(storage::CountryInfoGetter const & infoGetter, u
bool RankerResult::IsEqualCommon(RankerResult const & r) const
{
return m_geomType == r.m_geomType && GetBestType() == r.GetBestType() && m_str == r.m_str;
if ((m_geomType != r.m_geomType) || (m_str != r.m_str))
return false;
auto const bestType = GetBestType();
auto const rBestType = r.GetBestType();
if (bestType == rBestType)
return true;
auto const & checker = ftypes::IsWayChecker::Instance();
return checker(bestType) && checker(rBestType);
}
bool RankerResult::IsStreet() const { return ftypes::IsStreetOrSuburbChecker::Instance()(m_types); }