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

[generator] make CountrySpecifier::GetLevel nonvirtual with underlying virtual GetSpecificCountryLevel

Browse source
This commit is contained in:
LaGrunge 2019-07-16 13:12:16 +03:00 • committed by cc-engineering
parent f0c1baf5f0
commit fc663f4fad
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generator/regions/country_specifier.cpp
View file

@ -14,6 +14,12 @@ PlaceLevel CountrySpecifier::GetLevel(Region const & region) const
if (placeLevel != PlaceLevel::Unknown)
return placeLevel;
return GetSpecificCountryLevel(region);
}
PlaceLevel CountrySpecifier::GetSpecificCountryLevel(Region const & region) const
{
auto const placeType = region.GetPlaceType();
if (region.GetAdminLevel() == AdminLevel::Two &&
(placeType == PlaceType::Country || placeType == PlaceType::Unknown))
{

8
generator/regions/country_specifier.hpp
View file

@ -12,16 +12,16 @@ namespace regions
class CountrySpecifier
{
public:
virtual ~CountrySpecifier() = default;
virtual void AdjustRegionsLevel(Node::PtrList & outers);
PlaceLevel GetLevel(Region const & region) const;
virtual PlaceLevel GetLevel(Region const & region) const;
// Return -1 - |l| is under place of |r|, 0 - undefined relation, 1 - |r| is under place of |l|.
// Non-transitive.
virtual int RelateByWeight(LevelRegion const & l, LevelRegion const & r) const;
virtual ~CountrySpecifier() = default;
static PlaceLevel GetLevel(PlaceType placeType);
private:
virtual PlaceLevel GetSpecificCountryLevel(Region const & region) const;
};
} // namespace regions
} // namespace generator

19
generator/regions/specs/rus.cpp
View file

@ -57,7 +57,7 @@ void RusSpecifier::MarkMoscowSubregionsByAdministrativeOkrugs(Node::Ptr & tree)
if (adminLevel > AdminLevel::Five)
return;
for (auto & subtree : tree->GetChildren())
MarkMoscowSubregionsByAdministrativeOkrugs(subtree);
}
@ -90,7 +90,7 @@ void RusSpecifier::MarkMoscowSuburbsByAdministrativeDistrics(Node::Ptr & tree)
if (PlaceLevel::Suburb == region.GetLevel())
region.SetLevel(PlaceLevel::Sublocality);
for (auto & subtree : tree->GetChildren())
MarkMoscowSuburbsByAdministrativeDistrics(subtree);
}
@ -114,23 +114,14 @@ void RusSpecifier::MarkAllSuburbsToSublocalities(Node::Ptr & tree)
if (level == PlaceLevel::Suburb)
region.SetLevel(PlaceLevel::Sublocality);
for (auto & subtree : tree->GetChildren())
MarkAllSuburbsToSublocalities(subtree);
}
PlaceLevel RusSpecifier::GetLevel(Region const & region) const
{
auto placeLevel = CountrySpecifier::GetLevel(region.GetPlaceType());
if (placeLevel != PlaceLevel::Unknown)
return placeLevel;
return GetRussiaPlaceLevel(region.GetAdminLevel());
}
// static
PlaceLevel RusSpecifier::GetRussiaPlaceLevel(AdminLevel adminLevel)
PlaceLevel RusSpecifier::GetSpecificCountryLevel(Region const & region) const
{
AdminLevel adminLevel = region.GetAdminLevel();
switch (adminLevel)
{
case AdminLevel::Two:

6
generator/regions/specs/rus.hpp
View file

@ -16,9 +16,11 @@ class RusSpecifier final : public CountrySpecifier
public:
// CountrySpecifier overrides:
void AdjustRegionsLevel(Node::PtrList & outers) override;
PlaceLevel GetLevel(Region const & region) const override;
private:
PlaceLevel GetSpecificCountryLevel(Region const & region) const override;
void AdjustMoscowAdministrativeDivisions(Node::PtrList & outers);
void AdjustMoscowAdministrativeDivisions(Node::Ptr const & tree);
void MarkMoscowSubregionsByAdministrativeOkrugs(Node::Ptr & node);
@ -28,8 +30,6 @@ private:
void MarkMoscowAdministrativeDistric(Node::Ptr & node);
void MarkAllSuburbsToSublocalities(Node::Ptr & tree);
static PlaceLevel GetRussiaPlaceLevel(AdminLevel adminLevel);
bool m_moscowRegionWasProcessed{false};
bool m_moscowCityWasProcessed{false};
};