pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[indexer] enums renaming, review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-04-17 16:35:22 +03:00 • committed by Tatiana Yan
parent 9ede0dbd11
commit c04b52489c
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/stylist.cpp
View file

@ -63,7 +63,7 @@ inline bool IsTypeOf(drule::Key const & key, int flags)
bool IsMiddleTunnel(int const layer, double const depth)
{
return layer != feature::LAYER_FLAGS_EMPTY && depth < 19000;
return layer != feature::LAYER_EMPTY && depth < 19000;
}
class Aggregator
@ -136,8 +136,8 @@ private:
void Init()
{
m_depthLayer = m_f.GetLayer();
if (m_depthLayer == feature::LAYER_FLAGS_TRANSPARENT_TUNNEL)
m_depthLayer = feature::LAYER_FLAGS_EMPTY;
if (m_depthLayer == feature::LAYER_TRANSPARENT_TUNNEL)
m_depthLayer = feature::LAYER_EMPTY;
if (m_geomType == feature::GeomType::Point)
m_priorityModifier = (double)m_f.GetPopulation() / 7E9;

2
indexer/feature_data.cpp
View file

@ -206,7 +206,7 @@ bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
bool FeatureParamsBase::CheckValid() const
{
CHECK(layer > LAYER_FLAGS_LOW && layer < LAYER_FLAGS_HIGH, ());
CHECK(layer > LAYER_LOW && layer < LAYER_HIGH, ());
return true;
}

10
indexer/feature_data.hpp
View file

@ -42,14 +42,14 @@ namespace feature
static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1;
enum LayerFlags
enum Layer
{
LAYER_FLAGS_LOW = -11,
LAYER_LOW = -11,
LAYER_FLAGS_EMPTY = 0,
LAYER_FLAGS_TRANSPARENT_TUNNEL = 11,
LAYER_EMPTY = 0,
LAYER_TRANSPARENT_TUNNEL = 11,
LAYER_FLAGS_HIGH = 12
LAYER_HIGH = 12
};
class TypesHolder