From a4718a235ea5e7e917ad307241c1753a3b0ea5c2 Mon Sep 17 00:00:00 2001 From: vng Date: Fri, 26 Dec 2014 11:36:33 +0300 Subject: Replace DistanceOnEarth fn call with more convenient one. --- map/ruler.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'map/ruler.cpp') diff --git a/map/ruler.cpp b/map/ruler.cpp index 2bdeb9f21d..47fa36c6a1 100644 --- a/map/ruler.cpp +++ b/map/ruler.cpp @@ -17,7 +17,6 @@ #include "../indexer/mercator.hpp" -#include "../geometry/distance_on_sphere.hpp" #include "../geometry/transformations.hpp" #include "../base/string_utils.hpp" @@ -569,9 +568,7 @@ void Ruler::update() m2::PointD pt1 = screen.PtoG(pivot()); m2::PointD pt0 = screen.PtoG(pivot() - m2::PointD(minPxWidth, 0)); - double const distanceInMetres = ms::DistanceOnEarth( - MercatorBounds::YToLat(pt0.y), MercatorBounds::XToLon(pt0.x), - MercatorBounds::YToLat(pt1.y), MercatorBounds::XToLon(pt1.x)); + double const distanceInMetres = MercatorBounds::DistanceOnEarth(pt0, pt1); // convert metres to units for calculating m_metresDiff double metersDiff = CalcMetresDiff(distanceInMetres); -- cgit v1.2.3