From 7088489814a43c629bb5ab3f0907598b22433bd2 Mon Sep 17 00:00:00 2001 From: eisa01 Date: Sun, 24 Aug 2025 21:53:00 +0200 Subject: [PATCH] [core] Better check whether showing brand is redundant in subtitle Previous implementation checked if brand was equal to name, better to check if it's located in name Signed-off-by: eisa01 --- libs/map/place_page_info.cpp | 2 +- libs/search/intermediate_result.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp index 5874debff..d56661c78 100644 --- a/libs/map/place_page_info.cpp +++ b/libs/map/place_page_info.cpp @@ -165,7 +165,7 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const auto const locBrand = platform::GetLocalizedBrandName(std::string(brand)); // Do not duplicate for commonly used titles like McDonald's, Starbucks, etc. - if (locBrand != m_uiTitle && locBrand != m_uiSecondaryTitle) + if (m_uiTitle.find(locBrand) == std::string::npos && m_uiSecondaryTitle.find(locBrand) == std::string::npos) append(locBrand); } diff --git a/libs/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp index 1c06e1e94..cdedcfb7b 100644 --- a/libs/search/intermediate_result.cpp +++ b/libs/search/intermediate_result.cpp @@ -250,10 +250,12 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d std::string brand{ft.GetMetadata(feature::Metadata::FMD_BRAND)}; if (!brand.empty()) + { brand = platform::GetLocalizedBrandName(brand); - if (name == brand) - brand.clear(); + if (name.find(brand) != std::string::npos) + brand.clear(); + } /// @todo Avoid temporary string when OpeningHours (boost::spirit) will allow string_view. std::string const openHours(ft.GetMetadata(feature::Metadata::FMD_OPEN_HOURS));