[search] Decrease score for numeric streets like "2-й ...".

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

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);
 

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

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