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

Improved viewport selection for search based on city population

Browse source
This commit is contained in:
Denis Koronchik 2014-06-25 18:42:43 +03:00 • committed by Alex Zolotarev
parent f83fe2c7ba
commit 386638521d
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
search/ftypes_matcher.cpp
View file

@ -111,4 +111,19 @@ Type IsLocalityChecker::GetLocalityType(const FeatureType & f) const
return GetLocalityType(types);
}
double GetLocationRadius(FeatureType const & ft)
{
uint32_t population = ft.GetPopulation();
if (population < 10)
{
static IsLocalityChecker checker;
if (checker.GetLocalityType(ft) == CITY)
population = 10000;
/// @todo: process all cases of locality types
}
return pow((double)population, 0.277778) * 550;
}
}

2
search/ftypes_matcher.hpp
View file

@ -49,4 +49,6 @@ public:
Type GetLocalityType(FeatureType const & f) const;
};
/// Get city radius (meters)
double GetLocationRadius(FeatureType const & ft);
}

8
search/search_query.cpp
View file

@ -1278,10 +1278,11 @@ namespace impl
vector<size_t> m_matchedTokens; ///< indexes of matched tokens for locality
ftypes::Type m_type;
double m_radius;
Locality() : m_type(ftypes::NONE) {}
Locality(Query::TrieValueT const & val, ftypes::Type type)
: m_value(val), m_type(type)
: m_value(val), m_type(type), m_radius(0)
{
}
@ -1305,6 +1306,7 @@ namespace impl
using std::swap;
swap(m_value, rhs.m_value);
swap(m_type, rhs.m_type);
swap(m_radius, rhs.m_radius);
}
bool operator< (Locality const & rhs) const
@ -1472,7 +1474,8 @@ void Query::SearchAddress(Results & res)
{
params.ProcessAddressTokens();
SetViewportByIndex(mwmInfo, scales::GetRectForLevel(ADDRESS_SCALE, city.m_value.m_pt), LOCALITY_V);
m2::RectD const rect = MercatorBounds::RectByCenterXYAndSizeInMeters(city.m_value.m_pt, city.m_radius);
SetViewportByIndex(mwmInfo, rect, LOCALITY_V);
/// @todo Hack - do not search for address in World.mwm; Do it better in future.
bool const b = m_worldSearch;
@ -1657,6 +1660,7 @@ namespace impl
Locality * loc = PushLocality(Locality(v, index));
if (loc)
{
loc->m_radius = ftypes::GetLocationRadius(f);
// m_lang name should exist if we matched feature in search index for this language.
VERIFY(f.GetName(m_lang, loc->m_name), ());