From cb487d007aa60f63eb9892606fef486ef9210d3b Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Fri, 24 May 2019 16:29:10 +0300
Subject: [PATCH] [search] Add country name synonyms to
 downloaderSearchCallback.

---
 search/downloader_search_callback.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/search/downloader_search_callback.cpp b/search/downloader_search_callback.cpp
index b155049a8b..4bada121c7 100644
--- a/search/downloader_search_callback.cpp
+++ b/search/downloader_search_callback.cpp
@@ -20,6 +20,7 @@ namespace
 bool GetGroupCountryIdFromFeature(storage::Storage const & storage, FeatureType & ft,
                                   std::string & name)
 {
+  auto const & synonyms = storage.GetCountryNameSynonyms();
   int8_t const langIndices[] = {StringUtf8Multilang::kEnglishCode,
                                 StringUtf8Multilang::kDefaultCode,
                                 StringUtf8Multilang::kInternationalCode};
@@ -30,6 +31,13 @@ bool GetGroupCountryIdFromFeature(storage::Storage const & storage, FeatureType
       continue;
     if (storage.IsInnerNode(name))
       return true;
+    auto const it = synonyms.find(name);
+    if (it == synonyms.end())
+      continue;
+    if (!storage.IsInnerNode(it->second))
+      continue;
+    name = it->second;
+    return true;
   }
   return false;
 }