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

[search] Fixed localities priority.

Browse source
This commit is contained in:
vng 2016-01-20 15:06:15 +03:00 • committed by Sergey Yershov
parent ca2248c3ff
commit 3c072cf95b
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
search/v2/geocoder.cpp
View file

@ -478,11 +478,11 @@ void Geocoder::FillLocalitiesTable(MwmContext const & context)
auto const tokensCountFn = [&](Locality const & l)
{
// Important! Don't take into account matched prefix for locality comparison.
size_t d = l.m_endToken - l.m_startToken;
// Important! Prefix match costs 0.5 while token match costs 1 for locality comparison.
double d = l.m_endToken - l.m_startToken;
ASSERT_GREATER(d, 0, ());
if (l.m_endToken == m_numTokens && !m_params.m_prefixTokens.empty())
--d;
d -= 0.5;
return d;
};
@ -507,8 +507,7 @@ void Geocoder::FillLocalitiesTable(MwmContext const & context)
// 4. Leave most popular localities.
if (preLocalities.size() > kMaxNumLocalities)
{
nth_element(preLocalities.begin(), preLocalities.begin() + kMaxNumLocalities,
preLocalities.end(),
sort(preLocalities.begin(), preLocalities.end(),
[&](Locality const & l1, Locality const & l2)
{
auto const d1 = tokensCountFn(l1);
@ -539,6 +538,12 @@ void Geocoder::FillLocalitiesTable(MwmContext const & context)
city.m_rect = MercatorBounds::RectByCenterXYAndSizeInMeters(
ft.GetCenter(), ftypes::GetRadiusByPopulation(ft.GetPopulation()));
#ifdef DEBUG
string name;
ft.GetName(StringUtf8Multilang::DEFAULT_CODE, name);
LOG(LDEBUG, ("City =", name));
#endif
m_cities[make_pair(l.m_startToken, l.m_endToken)].push_back(city);
}
break;
@ -550,6 +555,9 @@ void Geocoder::FillLocalitiesTable(MwmContext const & context)
++numCountries;
Country country(l);
GetEnglishName(ft, country.m_enName);
LOG(LDEBUG, ("Country =", country.m_enName));
m_infoGetter.GetMatchedRegions(country.m_enName, country.m_regions);
m_countries[make_pair(l.m_startToken, l.m_endToken)].push_back(country);
}