From 356ac180326847a73985d69938e7baaef02882c1 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Mon, 26 Nov 2018 16:44:37 +0300
Subject: [coding] Removed the CellId epsilon. In was used as eps in meters in
 some cases and eps in mercator in others. Its value was hard to justify and
 so were its use cases. We're better off with less epsilons for now.

Also renamed Metres to Meters in the mercator code.
---
 indexer/data_source_helpers.cpp | 2 +-
 indexer/feature_covering.hpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indexer')

diff --git a/indexer/data_source_helpers.cpp b/indexer/data_source_helpers.cpp
index 65945e41d3..e805280f89 100644
--- a/indexer/data_source_helpers.cpp
+++ b/indexer/data_source_helpers.cpp
@@ -33,7 +33,7 @@ void ForEachFeatureAtPoint(DataSource const & dataSource, function<void(FeatureT
       auto limitRect = ft.GetLimitRect(kScale);
       // Be a little more tolerant. When used by editor mercator is given
       // with some error, so we must extend limit rect a bit.
-      limitRect.Inflate(kCellIdToPointEps, kCellIdToPointEps);
+      limitRect.Inflate(kMwmPointAccuracy, kMwmPointAccuracy);
       if (limitRect.IsPointInside(mercator) &&
           feature::GetMinDistanceMeters(ft, mercator) <= toleranceInMeters)
       {
diff --git a/indexer/feature_covering.hpp b/indexer/feature_covering.hpp
index 81336567fc..3a852dc877 100644
--- a/indexer/feature_covering.hpp
+++ b/indexer/feature_covering.hpp
@@ -43,7 +43,7 @@ void SortAndMergeIntervals(Intervals v, Intervals & res);
 template <int DEPTH_LEVELS>
 m2::CellId<DEPTH_LEVELS> GetRectIdAsIs(m2::RectD const & r)
 {
-  double const eps = kCellIdToPointEps;
+  double const eps = kMwmPointAccuracy;
   using Converter = CellIdConverter<MercatorBounds, m2::CellId<DEPTH_LEVELS>>;
 
   return Converter::Cover2PointsWithCell(
-- 
cgit v1.2.3