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

[storage] Convert lookupRadiusM to CountryInfoGetter::GetRegionsCountryId parameter.

Browse source
This commit is contained in:
tatiana-yan 2019-10-28 18:09:45 +03:00 • committed by gmoryes
parent 26247a1c56
commit 25335d7a55
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/country_info_getter.cpp
View file

@ -88,17 +88,16 @@ std::vector<CountryId> CountryInfoGetter::GetRegionsCountryIdByRect(m2::RectD co
return result;
}
void CountryInfoGetter::GetRegionsCountryId(m2::PointD const & pt, CountriesVec & closestCoutryIds)
void CountryInfoGetter::GetRegionsCountryId(m2::PointD const & pt, CountriesVec & closestCoutryIds,
double lookupRadiusM)
{
double const kLookupRadiusM = 30 /* km */ * 1000;
closestCoutryIds.clear();
m2::RectD const lookupRect = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, kLookupRadiusM);
m2::RectD const lookupRect = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, lookupRadiusM);
for (size_t id = 0; id < m_countries.size(); ++id)
{
if (m_countries[id].m_rect.IsIntersect(lookupRect) && IsCloseEnough(id, pt, kLookupRadiusM))
if (m_countries[id].m_rect.IsIntersect(lookupRect) && IsCloseEnough(id, pt, lookupRadiusM))
closestCoutryIds.emplace_back(m_countries[id].m_countryId);
}
}

3
storage/country_info_getter.hpp
View file

@ -73,7 +73,8 @@ public:
// |closestCoutryIds| is filled with country ids of mwms that cover |pt| or are close to it
// with the exception of World.mwm and custom user-provided mwms.
// The result may be empty, for example if |pt| is somewhere in an ocean.
void GetRegionsCountryId(m2::PointD const & pt, CountriesVec & closestCoutryIds);
void GetRegionsCountryId(m2::PointD const & pt, CountriesVec & closestCoutryIds,
double lookupRadiusM = 30000.0 /* 30 km */);
// Fills info for the region |pt| belongs to.
void GetRegionInfo(m2::PointD const & pt, CountryInfo & info) const;