kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
tatiana-yan 2020-06-25 15:48:35 +03:00 • committed by mpimenov
parent 104ea4bd32
commit ca1df62096
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/osm2type.cpp
View file

@ -626,15 +626,20 @@ void PreprocessElement(OsmElement * p)
CHECK(infoGetter, ());
auto static const countryTree = storage::LoadCountriesFromFile(COUNTRIES_FILE);
CHECK(countryTree, ());
std::set<storage::CountryId> provinceToStateCountries = {"Japan", "South Korea", "Turkey"};
p->UpdateTag("place", [&](string & value) {
if (value != "province")
return;
std::array<storage::CountryId, 3> const provinceToStateCountries = {"Japan", "South Korea",
"Turkey"};
auto const pt = mercator::FromLatLon(p->m_lat, p->m_lon);
auto const countryId = infoGetter->GetRegionCountryId(pt);
if (provinceToStateCountries.count(storage::GetTopmostParentFor(*countryTree, countryId)) > 0)
auto const country = storage::GetTopmostParentFor(*countryTree, countryId);
if (base::FindIf(provinceToStateCountries, [&](auto const & c) { return c == country; }) !=
provinceToStateCountries.end())
{
value = "state";
}
});
}

2
storage/country_tree_helpers.cpp
View file

@ -13,7 +13,7 @@ CountryId GetTopmostParentFor(CountryTree const & countries, CountryId const & c
countries.Find(countryId, nodes);
if (nodes.empty())
{
LOG(LWARNING, ("CountryId =", countryId, "not found in m_countries."));
LOG(LWARNING, ("CountryId =", countryId, "not found in countries."));
return {};
}