[search] Fixed streets matching.

1 files changed, 23 insertions, 0 deletions

diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp
index 24aaaa3764..ade404f93d 100644
--- a/indexer/search_string_utils.cpp
+++ b/indexer/search_string_utils.cpp
@@ -223,4 +223,27 @@ bool ContainsNormalized(string const & str, string const & substr)
   UniString const usubstr = NormalizeAndSimplifyString(substr);
   return std::search(ustr.begin(), ustr.end(), usubstr.begin(), usubstr.end()) != ustr.end();
 }
+
+// StreetTokensFilter ------------------------------------------------------------------------------
+void StreetTokensFilter::Put(strings::UniString const & token, bool isPrefix, size_t tag)
+{
+  if ((isPrefix && IsStreetSynonymPrefix(token)) || (!isPrefix && IsStreetSynonym(token)))
+  {
+    ++m_numSynonyms;
+    if (m_numSynonyms == 1)
+    {
+      m_delayedToken = token;
+      m_delayedTag = tag;
+    }
+    else
+    {
+      EmitToken(m_delayedToken, m_delayedTag);
+      EmitToken(token, tag);
+    }
+  }
+  else
+  {
+    EmitToken(token, tag);
+  }
+}
 } // namespace search