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

[generator] TYPO WAS FIXED

Browse source
This commit is contained in:
LaGrunge 2019-07-16 21:41:47 +03:00 • committed by cc-engineering
parent 4bcadaa19d
commit f51d070a60
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/regions/specs/russia.cpp
View file

@ -68,7 +68,7 @@ void RussiaSpecifier::AdjustMoscowCitySuburbs(Node::Ptr const & tree)
if (region.GetPlaceType() == PlaceType::City && region.GetName() == u8"Москва")
{
for (auto & subtree : tree->GetChildren())
MarkMoscowSuburbsByAdministrativeDistrics(subtree);
MarkMoscowSuburbsByAdministrativeDistricts(subtree);
return;
}
@ -79,12 +79,12 @@ void RussiaSpecifier::AdjustMoscowCitySuburbs(Node::Ptr const & tree)
AdjustMoscowCitySuburbs(subtree);
}
void RussiaSpecifier::MarkMoscowSuburbsByAdministrativeDistrics(Node::Ptr & tree)
void RussiaSpecifier::MarkMoscowSuburbsByAdministrativeDistricts(Node::Ptr & tree)
{
auto & region = tree->GetData();
if (AdminLevel::Eight == region.GetAdminLevel())
{
MarkMoscowAdministrativeDistric(tree);
MarkMoscowAdministrativeDistrict(tree);
return;
}
@ -92,10 +92,10 @@ void RussiaSpecifier::MarkMoscowSuburbsByAdministrativeDistrics(Node::Ptr & tree
region.SetLevel(PlaceLevel::Sublocality);
for (auto & subtree : tree->GetChildren())
MarkMoscowSuburbsByAdministrativeDistrics(subtree);
MarkMoscowSuburbsByAdministrativeDistricts(subtree);
}
void RussiaSpecifier::MarkMoscowAdministrativeDistric(Node::Ptr & node)
void RussiaSpecifier::MarkMoscowAdministrativeDistrict(Node::Ptr & node)
{
auto & region = node->GetData();
region.SetLevel(PlaceLevel::Suburb);

4
generator/regions/specs/russia.hpp
View file

@ -26,8 +26,8 @@ private:
void MarkMoscowSubregionsByAdministrativeOkrugs(Node::Ptr & node);
void AdjustMoscowCitySuburbs(Node::Ptr const & tree);
void MarkMoscowSuburbsByAdministrativeDistrics(Node::Ptr & tree);
void MarkMoscowAdministrativeDistric(Node::Ptr & node);
void MarkMoscowSuburbsByAdministrativeDistricts(Node::Ptr & tree);
void MarkMoscowAdministrativeDistrict(Node::Ptr & node);
void MarkAllSuburbsToSublocalities(Node::Ptr & tree);
bool m_moscowRegionWasProcessed{false};