diff options
author | vng <viktor.govako@gmail.com> | 2013-12-02 17:28:54 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:08:10 +0300 |
commit | 7f710060e5e782ff19f9624bfdc4699759bb5a5b (patch) | |
tree | b6cf84129cca3e2c52a31e17cbe8170598e2cde0 /indexer/feature_visibility.cpp | |
parent | 867425921b83e4e13578f2550884806ad62947eb (diff) |
Removed dummy debug parameter.
Diffstat (limited to 'indexer/feature_visibility.cpp')
-rw-r--r-- | indexer/feature_visibility.cpp | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp index 4d9c09fcce..024947077f 100644 --- a/indexer/feature_visibility.cpp +++ b/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 |