diff options
| author | vng <viktor.govako@gmail.com> | 2014-10-01 16:50:36 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:29:13 +0300 |
| commit | 730f0078ae99993ac440e20bc254ccc2835c90d3 (patch) | |
| tree | a28acd624e6c6d6b2bd15e912d8a4f2460ccf4c0 /indexer/classificator.cpp | |
| parent | 937250e21601d8ee5790b622543b3177a8c866a7 (diff) | |
Removed duplicating enums.
Diffstat (limited to 'indexer/classificator.cpp')
| -rw-r--r-- | indexer/classificator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp index 1fd02b0b8b..d74ae3d903 100644 --- a/indexer/classificator.cpp +++ b/indexer/classificator.cpp @@ -273,9 +273,9 @@ namespace }; } -void ClassifObject::GetSuitable(int scale, FeatureGeoType ft, drule::KeysT & keys) const +void ClassifObject::GetSuitable(int scale, feature::EGeomType ft, drule::KeysT & keys) const { - ASSERT ( ft <= FEATURE_TYPE_AREA, () ); + ASSERT(ft >= 0 && ft <= 2, ()); // 2. Check visibility criterion for scale first. if (!m_visibility[scale]) @@ -296,14 +296,14 @@ bool ClassifObject::IsDrawableAny() const return (m_visibility != visible_mask_t() && !m_drawRule.empty()); } -bool ClassifObject::IsDrawableLike(FeatureGeoType ft) const +bool ClassifObject::IsDrawableLike(feature::EGeomType ft) const { + ASSERT(ft >= 0 && ft <= 2, ()); + // check the very common criterion first if (!IsDrawableAny()) return false; - ASSERT ( ft <= FEATURE_TYPE_AREA, () ); - static const int visible[3][drule::count_of_rules] = { {0, 0, 1, 1, 1, 0, 0}, // fpoint {1, 0, 0, 0, 0, 1, 0}, // fline |