[indexer] enum feature::EGeomType is changed to enum class feature::GeomType

10 files changed, 15 insertions, 15 deletions

diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index d247d81671..dd399dfe14 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -138,7 +138,7 @@ private:
       if (!buildingFt)
         continue;
 
-      if (buildingFt->GetFeatureType() == feature::GEOM_POINT)
+      if (buildingFt->GetGeomType() == feature::GeomType::Point)
       {
         auto const center = feature::GetCenter(*buildingFt, FeatureType::WORST_GEOMETRY);
         buildingRects.emplace_back(
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 773f875f6d..a607ed062a 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -652,7 +652,7 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
       continue;
 
     auto addRegionMaps = [&](size_t maxCount, Region::Type type, size_t & count) {
-      if (count < maxCount && ft->GetFeatureType() == feature::GEOM_POINT)
+      if (count < maxCount && ft->GetGeomType() == feature::GeomType::Point)
       {
         string affiliation;
         if (!GetAffiliationName(*ft, affiliation))
@@ -680,7 +680,7 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
     {
     case Model::TYPE_CITY:
     {
-      if (numCities < kMaxNumCities && ft->GetFeatureType() == feature::GEOM_POINT)
+      if (numCities < kMaxNumCities && ft->GetGeomType() == feature::GeomType::Point)
       {
         ++numCities;
 
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 7bdb069bf8..169e402bd8 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -896,7 +896,7 @@ int HouseDetector::LoadStreets(vector<FeatureID> const & ids)
       continue;
     }
 
-    if (f->GetFeatureType() == feature::GEOM_LINE)
+    if (f->GetGeomType() == feature::GeomType::Line)
     {
       // Use default name as a primary compare key for merging.
       string name;
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index 33e756b066..8222f999ae 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -116,7 +116,7 @@ RankerResult::RankerResult(FeatureType & f, m2::PointD const & center, m2::Point
   , m_types(f)
   , m_str(displayName)
   , m_resultType(ftypes::IsBuildingChecker::Instance()(m_types) ? TYPE_BUILDING : TYPE_FEATURE)
-  , m_geomType(f.GetFeatureType())
+  , m_geomType(f.GetGeomType())
 {
   ASSERT(m_id.IsValid(), ());
   ASSERT(!m_types.Empty(), ());
diff --git a/search/intermediate_result.hpp b/search/intermediate_result.hpp
index b2a1b848a4..b8ff62c324 100644
--- a/search/intermediate_result.hpp
+++ b/search/intermediate_result.hpp
@@ -100,7 +100,7 @@ public:
   Type const & GetResultType() const { return m_resultType; }
   m2::PointD GetCenter() const { return m_region.m_point; }
   double GetDistance() const { return m_distance; }
-  feature::EGeomType GetGeomType() const { return m_geomType; }
+  feature::GeomType GetGeomType() const { return m_geomType; }
   Result::Metadata GetMetadata() const { return m_metadata; }
 
   double GetDistanceToPivot() const { return m_info.m_distanceToPivot; }
@@ -140,7 +140,7 @@ private:
   double m_distance;
   Type m_resultType;
   RankingInfo m_info;
-  feature::EGeomType m_geomType;
+  feature::GeomType m_geomType;
   Result::Metadata m_metadata;
 
   // The call path in the Geocoder that leads to this result.
diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index 7b1f7f17f4..3c6807f0d5 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -81,7 +81,7 @@ public:
     if (!ft)
       return;
 
-    if (ft->GetFeatureType() != feature::GEOM_POINT)
+    if (ft->GetGeomType() != feature::GeomType::Point)
       return;
 
     using namespace ftypes;
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 07e0f6c8e2..8a1c3fada5 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -142,7 +142,7 @@ void RemoveDuplicatingLinear(vector<RankerResult> & results)
   auto equalCmp = [](RankerResult const & r1, RankerResult const & r2) -> bool {
     // Note! Do compare for distance when filtering linear objects.
     // Otherwise we will skip the results for different parts of the map.
-    return r1.GetGeomType() == feature::GEOM_LINE && r1.IsEqualCommon(r2) &&
+    return r1.GetGeomType() == feature::GeomType::Line && r1.IsEqualCommon(r2) &&
            PointDistance(r1.GetCenter(), r2.GetCenter()) < kDistSameStreetMeters;
   };
 
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index d9fb8943c5..6921cdb59c 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -43,7 +43,7 @@ void AddStreet(FeatureType & ft, m2::PointD const & center, bool includeSquaresA
                vector<ReverseGeocoder::Street> & streets)
 {
   bool const addAsStreet =
-      ft.GetFeatureType() == feature::GEOM_LINE && ftypes::IsWayChecker::Instance()(ft);
+      ft.GetGeomType() == feature::GeomType::Line && ftypes::IsWayChecker::Instance()(ft);
   bool const isSquareOrSuburb =
       ftypes::IsSquareChecker::Instance()(ft) || ftypes::IsSuburbChecker::Instance()(ft);
   bool const addAsSquareOrSuburb = includeSquaresAndSuburbs && isSquareOrSuburb;
diff --git a/search/search_tests/house_detector_tests.cpp b/search/search_tests/house_detector_tests.cpp
index 34750ff068..f86e591731 100644
--- a/search/search_tests/house_detector_tests.cpp
+++ b/search/search_tests/house_detector_tests.cpp
@@ -36,7 +36,7 @@ public:
 
   void operator()(FeatureType & f)
   {
-    if (f.GetFeatureType() == feature::GEOM_LINE)
+    if (f.GetGeomType() == feature::GeomType::Line)
     {
       string name;
       if (f.GetName(0, name) &&
@@ -78,7 +78,7 @@ class CollectStreetIDs
 public:
   void operator()(FeatureType & f)
   {
-    if (f.GetFeatureType() == feature::GEOM_LINE)
+    if (f.GetGeomType() == feature::GeomType::Line)
     {
       string name;
       if (f.GetName(0, name) && ftypes::IsWayChecker::Instance()(f))
diff --git a/search/street_vicinity_loader.cpp b/search/street_vicinity_loader.cpp
index 06bb2c35fc..31465e6b9d 100644
--- a/search/street_vicinity_loader.cpp
+++ b/search/street_vicinity_loader.cpp
@@ -49,15 +49,15 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
   if (!feature)
     return;
 
-  bool const isStreet =
-      feature->GetFeatureType() == feature::GEOM_LINE && ftypes::IsWayChecker::Instance()(*feature);
+  bool const isStreet = feature->GetGeomType() == feature::GeomType::Line &&
+                        ftypes::IsWayChecker::Instance()(*feature);
   bool const isSquareOrSuburb = ftypes::IsSquareChecker::Instance()(*feature) ||
                                 ftypes::IsSuburbChecker::Instance()(*feature);
   if (!isStreet && !isSquareOrSuburb)
     return;
 
   vector<m2::PointD> points;
-  if (feature->GetFeatureType() == feature::GEOM_AREA)
+  if (feature->GetGeomType() == feature::GeomType::Area)
   {
     points = feature->GetTriangesAsPoints(FeatureType::BEST_GEOMETRY);
   }