[omim] [indexer] Skip the buckets that are not allowed by classificator.

1 files changed, 26 insertions, 0 deletions

diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 7531bb9c87..2c06ca5eb8 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -288,6 +288,20 @@ bool IsDrawableForIndex(FeatureBase const & f, int level)
   return false;
 }
 
+bool IsDrawableForIndexClassifOnly(FeatureBase const & f, int level)
+{
+  Classificator const & c = classif();
+
+  TypesHolder const types(f);
+
+  IsDrawableChecker doCheck(level);
+  for (uint32_t t : types)
+    if (c.ProcessObjects(t, doCheck))
+      return true;
+
+  return false;
+}
+
 namespace
 {
   class IsNonDrawableType
@@ -339,6 +353,18 @@ int GetMinDrawableScale(FeatureBase const & f)
   return -1;
 }
 
+int GetMinDrawableScaleClassifOnly(FeatureBase const & f)
+{
+  int const upBound = scales::GetUpperStyleScale();
+
+  for (int level = 0; level <= upBound; ++level)
+    if (IsDrawableForIndexClassifOnly(f, level))
+      return level;
+
+  ASSERT(false, ("Feature is never visible."));
+  return -1;
+}
+
 namespace
 {
   void AddRange(pair<int, int> & dest, pair<int, int> const & src)