From 1b6cf3260546fd25d112c432cd99400f3d5f0bb3 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Tue, 7 Jul 2020 17:50:30 +0300
Subject: [PATCH] [search] Use alt_name and old_name.

---
 search/processor.cpp                          |  4 ++++
 .../processor_test.cpp                        | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/search/processor.cpp b/search/processor.cpp
index 1c76f2c943..650695ec29 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -77,6 +77,7 @@ enum LanguageTier
   LANGUAGE_TIER_INPUT,
   LANGUAGE_TIER_EN_AND_INTERNATIONAL,
   LANGUAGE_TIER_DEFAULT,
+  LANGUAGE_TIER_ALT_AND_OLD,
   LANGUAGE_TIER_COUNT
 };
 
@@ -177,6 +178,9 @@ Processor::Processor(DataSource const & dataSource, CategoriesHolder const & cat
       {StringUtf8Multilang::kInternationalCode, StringUtf8Multilang::kEnglishCode});
   m_keywordsScorer.SetLanguages(LanguageTier::LANGUAGE_TIER_DEFAULT,
                                 {StringUtf8Multilang::kDefaultCode});
+  m_keywordsScorer.SetLanguages(
+      LanguageTier::LANGUAGE_TIER_ALT_AND_OLD,
+      {StringUtf8Multilang::kAltNameCode, StringUtf8Multilang::kOldNameCode});
 
   SetPreferredLocale("en");
 }
diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp
index 61e8c9bf70..87d95b2660 100644
--- a/search/search_integration_tests/processor_test.cpp
+++ b/search/search_integration_tests/processor_test.cpp
@@ -2978,5 +2978,25 @@ UNIT_CLASS_TEST(ProcessorTest, SimilarLanguage)
   // ko is in language list if query locale is ko.
   testLanguage("ko", "지유가오카", true);
 }
+
+UNIT_CLASS_TEST(ProcessorTest, AltAndOldName)
+{
+  string const countryName = "Wonderland";
+
+  TestMultilingualPOI poi(m2::PointD(0.0, 0.0), "default",
+                          {{"en", "english"}, {"alt_name", "alternative"}, {"old_name", "old"}});
+
+  auto wonderlandId =
+      BuildCountry(countryName, [&](TestMwmBuilder & builder) { builder.Add(poi); });
+
+  SetViewport(m2::RectD(-1, -1, 1, 1));
+  {
+    Rules rules{ExactMatch(wonderlandId, poi)};
+    TEST(ResultsMatch("default", rules), ());
+    TEST(ResultsMatch("english", rules), ());
+    TEST(ResultsMatch("alternative", rules), ());
+    TEST(ResultsMatch("old", rules), ());
+  }
+}
 }  // namespace
 }  // namespace search