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

[generator:regions] Relax suburb marker rules

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-07-19 18:51:10 +03:00 • committed by Maksim Andrianov
parent 43864569b2
commit 9b92bb3010
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
generator/regions/admin_suburbs_marker.cpp
View file

@ -29,13 +29,14 @@ void AdminSuburbsMarker::MarkLocality(Node::Ptr & tree)
void AdminSuburbsMarker::MarkSuburbsInLocality(Node::Ptr & tree)
{
auto & region = tree->GetData();
if (region.GetLevel() == PlaceLevel::Locality)
auto const level = region.GetLevel();
if (level == PlaceLevel::Locality)
{
MarkLocality(tree);
return;
}
if (region.GetAdminLevel() != AdminLevel::Unknown)
if (level == PlaceLevel::Unknown && region.GetAdminLevel() != AdminLevel::Unknown)
region.SetLevel(PlaceLevel::Suburb);
for (auto & subtree : tree->GetChildren())
@ -54,7 +55,7 @@ void AdminSuburbsMarker::MarkUnderLocalityAsSublocalities(Node::Ptr & tree)
if (level == PlaceLevel::Suburb)
region.SetLevel(PlaceLevel::Sublocality);
else if (level == PlaceLevel::Unknown && region.GetAdminLevel() != AdminLevel::Unknown)
else if (level == PlaceLevel::Unknown)
region.SetLevel(PlaceLevel::Sublocality);
for (auto & subtree : tree->GetChildren())