Add founded locality as a result if no other tokens to search.

2 files changed, 7 insertions, 1 deletions

diff --git a/search/search_query.cpp b/search/search_query.cpp
index 9ecc0bac9d..a81faee681 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -899,6 +899,11 @@ void Query::SearchAddress()
           SearchFeatures(params, mwmInfo, ADDRESS_RECT_ID);
           m_worldSearch = b;
         }
+        else
+        {
+          // Add founded locality as a result if nothing left to match.
+          AddResultFromTrie(loc.m_value, mwmId);
+        }
       }
       return;
     }
diff --git a/search/search_query.hpp b/search/search_query.hpp
index 973bd953d4..cf6eaec866 100644
--- a/search/search_query.hpp
+++ b/search/search_query.hpp
@@ -103,7 +103,8 @@ private:
                              OffsetsVectorT & offsets);
   void ClearCache(size_t ind);
 
-  void AddResultFromTrie(TrieValueT const & val, size_t mwmID, int viewportID);
+  /// @param[in]  viewportID  @see m_viewport
+  void AddResultFromTrie(TrieValueT const & val, size_t mwmID, int viewportID = -1);
 
   void FlushResults(Results & res, void (Results::*pAddFn)(Result const &));