Removed dummy debug parameter.

indexer/feature_visibility.cpp

@@ -102,32 +102,18 @@ namespace
     int m_scale;
     ClassifObject::FeatureGeoType m_ft;
     drule::KeysT & m_keys;
-#ifdef DEBUG
-    string & m_name;
-#endif
 
   public:
     DrawRuleGetter(int scale, feature::EGeomType ft,
-                  drule::KeysT & keys
-#ifdef DEBUG
-                   , string & name
-#endif
-                   )
+                  drule::KeysT & keys)
       : m_scale(scale), m_ft(ClassifObject::FeatureGeoType(ft)), m_keys(keys)
-#ifdef DEBUG
-    , m_name(name)
-#endif
     {
     }
 
     typedef bool ResultType;
 
-    void operator() (ClassifObject const * p)
+    void operator() (ClassifObject const *)
     {
-#ifdef DEBUG
-      if (!m_name.empty()) m_name += '-';
-      m_name += p->GetName();
-#endif
     }
     bool operator() (ClassifObject const * p, bool & res)
     {
@@ -139,24 +125,33 @@ namespace
 }
 
 pair<int, bool> GetDrawRule(FeatureBase const & f, int level,
-                            drule::KeysT & keys, string & names)
+                            drule::KeysT & keys)
 {
   feature::TypesHolder types(f);
 
   ASSERT ( keys.empty(), () );
   Classificator const & c = classif();
 
-  DrawRuleGetter doRules(level, types.GetGeoType(), keys
-#ifdef DEBUG
-                         , names
-#endif
-                         );
+  DrawRuleGetter doRules(level, types.GetGeoType(), keys);
   for (size_t i = 0; i < types.Size(); ++i)
     (void)c.ProcessObjects(types[i], doRules);
 
   return make_pair(types.GetGeoType(), types.Has(c.GetCoastType()));
 }
 
+void GetDrawRule(vector<uint32_t> const & types, int level, int geoType,
+                 drule::KeysT & keys)
+
+{
+  ASSERT ( keys.empty(), () );
+  Classificator const & c = classif();
+
+  DrawRuleGetter doRules(level, EGeomType(geoType), keys);
+
+  for (size_t i = 0; i < types.size(); ++i)
+    (void)c.ProcessObjects(types[i], doRules);
+}
+
 namespace
 {
   class IsDrawableChecker

indexer/feature_visibility.hpp

@@ -58,7 +58,9 @@ namespace feature
 
   /// @return (geometry type, is coastline)
   pair<int, bool> GetDrawRule(FeatureBase const & f, int level,
-                              drule::KeysT & keys, string & names);
+                              drule::KeysT & keys);
+  void GetDrawRule(vector<uint32_t> const & types, int level, int geoType,
+                   drule::KeysT & keys);
 
   /// Used to check whether user types belong to particular classificator set.
   class TypeSetChecker

map/benchmark_tool/features_loading.cpp

@@ -44,8 +44,7 @@ namespace
       m_timer.Reset();
 
       drule::KeysT keys;
-      string names;       // for debug use only, in release it's empty
-      (void)feature::GetDrawRule(ft, m_scale, keys, names);
+      (void)feature::GetDrawRule(ft, m_scale, keys);
 
       if (!keys.empty())
       {

map/feature_styler.cpp

@@ -52,8 +52,7 @@ namespace di
       m_rect(rect)
   {
     drule::KeysT keys;
-    string names;       // for debug use only, in release it's empty
-    pair<int, bool> type = feature::GetDrawRule(f, zoom, keys, names);
+    pair<int, bool> type = feature::GetDrawRule(f, zoom, keys);
 
     // don't try to do anything to invisible feature
     if (keys.empty())