From 5c46ed8c97463cccb5f4265ae30644ce3b2ee917 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 17 Apr 2019 14:40:26 +0300 Subject: [PATCH] [indexer] naming fixes for feature::EHeaderMask, feature::EHeaderMask::HEADER_GEOTYPE_MASK, feature::ELayerFlags, FeatureType::GetTriangesAsPoints --- editor/edits_migration.cpp | 2 +- indexer/feature.cpp | 10 +++++----- indexer/feature.hpp | 2 +- indexer/feature_data.hpp | 12 ++++++------ indexer/map_object.cpp | 2 +- search/street_vicinity_loader.cpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/editor/edits_migration.cpp b/editor/edits_migration.cpp index c5967136f6..e8b322091f 100644 --- a/editor/edits_migration.cpp +++ b/editor/edits_migration.cpp @@ -67,7 +67,7 @@ FeatureID MigrateWayOrRelatonFeatureIndex( if (ft.GetGeomType() != feature::GeomType::Area) return; ++count; - auto ftGeometry = ft.GetTriangesAsPoints(FeatureType::BEST_GEOMETRY); + auto ftGeometry = ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY); double score = 0.0; try diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 52e33e5c09..c73798de9c 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -250,7 +250,7 @@ feature::GeomType FeatureType::GetGeomType() const { // FeatureType::FeatureType(osm::MapObject const & emo) expects // that GeomType::Undefined is never be returned. - auto const headerGeomType = static_cast(m_header & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(m_header & HEADER_GEOMTYPE_MASK); switch (headerGeomType) { case HeaderGeomType::Line: return GeomType::Line; @@ -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(Header(m_data) & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(Header(m_data) & HEADER_GEOMTYPE_MASK); if (headerGeomType == HeaderGeomType::Line) { @@ -422,7 +422,7 @@ uint32_t FeatureType::ParseGeometry(int scale) CHECK(m_loadInfo, ()); ParseHeader2(); - auto const headerGeomType = static_cast(Header(m_data) & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(Header(m_data) & HEADER_GEOMTYPE_MASK); 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(Header(m_data) & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(Header(m_data) & HEADER_GEOMTYPE_MASK); if (headerGeomType == HeaderGeomType::Area) { if (m_triangles.empty()) @@ -636,7 +636,7 @@ m2::PointD const & FeatureType::GetPoint(size_t i) const return m_points[i]; } -vector FeatureType::GetTriangesAsPoints(int scale) +vector FeatureType::GetTrianglesAsPoints(int scale) { ParseTriangles(scale); return {m_triangles.begin(), m_triangles.end()}; diff --git a/indexer/feature.hpp b/indexer/feature.hpp index d95dfe46e2..13b178f498 100644 --- a/indexer/feature.hpp +++ b/indexer/feature.hpp @@ -70,7 +70,7 @@ public: int8_t GetLayer(); - std::vector GetTriangesAsPoints(int scale); + std::vector GetTrianglesAsPoints(int scale); void SetID(FeatureID const & id) { m_id = id; } FeatureID const & GetID() const { return m_id; } diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp index 4f578321c0..0613fc9d23 100644 --- a/indexer/feature_data.hpp +++ b/indexer/feature_data.hpp @@ -22,12 +22,12 @@ class FeatureType; namespace feature { - enum EHeaderMask + enum HeaderMask { HEADER_TYPE_MASK = 7U, HEADER_HAS_NAME = 1U << 3, HEADER_HAS_LAYER = 1U << 4, - HEADER_GEOTYPE_MASK = 3U << 5, + HEADER_GEOMTYPE_MASK = 3U << 5, HEADER_HAS_ADDINFO = 1U << 7 }; @@ -42,7 +42,7 @@ namespace feature static constexpr int kMaxTypesCount = HEADER_TYPE_MASK + 1; - enum ELayerFlags + enum LayerFlags { LAYER_LOW = -11, @@ -162,7 +162,7 @@ struct FeatureParamsBase if (header & HEADER_HAS_ADDINFO) { - auto const headerGeomType = static_cast(header & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(header & HEADER_GEOMTYPE_MASK); switch (headerGeomType) { case HeaderGeomType::Point: @@ -192,7 +192,7 @@ struct FeatureParamsBase if (header & HEADER_HAS_ADDINFO) { - auto const headerGeomType = static_cast(header & HEADER_GEOTYPE_MASK); + auto const headerGeomType = static_cast(header & HEADER_GEOMTYPE_MASK); switch (headerGeomType) { case HeaderGeomType::Point: @@ -317,7 +317,7 @@ public: using namespace feature; uint8_t const header = ReadPrimitiveFromSource(src); - m_geomType = static_cast(header & HEADER_GEOTYPE_MASK); + m_geomType = static_cast(header & HEADER_GEOMTYPE_MASK); size_t const count = (header & HEADER_TYPE_MASK) + 1; for (size_t i = 0; i < count; ++i) diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp index 7186f73180..84f3976264 100644 --- a/indexer/map_object.cpp +++ b/indexer/map_object.cpp @@ -79,7 +79,7 @@ void MapObject::SetFromFeatureType(FeatureType & ft) m_geomType = ft.GetGeomType(); if (m_geomType == feature::GeomType::Area) { - m_triangles = ft.GetTriangesAsPoints(FeatureType::BEST_GEOMETRY); + m_triangles = ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY); } else if (m_geomType == feature::GeomType::Line) { diff --git a/search/street_vicinity_loader.cpp b/search/street_vicinity_loader.cpp index 31465e6b9d..8e3e49b0b2 100644 --- a/search/street_vicinity_loader.cpp +++ b/search/street_vicinity_loader.cpp @@ -59,7 +59,7 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street) vector points; if (feature->GetGeomType() == feature::GeomType::Area) { - points = feature->GetTriangesAsPoints(FeatureType::BEST_GEOMETRY); + points = feature->GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY); } else {