From 1445c1e02bd262da5b8ed7a61033eb9c9859c106 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 1 Oct 2024 23:54:09 -0300
Subject: [PATCH] [search] Added sra/ntra synonyms.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 search/query_params.cpp                       | 20 ++++++++++++++-----
 .../search_quality_tests/real_mwm_tests.cpp   | 16 +++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/search/query_params.cpp b/search/query_params.cpp
index f8938de618..69375f6e4d 100644
--- a/search/query_params.cpp
+++ b/search/query_params.cpp
@@ -24,9 +24,17 @@ map<string, vector<string>> const kSynonyms = {
     {"ne",   {"northeast"}},
     {"sw",   {"southwest"}},
     {"se",   {"southeast"}},
+
+    /// @todo Should not duplicate Street synonyms defined in StreetsSynonymsHolder (avoid useless double queries).
+    /// Remove "street" and "avenue" here, but should update GetNameScore.
     {"st",   {"saint", "street"}},
     {"dr",   {"doctor"}},
 
+    // widely used in LATAM, like "Ntra Sra Asuncion Zelaya"
+    {"ntra",  {"nuestra"}},
+    {"sra",   {"senora"}},
+    {"sta",   {"santa"}},
+
     {"al",    {"allee", "alle"}},
     {"ave",   {"avenue"}},
     /// @todo Should process synonyms with errors like "blvrd" -> "blvd".
@@ -203,19 +211,21 @@ void QueryParams::AddSynonyms()
   {
     string const ss = ToUtf8(MakeLowerCase(token.GetOriginal()));
     auto const it = kSynonyms.find(ss);
-    if (it == kSynonyms.end())
-      continue;
-
-    for (auto const & synonym : it->second)
-      token.AddSynonym(synonym);
+    if (it != kSynonyms.end())
+    {
+      for (auto const & synonym : it->second)
+        token.AddSynonym(synonym);
+    }
   }
   if (m_hasPrefix)
   {
     string const ss = ToUtf8(MakeLowerCase(m_prefixToken.GetOriginal()));
     auto const it = kSynonyms.find(ss);
     if (it != kSynonyms.end())
+    {
       for (auto const & synonym : it->second)
         m_prefixToken.AddSynonym(synonym);
+    }
   }
 }
 
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 6a5b5e507c..f5ccd39646 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -1432,4 +1432,20 @@ UNIT_CLASS_TEST(MwmTestsFixture, CompleteSearch_DistantMWMs)
   }
 }
 
+UNIT_CLASS_TEST(MwmTestsFixture, Synonyms)
+{
+  // Buenos Aires
+  ms::LatLon const center(-34.6073377, -58.4432843);
+  SetViewportAndLoadMaps(center);
+
+  {
+    auto request = MakeRequest("ntra sra de asuncion zelaya");
+    auto const & results = request->Results();
+    TEST_GREATER(results.size(), kPopularPoiResultsCount, ());
+
+    TEST_EQUAL(results[0].GetFeatureType(), classif().GetTypeByPath({"landuse", "residential"}), ());
+    TEST_EQUAL(results[0].GetString(), "Barrio Nuestra Señora de la Asunción", ());
+  }
+}
+
 } // namespace real_mwm_tests