Merge pull request #4390 from ygorshenin/fix-locality-finder

[search] Fixed locality matching code.

1 files changed, 4 insertions, 3 deletions

diff --git a/search/ranker.hpp b/search/ranker.hpp
index b4e0687315..0f1950f37b 100644
--- a/search/ranker.hpp
+++ b/search/ranker.hpp
@@ -34,6 +34,7 @@ class CountryInfoGetter;
 
 namespace search
 {
+class VillagesCache;
 class Emitter;
 class PreResult2Maker;
 
@@ -73,7 +74,7 @@ public:
 
   Ranker(Index const & index, storage::CountryInfoGetter const & infoGetter, Emitter & emitter,
          CategoriesHolder const & categories, vector<Suggest> const & suggests,
-         my::Cancellable const & cancellable);
+         VillagesCache & villagesCache, my::Cancellable const & cancellable);
   virtual ~Ranker() = default;
 
   void Init(Params const & params, Geocoder::Params const & geocoderParams);
@@ -97,7 +98,7 @@ public:
 
   void ClearCaches();
 
-  inline void SetLocalityFinderLanguage(int8_t code) { m_locality.SetLanguage(code); }
+  inline void SetLocalityFinderLanguage(int8_t code) { m_localities.SetLanguage(code); }
 
   inline void SetLanguage(pair<int, int> const & ind, int8_t lang)
   {
@@ -131,7 +132,7 @@ private:
   my::Cancellable const & m_cancellable;
   KeywordLangMatcher m_keywordsScorer;
 
-  mutable LocalityFinder m_locality;
+  mutable LocalityFinder m_localities;
 
   Index const & m_index;
   storage::CountryInfoGetter const & m_infoGetter;