Review fixes.

1 files changed, 8 insertions, 8 deletions

diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 2c06ca5eb8..3bb29a993f 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -272,20 +272,20 @@ bool IsDrawableLike(vector<uint32_t> const & types, EGeomType ft)
 
 bool IsDrawableForIndex(FeatureBase const & f, int level)
 {
+  return IsDrawableForIndexGeometryOnly(f, level) && IsDrawableForIndexClassifOnly(f, level);
+}
+
+bool IsDrawableForIndexGeometryOnly(FeatureBase const & f, int level)
+{
   Classificator const & c = classif();
 
   TypesHolder const types(f);
 
-  if (types.GetGeoType() == GEOM_AREA && !types.Has(c.GetCoastType()))
-    if (!scales::IsGoodForLevel(level, f.GetLimitRect()))
+  if (types.GetGeoType() == GEOM_AREA && !types.Has(c.GetCoastType()) &&
+      !scales::IsGoodForLevel(level, f.GetLimitRect()))
       return false;
 
-  IsDrawableChecker doCheck(level);
-  for (uint32_t t : types)
-    if (c.ProcessObjects(t, doCheck))
-      return true;
-
-  return false;
+  return true;
 }
 
 bool IsDrawableForIndexClassifOnly(FeatureBase const & f, int level)