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

[catalog] catalog headers duplication is fixed

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-11-27 17:20:01 +03:00
parent c4748b4411
commit d44c5fd58a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
map/catalog_headers_provider.cpp
View file

@ -1,5 +1,7 @@
#include "map/catalog_headers_provider.hpp"
#include <set>
CatalogHeadersProvider::CatalogHeadersProvider(PositionProvider const & positionProvider,
storage::Storage const & storage)
: m_positionProvider(positionProvider)
@ -15,17 +17,18 @@ platform::HttpClient::Headers CatalogHeadersProvider::GetHeaders()
storage::CountriesVec localMaps;
m_storage.GetLocalRealMaps(localMaps);
auto const & countryToCity = m_storage.GetMwmTopCityGeoIds();
auto & countries = params.m_countryGeoIds;
std::set<base::GeoObjectId> countries;
auto & cities = params.m_cityGeoIds;
for (auto const id : localMaps)
{
auto const countryIds = m_storage.GetTopCountryGeoIds(id);
countries.insert(countries.end(), countryIds.cbegin(), countryIds.cend());
countries.insert(countryIds.cbegin(), countryIds.cend());
auto const cityIt = countryToCity.find(id);
if (cityIt != countryToCity.cend())
cities.push_back(cityIt->second);
}
params.m_countryGeoIds.assign(countries.cbegin(), countries.cend());
return web_api::GetCatalogHeaders(params);
}