[search] Load villages from villages min drawable scale while getting search result locality.

2 files changed, 31 insertions, 3 deletions

diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index c6c855f36a..4aefe7be4f 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -7,6 +7,7 @@
 
 #include "indexer/data_source.hpp"
 #include "indexer/feature_algo.hpp"
+#include "indexer/feature_visibility.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
 #include "base/assert.hpp"
@@ -117,6 +118,25 @@ private:
   LocalityFinder::Holder & m_holder;
   unordered_set<uint32_t> & m_loadedIds;
 };
+
+int GetVillagesScale()
+{
+  auto currentVillagesMinDrawableScale = 0;
+  ftypes::IsVillageChecker::Instance().ForEachType([&currentVillagesMinDrawableScale](uint32_t type)
+  {
+    feature::TypesHolder th;
+    th.Assign(type);
+    currentVillagesMinDrawableScale = max(currentVillagesMinDrawableScale, GetMinDrawableScaleClassifOnly(th));
+  });
+
+  // Needed for backward compatibility. |kCompatibilityVillagesMinDrawableScale| should be set to
+  // maximal value we have in mwms over all data versions.
+  int const kCompatibilityVillagesMinDrawableScale = 13;
+  ASSERT_LESS_OR_EQUAL(
+      currentVillagesMinDrawableScale, kCompatibilityVillagesMinDrawableScale,
+      ("Set kCompatibilityVillagesMinDrawableScale to", currentVillagesMinDrawableScale));
+  return max(currentVillagesMinDrawableScale, kCompatibilityVillagesMinDrawableScale);
+}
 }  // namespace
 
 // LocalityItem ------------------------------------------------------------------------------------
@@ -263,8 +283,9 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo
       if (!handle.IsAlive())
         return;
 
+      static int const scale = GetVillagesScale();
       MwmContext ctx(move(handle));
-      ctx.ForEachIndex(vrect,
+      ctx.ForEachIndex(vrect, scale,
                        LocalitiesLoader(ctx, m_boundariesTable, VillageFilter(ctx, m_villagesCache),
                                         m_villages, m_loadedIds));
     });
diff --git a/search/mwm_context.hpp b/search/mwm_context.hpp
index 5857342ccd..4d31746ca6 100644
--- a/search/mwm_context.hpp
+++ b/search/mwm_context.hpp
@@ -17,6 +17,7 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#include <utility>
 
 class MwmValue;
 
@@ -51,9 +52,15 @@ public:
   void ForEachIndex(m2::RectD const & rect, Fn && fn) const
   {
     uint32_t const scale = m_value.GetHeader().GetLastScale();
+    ForEachIndex(rect, scale, std::forward<Fn>(fn));
+  }
+
+  template <typename Fn>
+  void ForEachIndex(m2::RectD const & rect, uint32_t scale, Fn && fn) const
+  {
     covering::Intervals intervals;
-    CoverRect(rect, scale, intervals);
-    ForEachIndex(intervals, scale, forward<Fn>(fn));
+    CoverRect(rect, m_value.GetHeader().GetLastScale(), intervals);
+    ForEachIndex(intervals, scale, std::forward<Fn>(fn));
   }
 
   template <typename Fn>