[indexer] enums renaming, review fixes

5 files changed, 34 insertions, 35 deletions

diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index c73798de9c..5e48ddfef4 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -249,8 +249,8 @@ FeatureType::FeatureType(osm::MapObject const & emo)
 feature::GeomType FeatureType::GetGeomType() const
 {
   // FeatureType::FeatureType(osm::MapObject const & emo) expects
-  // that GeomType::Undefined is never be returned.
-  auto const headerGeomType = static_cast<HeaderGeomType>(m_header & HEADER_GEOMTYPE_MASK);
+  // that GeomType::Undefined is never returned.
+  auto const headerGeomType = static_cast<HeaderGeomType>(m_header & HEADER_MASK_GEOMTYPE);
   switch (headerGeomType)
   {
   case HeaderGeomType::Line: return GeomType::Line;
@@ -321,7 +321,7 @@ m2::PointD FeatureType::GetCenter()
 
 int8_t FeatureType::GetLayer()
 {
-  if ((m_header & feature::HEADER_HAS_LAYER) == 0)
+  if ((m_header & feature::HEADER_MASK_HAS_LAYER) == 0)
     return 0;
 
   ParseCommon();
@@ -338,7 +338,7 @@ void FeatureType::ParseHeader2()
 
   uint8_t ptsCount = 0, ptsMask = 0, trgCount = 0, trgMask = 0;
   BitSource bitSource(m_data + m_offsets.m_header2);
-  auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_GEOMTYPE_MASK);
+  auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
 
   if (headerGeomType == HeaderGeomType::Line)
   {
@@ -422,7 +422,7 @@ uint32_t FeatureType::ParseGeometry(int scale)
     CHECK(m_loadInfo, ());
     ParseHeader2();
 
-    auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_GEOMTYPE_MASK);
+    auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
     if (headerGeomType == HeaderGeomType::Line)
     {
       size_t const count = m_points.size();
@@ -481,7 +481,7 @@ uint32_t FeatureType::ParseTriangles(int scale)
     CHECK(m_loadInfo, ());
     ParseHeader2();
 
-    auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_GEOMTYPE_MASK);
+    auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
     if (headerGeomType == HeaderGeomType::Area)
     {
       if (m_triangles.empty())
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 13b178f498..246ef230e8 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -40,9 +40,9 @@ public:
   feature::GeomType GetGeomType() const;
   FeatureParamsBase & GetParams() { return m_params; }
 
-  uint8_t GetTypesCount() const { return (m_header & feature::HEADER_TYPE_MASK) + 1; }
+  uint8_t GetTypesCount() const { return (m_header & feature::HEADER_MASK_TYPE) + 1; }
 
-  bool HasName() const { return (m_header & feature::HEADER_HAS_NAME) != 0; }
+  bool HasName() const { return (m_header & feature::HEADER_MASK_HAS_NAME) != 0; }
   StringUtf8Multilang const & GetNames();
 
   m2::PointD GetCenter();
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 9289f55adc..09aa39380d 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -138,10 +138,10 @@ uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeom
   uint8_t header = static_cast<uint8_t>(typesCount - 1);
 
   if (!params.name.IsEmpty())
-    header |= HEADER_HAS_NAME;
+    header |= HEADER_MASK_HAS_NAME;
 
   if (params.layer != 0)
-    header |= HEADER_HAS_LAYER;
+    header |= HEADER_MASK_HAS_LAYER;
 
   header |= static_cast<uint8_t>(headerGeomType);
 
@@ -150,16 +150,16 @@ uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeom
   {
   case HeaderGeomType::Point:
     if (params.rank != 0)
-      header |= HEADER_HAS_ADDINFO;
+      header |= HEADER_MASK_HAS_ADDINFO;
     break;
   case HeaderGeomType::Line:
     if (!params.ref.empty())
-      header |= HEADER_HAS_ADDINFO;
+      header |= HEADER_MASK_HAS_ADDINFO;
     break;
   case HeaderGeomType::Area:
   case HeaderGeomType::PointEx:
     if (!params.house.IsEmpty())
-      header |= HEADER_HAS_ADDINFO;
+      header |= HEADER_MASK_HAS_ADDINFO;
     break;
   }
 
@@ -206,7 +206,7 @@ bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
 
 bool FeatureParamsBase::CheckValid() const
 {
-   CHECK(layer > LAYER_LOW && layer < LAYER_HIGH, ());
+   CHECK(layer > LAYER_FLAGS_LOW && layer < LAYER_FLAGS_HIGH, ());
    return true;
 }
 
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 0613fc9d23..6b824f23c7 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -24,11 +24,11 @@ namespace feature
 {
   enum HeaderMask
   {
-    HEADER_TYPE_MASK = 7U,
-    HEADER_HAS_NAME = 1U << 3,
-    HEADER_HAS_LAYER = 1U << 4,
-    HEADER_GEOMTYPE_MASK = 3U << 5,
-    HEADER_HAS_ADDINFO = 1U << 7
+    HEADER_MASK_TYPE = 7U,
+    HEADER_MASK_HAS_NAME = 1U << 3,
+    HEADER_MASK_HAS_LAYER = 1U << 4,
+    HEADER_MASK_GEOMTYPE = 3U << 5,
+    HEADER_MASK_HAS_ADDINFO = 1U << 7
   };
 
   enum class HeaderGeomType : uint8_t
@@ -40,16 +40,16 @@ namespace feature
     PointEx = 3U << 5  /// point feature (addinfo = house)
   };
 
-  static constexpr int kMaxTypesCount = HEADER_TYPE_MASK + 1;
+  static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1;
 
   enum LayerFlags
   {
-    LAYER_LOW = -11,
+    LAYER_FLAGS_LOW = -11,
 
-    LAYER_EMPTY = 0,
-    LAYER_TRANSPARENT_TUNNEL = 11,
+    LAYER_FLAGS_EMPTY = 0,
+    LAYER_FLAGS_TRANSPARENT_TUNNEL = 11,
 
-    LAYER_HIGH = 12
+    LAYER_FLAGS_HIGH = 12
   };
 
   class TypesHolder
@@ -154,15 +154,15 @@ struct FeatureParamsBase
   {
     using namespace feature;
 
-    if (header & HEADER_HAS_NAME)
+    if (header & HEADER_MASK_HAS_NAME)
       name.Write(sink);
 
-    if (header & HEADER_HAS_LAYER)
+    if (header & HEADER_MASK_HAS_LAYER)
       WriteToSink(sink, layer);
 
-    if (header & HEADER_HAS_ADDINFO)
+    if (header & HEADER_MASK_HAS_ADDINFO)
     {
-      auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_GEOMTYPE_MASK);
+      auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_MASK_GEOMTYPE);
       switch (headerGeomType)
       {
       case HeaderGeomType::Point:
@@ -184,15 +184,15 @@ struct FeatureParamsBase
   {
     using namespace feature;
 
-    if (header & HEADER_HAS_NAME)
+    if (header & HEADER_MASK_HAS_NAME)
       name.Read(src);
 
-    if (header & HEADER_HAS_LAYER)
+    if (header & HEADER_MASK_HAS_LAYER)
       layer = ReadPrimitiveFromSource<int8_t>(src);
 
-    if (header & HEADER_HAS_ADDINFO)
+    if (header & HEADER_MASK_HAS_ADDINFO)
     {
-      auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_GEOMTYPE_MASK);
+      auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_MASK_GEOMTYPE);
       switch (headerGeomType)
       {
       case HeaderGeomType::Point:
@@ -317,9 +317,9 @@ public:
     using namespace feature;
 
     uint8_t const header = ReadPrimitiveFromSource<uint8_t>(src);
-    m_geomType = static_cast<feature::HeaderGeomType>(header & HEADER_GEOMTYPE_MASK);
+    m_geomType = static_cast<feature::HeaderGeomType>(header & HEADER_MASK_GEOMTYPE);
 
-    size_t const count = (header & HEADER_TYPE_MASK) + 1;
+    size_t const count = (header & HEADER_MASK_TYPE) + 1;
     for (size_t i = 0; i < count; ++i)
       m_types.push_back(GetTypeForIndex(ReadVarUint<uint32_t>(src)));
 
diff --git a/indexer/feature_decl.hpp b/indexer/feature_decl.hpp
index bd09450f0a..4de877b396 100644
--- a/indexer/feature_decl.hpp
+++ b/indexer/feature_decl.hpp
@@ -10,7 +10,6 @@ namespace feature
 enum class GeomType
 {
   Undefined = -1,
-  // Note! do not change this values. Should be equal with FeatureGeoType.
   Point = 0,
   Line = 1,
   Area = 2