From 28b42affe3f1f37a9e1c7b2331cefee69897d66f Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 18 Jan 2024 12:44:48 -0300
Subject: [PATCH] [search] Fixed categorial rank.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 search/features_layer_matcher.hpp | 3 +--
 search/geocoder.cpp               | 2 +-
 search/model.hpp                  | 1 +
 search/ranker.cpp                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index 3cba9854b6..714baa97ca 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -91,8 +91,7 @@ public:
       MatchPOIsWithParent(child, parent, fn);
       break;
     case Model::TYPE_STREET:
-      ASSERT(Model::IsPoi(child.m_type) || child.m_type == Model::TYPE_BUILDING,
-             ("Invalid child layer type:", child.m_type));
+      ASSERT(Model::IsPoiOrBuilding(child.m_type), ("Invalid child layer type:", child.m_type));
       if (Model::IsPoi(child.m_type))
         MatchPOIsWithStreets(child, parent, fn);
       else
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 18b1503163..b3654f17e4 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -1783,7 +1783,7 @@ void Geocoder::TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::Mwm
 {
   SCOPE_GUARD(emitParse, [&]() { tracer.EmitParse(ctx.m_tokens); });
 
-  if (!Model::IsPoi(type) && type != Model::TYPE_BUILDING)
+  if (!Model::IsPoiOrBuilding(type))
     return;
 
   if (mwmId != m_context->GetId())
diff --git a/search/model.hpp b/search/model.hpp
index 8b6b41ea29..cd2d6a94ab 100644
--- a/search/model.hpp
+++ b/search/model.hpp
@@ -56,6 +56,7 @@ public:
   }
 
   static bool IsPoi(Type const type) { return type == TYPE_SUBPOI || type == TYPE_COMPLEX_POI; }
+  static bool IsPoiOrBuilding(Type const type) { return IsPoi(type) || type == TYPE_BUILDING; }
 
   Type GetType(FeatureType & feature) const;
 };
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 63b3aea526..c5a14b1544 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -363,7 +363,7 @@ public:
           info.m_nameScore = NameScore::SUBSTRING;
       }
     }
-    else if (m_params.IsCategorialRequest() && Model::IsPoi(info.m_type))
+    else if (m_params.IsCategorialRequest() && Model::IsPoiOrBuilding(info.m_type))
     {
       // Update info.m_classifType.poi with the _best preferred_ type. Important for categorial request,
       // when the Feature maybe a restaurant and a toilet simultaneously.