From 1346d5fb2685e74daba5fe6be9bbd2d6cca576ed Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Fri, 9 Sep 2022 10:16:20 +0300
Subject: [PATCH] =?UTF-8?q?[search]=20Decrease=20score=20for=20numeric=20s?=
 =?UTF-8?q?treets=20like=20"2-=D0=B9=20...".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 search/ranker.cpp                             | 12 +++++++
 search/ranking_info.cpp                       |  2 +-
 .../search_quality_tests/real_mwm_tests.cpp   | 35 +++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/search/ranker.cpp b/search/ranker.cpp
index 7e3dffccc8..0c9bb00a92 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -385,8 +385,20 @@ public:
     InitRankingInfo(*ft, center, preResult, info);
 
     if (info.m_type == Model::TYPE_STREET)
+    {
       info.m_classifType.street = m_wayChecker.GetSearchRank(res.GetBestType());
 
+      /// @see Arbat_Address test.
+      // "2" is a NameScore::FULL_PREFIX for "2-й Обыденский переулок", which is *very* high,
+      // and suppresses building's rank, matched by house number.
+      if (info.m_nameScore > NameScore::SUBSTRING)
+      {
+        auto const & range = info.m_tokenRanges[info.m_type];
+        if (range.Size() == 1 && m_params.IsNumberTokens(range))
+          info.m_nameScore = NameScore::SUBSTRING;
+      }
+    }
+
     info.m_rank = NormalizeRank(info.m_rank, info.m_type, center, country,
                                 m_capitalChecker(*ft), !info.m_allTokensUsed);
 
diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp
index 23b278fb76..502ae6a2b6 100644
--- a/search/ranking_info.cpp
+++ b/search/ranking_info.cpp
@@ -55,7 +55,7 @@ static_assert(std::size(kNameScore) == static_cast<size_t>(NameScore::COUNT));
 double constexpr kType[] = {
   0,          // POI
   0,          // Complex POI
-  0,          // Building
+  0.007,      // Building, to compensate max(kStreetType)
   0,          // Street
   0,          // Suburb
  -0.02,       // Unclassified
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 458808bc02..ffbd123232 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -392,4 +392,39 @@ UNIT_CLASS_TEST(MwmTestsFixture, Hilo_City)
 
   TEST(found, (results));
 }
+
+// https://github.com/organicmaps/organicmaps/issues/3266
+// Moscow has suburb "Арбат" and many streets, starting from number (2-й Обыденский), (4-й Голутвинский) inside.
+// So "Арбат 2" is a _well-ranked_ street result like [Suburb full match, Street full prefix],
+// but we obviously expect the building "улица Арбат 2 с/1", which is a _low-ranked_ substring.
+UNIT_CLASS_TEST(MwmTestsFixture, Arbat_Address)
+{
+  // Moscow, Arbat
+  ms::LatLon const center(55.74988, 37.59240);
+  SetViewportAndLoadMaps(center);
+
+  for (auto const & query : {"Арбат 2", "Арбат 4"})
+  {
+    auto request = MakeRequest(query);
+    auto const & results = request->Results();
+    size_t constexpr kResultsCount = 3;   // Building should be at the top.
+    TEST_GREATER(results.size(), kResultsCount, ());
+
+    auto const buildingType = classif().GetTypeByPath({"building"});
+
+    bool found = false;
+    for (size_t i = 0; i < kResultsCount; ++i)
+    {
+      auto const & r = results[i];
+      if (r.GetResultType() == search::Result::Type::Feature &&
+          EqualClassifType(r.GetFeatureType(), buildingType))
+      {
+        found = true;
+        break;
+      }
+    }
+
+    TEST(found, (results));
+  }
+}
 } // namespace real_mwm_tests