diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm index 6f1c141c5e..93e39fc0d0 100644 --- a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm +++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm @@ -28,10 +28,9 @@ if (type == MWMSearchItemTypeRegular) { auto const & result = [MWMSearch resultWithContainerIndex:containerIndex]; NSString *localizedTypeName = @""; - if (result.GetResultType() == search::Result::Type::Feature) { - auto const readableType = classif().GetReadableObjectName(result.GetFeatureType()); - localizedTypeName = @(platform::GetLocalizedTypeName(readableType).c_str()); - } + if (result.GetResultType() == search::Result::Type::Feature) + localizedTypeName = @(result.GetLocalizedFeatureType().c_str()); + self.title = result.GetString().empty() ? localizedTypeName : @(result.GetString().c_str()); self.address = @(result.GetAddress().c_str()); auto const pivot = result.GetFeatureCenter(); diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index 9c700d2fee..048975c1a2 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -157,9 +157,8 @@ void SearchPanel::OnEverywhereSearchResults(uint64_t timestamp, search::Results if (res.GetResultType() == search::Result::Type::Feature) { - std::string readableType = classif().GetReadableObjectName(res.GetFeatureType()); - m_pTable->setItem(rowCount, 0, CreateItem(QString::fromStdString(readableType))); - m_pTable->setItem(rowCount, 3, CreateItem(m_pDrawWidget->GetDistance(res).c_str())); + m_pTable->setItem(rowCount, 0, CreateItem(QString::fromStdString(res.GetLocalizedFeatureType()))); + m_pTable->setItem(rowCount, 3, CreateItem(QString::fromStdString(m_pDrawWidget->GetDistance(res)))); } } diff --git a/search/result.cpp b/search/result.cpp index 82e55623c4..a13674b994 100644 --- a/search/result.cpp +++ b/search/result.cpp @@ -68,6 +68,18 @@ uint32_t Result::GetFeatureType() const return m_mainType; } +bool Result::IsSameType(uint32_t type) const +{ + uint8_t const level = ftype::GetLevel(type); + for (uint32_t t : { m_mainType, m_matchedType }) + { + ftype::TruncValue(t, level); + if (t == type) + return true; + } + return false; +} + std::string GetLocalizedTypeName(uint32_t type) { return platform::GetLocalizedTypeName(classif().GetReadableObjectName(type)); @@ -83,23 +95,23 @@ std::string Result::GetFeatureDescription() const { ASSERT_EQUAL(m_resultType, Type::Feature, ()); std::string featureDescription; - + auto const append = [&featureDescription](std::string_view sv) { if (!featureDescription.empty()) featureDescription += feature::kFieldsSeparator; featureDescription += sv; }; - + if (!m_str.empty()) append(GetLocalizedTypeName(m_mainType)); - + if (m_mainType != m_matchedType && m_matchedType != 0) append(GetLocalizedTypeName(m_matchedType)); - + if (!GetDescription().empty()) append(GetDescription()); - + return featureDescription; } diff --git a/search/result.hpp b/search/result.hpp index 7879407f41..d642d50ac0 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -49,7 +49,7 @@ public: uint16_t m_minutesUntilOpen = 0; uint16_t m_minutesUntilClosed = 0; - + std::string m_description; bool m_isInitialized = false; @@ -89,10 +89,11 @@ public: // Precondition: GetResultType() == Type::Feature. uint32_t GetFeatureType() const; - + bool IsSameType(uint32_t type) const; + // Precondition: GetResultType() == Type::Feature. std::string GetLocalizedFeatureType() const; - + // Precondition: GetResultType() == Type::Feature. std::string GetFeatureDescription() const; diff --git a/search/search_quality/assessment_tool/result_view.cpp b/search/search_quality/assessment_tool/result_view.cpp index 99e2c5b889..53b8b9a8d7 100644 --- a/search/search_quality/assessment_tool/result_view.cpp +++ b/search/search_quality/assessment_tool/result_view.cpp @@ -3,11 +3,8 @@ #include "search/result.hpp" #include "search/search_quality/assessment_tool/helpers.hpp" -#include "indexer/classificator.hpp" - #include #include -#include #include #include @@ -26,7 +23,8 @@ QLabel * CreateLabel(QWidget & parent) return label; } -void SetText(QLabel & label, string const & text) { +void SetText(QLabel & label, string const & text) +{ if (text.empty()) { label.hide(); @@ -44,10 +42,7 @@ string GetResultType(search::Sample::Result const & result) string GetResultType(search::Result const & result) { - if (result.GetResultType() == search::Result::Type::Feature) - return classif().GetReadableObjectName(result.GetFeatureType()); - - return ""; + return (result.GetResultType() == search::Result::Type::Feature ? result.GetLocalizedFeatureType() : ""); } } // namespace @@ -67,8 +62,7 @@ ResultView::ResultView(search::Result const & result, QWidget & parent) } ResultView::ResultView(search::Sample::Result const & result, QWidget & parent) - : ResultView(strings::ToUtf8(result.m_name), GetResultType(result), string() /* address */, - parent) + : ResultView(strings::ToUtf8(result.m_name), GetResultType(result), {} /* address */, parent) { } 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 0a94b57489..8dc73d66ee 100644 --- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp +++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp @@ -81,19 +81,13 @@ public: return res; } - static bool EqualClassifType(uint32_t checkType, uint32_t ethalonType) - { - ftype::TruncValue(checkType, ftype::GetLevel(ethalonType)); - return checkType == ethalonType; - } - static void EqualClassifType(Range const & results, std::vector const & types) { for (auto const & r : results) { - auto const it = std::find_if(types.begin(), types.end(), [type = r.GetFeatureType()](uint32_t inType) + auto const it = std::find_if(types.begin(), types.end(), [&r](uint32_t inType) { - return EqualClassifType(type, inType); + return r.IsSameType(inType); }); TEST(it != types.end(), (r)); @@ -104,7 +98,7 @@ public: { return std::count_if(results.begin(), results.end(), [type](search::Result const & r) { - return EqualClassifType(r.GetFeatureType(), type); + return r.IsSameType(type); }); } @@ -140,7 +134,7 @@ public: bool found = false; for (auto const & r : results) { - if (r.GetResultType() == search::Result::Type::Feature && EqualClassifType(r.GetFeatureType(), type)) + if (r.IsSameType(type)) { auto const & addr = r.GetAddress(); if ((street.empty() || addr.find(street) != std::string::npos) && @@ -440,9 +434,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Hilo_City) for (size_t i = 0; i < kResultsCount; ++i) { auto const & r = results[i]; - if (r.GetResultType() == search::Result::Type::Feature && - r.GetString() == "Hilo" && - EqualClassifType(r.GetFeatureType(), cityType)) + if (r.GetString() == "Hilo" && r.IsSameType(cityType)) { found = true; break; @@ -601,8 +593,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, UTH_Airport) for (size_t i = 0; i < 10; ++i) { auto const & r = results[i]; - if (r.GetResultType() == search::Result::Type::Feature && - EqualClassifType(r.GetFeatureType(), aeroportType)) + if (r.IsSameType(aeroportType)) { found = true; break;