diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 162426c131..2e8eb027a6 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -375,8 +375,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital) { { Tags const tags = { - { "admin_level", "6" }, - { "capital", "yes" }, + { "capital", "6" }, { "place", "city" }, }; @@ -414,6 +413,47 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital) TEST(params.IsTypeExist(GetType({"boundary", "administrative", "4"})), (params)); TEST(params.IsTypeExist(GetType({"place", "city", "capital", "4"})), (params)); } + + { + Tags const tags = { + {"capital", "yes"}, + {"place", "town"}, + {"admin_level", "7"}, + }; + + auto const params = GetFeatureBuilderParams(tags); + + TEST_EQUAL(params.m_types.size(), 2, (params)); + TEST(params.IsTypeExist(GetType({"place", "city", "capital", "2"})), (params)); + TEST(params.IsTypeExist(GetType({"place", "city", "capital", "7"})), (params)); + } + + { + Tags const tags = { + {"capital", "yes"}, + {"admin_level", "7"}, + }; + + auto const params = GetFeatureBuilderParams(tags); + + TEST_EQUAL(params.m_types.size(), 0, (params)); + } +} + +UNIT_CLASS_TEST(TestWithClassificator, OsmType_DePlace) +{ + { + Tags const tags = { + {"de:place", "town"}, + {"name", "xyz"}, + }; + + auto const params = GetFeatureBuilderParams(tags); + + TEST_EQUAL(params.m_types.size(), 1, (params)); + TEST(params.IsTypeExist(GetType({"place", "town"})), (params)); + TEST(!params.IsEmptyNames(), ()); + } } UNIT_CLASS_TEST(TestWithClassificator, OsmType_Route) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index c134d941da..512ca00806 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -618,6 +618,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) bool isLightRail = false; bool isBus = false; bool isTram = false; + bool isCapital = false; TagProcessor(p).ApplyRules({ {"bridge", "yes", [&layer] { layer = "1"; }}, @@ -632,8 +633,9 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) /// @todo Unfortunately, it's not working in many cases (route=subway, transport=subway). /// Actually, it's better to process subways after feature types assignment. {"station", "subway", [&isSubway] { isSubway = true; }}, - {"station", "light_rail", [&isLightRail] { isLightRail = true; }}, + + {"capital", "yes", [&isCapital] { isCapital = true; }}, }); if (!hasLayer && layer) @@ -667,7 +669,8 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) } } - p->UpdateTag("attraction", [](string & value) { + p->UpdateTag("attraction", [](string & value) + { // "specified" is a special value which means we have the "attraction" tag, // but its value is not "animal". if (!value.empty() && value != "animal") @@ -680,7 +683,8 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) { strings::MakeLowerCaseInplace(cuisines); strings::SimpleTokenizer iter(cuisines, ",;"); - auto const collapse = [](char c, string & str) { + auto const collapse = [](char c, string & str) + { auto const comparator = [c](char lhs, char rhs) { return lhs == rhs && lhs == c; }; str.erase(unique(str.begin(), str.end(), comparator), str.end()); }; @@ -738,18 +742,6 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) } } - // We replace a value of 'place' with a value of 'de: place' because most people regard - // places names as 'de: place' defines it. - // TODO(@m.andrianov): A better solution for the future is writing this rule in replaced_tags.txt - // file. But syntax for this isn't supported by relace tags mechanism. - auto const dePlace = p->GetTag("de:place"); - if (!dePlace.empty()) - { - p->UpdateTag("place", [&](auto & value) { - value = dePlace; - }); - } - class CountriesLoader { std::unique_ptr m_infoGetter; @@ -782,8 +774,19 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) static CountriesLoader s_countriesChecker; + auto const dePlace = p->GetTag("de:place"); p->UpdateTag("place", [&](string & value) { + // 1. Replace a value of 'place' with a value of 'de:place' because most people regard + // places names as 'de:place' defines it. + if (!dePlace.empty()) + value = dePlace; + + // 2. Check valid capital. We support only place-city-capital-2 (not town, village, etc). + if (isCapital && !value.empty()) + value = "city"; + + // 3. Replace 'province' with 'state'. if (value != "province") return; @@ -792,6 +795,9 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) if (org && s_countriesChecker.IsTransformToState(*org)) value = "state"; }); + + if (isCapital) + p->UpdateTag("capital", [&](string & value) { value = "2"; }); } void PostprocessElement(OsmElement * p, FeatureBuilderParams & params) diff --git a/generator/place_processor.cpp b/generator/place_processor.cpp index 98b6fa1bfc..f0e686114f 100644 --- a/generator/place_processor.cpp +++ b/generator/place_processor.cpp @@ -19,15 +19,16 @@ using namespace feature; namespace generator { + uint32_t GetPlaceType(generator::FeaturePlace const & place) { return GetPlaceType(place.GetFb()); } -} // namespace generator -namespace +bool IsRealCapital(generator::FeaturePlace const & place) { -using namespace generator; + return IsRealCapital(place.GetFb()); +} double GetRadiusM(ftypes::LocalityType const & type) { @@ -46,6 +47,11 @@ double GetRadiusM(ftypes::LocalityType const & type) template bool IsWorsePlace(T const & left, T const & right) { + bool const lCapital = IsRealCapital(left); + bool const rCapital = IsRealCapital(right); + if (lCapital != rCapital) + return rCapital; + double constexpr kRankCoeff = 1.0; double constexpr kLangsCountCoeff = 1.0; double constexpr kAreaCoeff = 0.05; @@ -141,10 +147,7 @@ std::vector> FindClusters(std::vector && }; return GetClusters(std::move(places), func, IsTheSamePlace); } -} // namespace -namespace generator -{ bool NeedProcessPlace(feature::FeatureBuilder const & fb) { if (fb.GetMultilangName().IsEmpty()) @@ -289,4 +292,5 @@ void PlaceProcessor::Add(FeatureBuilder const & fb) // implemented in the function ProcessPlaces(). m_nameToPlaces[GetKey(fb)][fb.GetMostGenericOsmId()].Append(fb); } + } // namespace generator diff --git a/generator/type_helper.cpp b/generator/type_helper.cpp index 151b44f531..98f6bb93c7 100644 --- a/generator/type_helper.cpp +++ b/generator/type_helper.cpp @@ -4,14 +4,22 @@ namespace generator { + uint32_t GetPlaceType(FeatureParams const & params) { auto static const placeType = classif().GetTypeByPath({"place"}); return params.FindType(placeType, 1 /* level */); } -uint32_t GetPlaceType(feature::FeatureBuilder const & feature) +uint32_t GetPlaceType(feature::FeatureBuilder const & fb) { - return GetPlaceType(feature.GetParams()); + return GetPlaceType(fb.GetParams()); } + +bool IsRealCapital(feature::FeatureBuilder const & fb) +{ + auto static const capitalType = classif().GetTypeByPath({"place", "city", "capital", "2"}); + return fb.GetParams().IsTypeExist(capitalType); +} + } // namespace generator diff --git a/generator/type_helper.hpp b/generator/type_helper.hpp index c9a81aaa86..112b01ab94 100644 --- a/generator/type_helper.hpp +++ b/generator/type_helper.hpp @@ -12,5 +12,6 @@ namespace generator { uint32_t GetPlaceType(FeatureParams const & params); -uint32_t GetPlaceType(feature::FeatureBuilder const & feature); +uint32_t GetPlaceType(feature::FeatureBuilder const & fb); +bool IsRealCapital(feature::FeatureBuilder const & fb); } // namespace generator