From 6945288f3cc750c76b5936fe15f6838d41d286b2 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 16 Nov 2023 18:33:33 -0300 Subject: [PATCH] [generator] Do not add a "building-address" type for a single "entrance" type. Signed-off-by: Viktor Govako --- generator/generator_tests/osm_type_test.cpp | 3 +-- generator/osm2type.cpp | 8 ++++---- indexer/ftypes_matcher.cpp | 2 +- .../search_quality_tests/real_mwm_tests.cpp | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index b51cc32c90..e0a015cdf8 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -234,8 +234,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address) auto const params = GetFeatureBuilderParams(tags); - TEST_EQUAL(params.m_types.size(), 4, (params)); - TEST(params.IsTypeExist(addrType), ()); + TEST_EQUAL(params.m_types.size(), 3, (params)); TEST(params.IsTypeExist(GetType({"entrance", "main"})), ()); TEST(params.IsTypeExist(GetType({"wheelchair", "no"})), ()); TEST(params.IsTypeExist(GetType({"internet_access", "wlan"})), ()); diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index c003c28bb2..c33cbb2911 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -929,8 +929,7 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params) { /// @todo Make a function like HaveAddressLikeType ? ftype::TruncValue(t, 1); - if (t != types.Get(CachedTypes::Entrance) && - t != types.Get(CachedTypes::WheelchairAny) && + if (t != types.Get(CachedTypes::WheelchairAny) && t != types.Get(CachedTypes::InternetAny)) { hasSuitableType = true; @@ -940,8 +939,6 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params) if (!hasSuitableType) { - /// @todo Worth to add Address type for existing Entrance only when params.name is not empty. - /// When we will fix entrance only styles to correct draw house number. AddParam(CachedTypes::Address); // https://github.com/organicmaps/organicmaps/issues/5803 @@ -1346,6 +1343,9 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params, size_t const typesCount = params.m_types.size(); if (params.FinishAddingTypesEx() == FeatureParams::TYPES_EXCEED_MAX) LOG(LWARNING, ("Exceeded types count for:", DebugPrintID(*p), "Types:", typesCount, typesString)); + + if (!params.house.IsEmpty() && !ftypes::IsAddressObjectChecker::Instance()(params.m_types)) + LOG(LWARNING, ("Have house number for _non-address_:", DebugPrintID(*p), "Types:", typesString)); } // Stage6: Collect additional information about feature such as diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index a2de493366..123375d17e 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -384,7 +384,7 @@ IsStreetOrSquareChecker::IsStreetOrSquareChecker() IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */) { base::StringIL const paths = { - "building", "amenity", "shop", "tourism", "historic", "office", "craft", "addr:interpolation" + "building", "entrance", "amenity", "shop", "tourism", "historic", "office", "craft", "addr:interpolation" }; Classificator const & c = classif(); diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp index 7a0ad5a3f1..03e3efd200 100644 --- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp +++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp @@ -464,7 +464,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Hawaii_Address) auto request = MakeRequest("1000 Ululani Street"); // Address should be at the top. - HasAddress(Range(request->Results(), 0, 3), "Ululani Street", "1000"); + HasAddress(Range(request->Results(), 0, 3), "Ululani Street", "1000", {"entrance"}); } // https://github.com/organicmaps/organicmaps/issues/3712