Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'search/geometry_utils.cpp')
-rw-r--r--search/geometry_utils.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/search/geometry_utils.cpp b/search/geometry_utils.cpp
index c8c6db1ebf..68b730c0ae 100644
--- a/search/geometry_utils.cpp
+++ b/search/geometry_utils.cpp
@@ -1,29 +1,26 @@
#include "geometry_utils.hpp"
-#include "geometry/mercator.hpp"
#include "indexer/scales.hpp"
+#include "geometry/mercator.hpp"
namespace search
{
-
double PointDistance(m2::PointD const & a, m2::PointD const & b)
{
return MercatorBounds::DistanceOnEarth(a, b);
}
-bool IsEqualMercator(m2::RectD const & r1, m2::RectD const & r2, double epsMeters)
+bool IsEqualMercator(m2::RectD const & r1, m2::RectD const & r2, double eps)
{
- double const eps = epsMeters * MercatorBounds::degreeInMetres;
return m2::IsEqual(r1, r2, eps, eps);
}
-// 11.5 - lower bound for rect when we need to inflate it
-// 1.5 - inflate delta for viewport scale
-// 7 - query scale depth to cache viewport features
-
bool GetInflatedViewport(m2::RectD & viewport)
{
+ // 11.5 - lower bound for rect when we need to inflate it
+ // 1.5 - inflate delta for viewport scale
+ // 7 - query scale depth to cache viewport features
double level = scales::GetScaleLevelD(viewport);
if (level < 11.5)
return false;
@@ -38,5 +35,4 @@ int GetQueryIndexScale(m2::RectD const & viewport)
{
return scales::GetScaleLevel(viewport) + 7;
}
-
-} // namespace search
+} // namespace search