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/feature_visibility.hpp | |
parent | 937250e21601d8ee5790b622543b3177a8c866a7 (diff) |
Removed duplicating enums.
Diffstat (limited to 'indexer/feature_visibility.hpp')
-rw-r--r-- | indexer/feature_visibility.hpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/indexer/feature_visibility.hpp b/indexer/feature_visibility.hpp index 0965991ecc..facb8c6723 100644 --- a/indexer/feature_visibility.hpp +++ b/indexer/feature_visibility.hpp @@ -1,6 +1,7 @@ #pragma once #include "drawing_rule_def.hpp" +#include "feature_decl.hpp" #include "../base/base.hpp" @@ -15,23 +16,13 @@ namespace feature { class TypesHolder; - /// @note do not change this values. Should be equal with EGeomType. - /// Used for checking visibility (by drawing style) for feature's geometry type - /// (for Area - check only area type, but can draw symbol or caption). - enum FeatureGeoType - { - FEATURE_TYPE_POINT = 0, - FEATURE_TYPE_LINE = 1, - FEATURE_TYPE_AREA = 2 - }; - bool IsDrawableAny(uint32_t type); bool IsDrawableForIndex(FeatureBase const & f, int level); /// For FEATURE_TYPE_AREA need to have at least one area-filling type. - bool IsDrawableLike(vector<uint32_t> const & types, FeatureGeoType ft); + bool IsDrawableLike(vector<uint32_t> const & types, EGeomType ft); /// For FEATURE_TYPE_AREA removes line-drawing only types. - bool RemoveNoDrawableTypes(vector<uint32_t> & types, FeatureGeoType ft); + bool RemoveNoDrawableTypes(vector<uint32_t> & types, EGeomType ft); //@} int GetMinDrawableScale(FeatureBase const & f); |