From 3b7be067e1572e827b7f4b6c609cec6a97f25db5 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:38:54 +0100
Subject: [PATCH] [search] Add main type to description

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 map/framework.cpp                     |  2 +-
 search/ranker.cpp                     |  2 +-
 search/result.cpp                     | 12 ++++++++----
 search/result.hpp                     |  3 ++-
 search/search_tests/results_tests.cpp |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index fa9901ed67..1b4c1b38d2 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2666,7 +2666,7 @@ bool Framework::ParseEditorDebugCommand(search::SearchParams const & params)
 
       search::Result res(feature::GetCenter(*ft), string(ft->GetReadableName()));
       res.SetAddress(std::move(edit.second));
-      res.FromFeature(fid, feature::TypesHolder(*ft).GetBestType(), {});
+      res.FromFeature(fid, feature::TypesHolder(*ft).GetBestType(), 0, {});
 
       results.AddResultNoChecks(std::move(res));
     }
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 26cfa590a1..bc9087837e 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -727,7 +727,7 @@ Result Ranker::MakeResult(RankerResult const & rankerResult, bool needAddress, b
   {
   case RankerResult::Type::Feature:
   case RankerResult::Type::Building:
-    res.FromFeature(rankerResult.GetID(), rankerResult.GetBestType(&m_params.m_preferredTypes), rankerResult.m_details);
+    res.FromFeature(rankerResult.GetID(), rankerResult.GetBestType(), rankerResult.GetBestType(&m_params.m_preferredTypes), rankerResult.m_details);
     break;
   case RankerResult::Type::LatLon: res.SetType(Result::Type::LatLon); break;
   case RankerResult::Type::Postcode: res.SetType(Result::Type::Postcode); break;
diff --git a/search/result.cpp b/search/result.cpp
index 93e0492639..ef54d37273 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -18,11 +18,12 @@ namespace search
 {
 using namespace std;
 
-void Result::FromFeature(FeatureID const & id, uint32_t featureType, Details const & details)
+void Result::FromFeature(FeatureID const & id, uint32_t mainType, uint32_t featureType, Details const & details)
 {
   m_id = id;
   ASSERT(m_id.IsValid(), ());
 
+  m_mainType = mainType;
   m_featureType = featureType;
   m_details = details;
   m_resultType = Type::Feature;
@@ -64,7 +65,7 @@ FeatureID const & Result::GetFeatureID() const
 uint32_t Result::GetFeatureType() const
 {
   ASSERT_EQUAL(m_resultType, Type::Feature, ());
-  return m_featureType;
+  return m_mainType;
 }
 
 std::string GetLocalizedTypeName(uint32_t type)
@@ -75,7 +76,7 @@ std::string GetLocalizedTypeName(uint32_t type)
 std::string Result::GetLocalizedFeatureType() const
 {
   ASSERT_EQUAL(m_resultType, Type::Feature, ());
-  return GetLocalizedTypeName(m_featureType);
+  return GetLocalizedTypeName(m_mainType);
 }
 
 std::string Result::GetFeatureDescription() const
@@ -90,7 +91,10 @@ std::string Result::GetFeatureDescription() const
     featureDescription += sv;
   };
   
-  append(GetLocalizedTypeName(m_featureType));
+  append(GetLocalizedTypeName(m_mainType));
+  
+  if (m_mainType != m_featureType && m_featureType != 0)
+    append(GetLocalizedTypeName(m_featureType));
   
   if (!GetDescription().empty())
     append(GetDescription());
diff --git a/search/result.hpp b/search/result.hpp
index 0cae031be9..11071679cf 100644
--- a/search/result.hpp
+++ b/search/result.hpp
@@ -59,7 +59,7 @@ public:
   static auto constexpr kPopularityHighPriorityMinDistance = 50000.0;
 
   Result(m2::PointD const & pt, std::string const & name) : m_center(pt), m_str(name) {}
-  void FromFeature(FeatureID const & id, uint32_t featureType, Details const & details);
+  void FromFeature(FeatureID const & id, uint32_t mainType, uint32_t featureType, Details const & details);
 
   void SetAddress(std::string && address) { m_address = std::move(address); }
   void SetType(Result::Type type) { m_resultType = type; }
@@ -148,6 +148,7 @@ private:
   m2::PointD m_center;
   std::string m_str;
   std::string m_address;
+  uint32_t m_mainType = 0;
   uint32_t m_featureType = 0;
   std::string m_suggestionStr;
   buffer_vector<std::pair<uint16_t, uint16_t>, 4> m_hightlightRanges;
diff --git a/search/search_tests/results_tests.cpp b/search/search_tests/results_tests.cpp
index 7edafb1a3b..26505fba33 100644
--- a/search/search_tests/results_tests.cpp
+++ b/search/search_tests/results_tests.cpp
@@ -18,7 +18,7 @@ UNIT_TEST(Results_Sorting)
   for (uint32_t i = 5; i != 0; --i)
   {
     search::Result res(m2::PointD::Zero(), {});
-    res.FromFeature({id, i}, 0, {});
+    res.FromFeature({id, i}, 0, 0, {});
     r.AddResultNoChecks(std::move(res));
   }