From 4d3cc8fc68a45ea70672c552e6408a7ab288b630 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Thu, 3 Mar 2016 20:20:17 +0300 Subject: [PATCH] [search] Fixed viewports in the quality tool. --- geometry/mercator.hpp | 5 +++++ search/search_quality_tests/search_quality_tests.cpp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/geometry/mercator.hpp b/geometry/mercator.hpp index 4fa61ac21f..95b04c6f40 100644 --- a/geometry/mercator.hpp +++ b/geometry/mercator.hpp @@ -106,6 +106,11 @@ struct MercatorBounds return FromLatLon(point.lat, point.lon); } + inline static m2::RectD RectByCenterLatLonAndSizeInMeters(double lat, double lon, double size) + { + return RectByCenterXYAndSizeInMeters(FromLatLon(lat, lon), size); + } + inline static ms::LatLon ToLatLon(m2::PointD const & point) { return {YToLat(point.y), XToLon(point.x)}; diff --git a/search/search_quality_tests/search_quality_tests.cpp b/search/search_quality_tests/search_quality_tests.cpp index 5031d37adb..dfb2d44f06 100644 --- a/search/search_quality_tests/search_quality_tests.cpp +++ b/search/search_quality_tests/search_quality_tests.cpp @@ -61,9 +61,9 @@ DEFINE_string(check_completeness, "", "Path to the file with completeness data") map const kViewports = { {"default", m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0))}, - {"moscow", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(37.7, 55.7), 5000)}, - {"london", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(0.0, 51.5), 5000)}, - {"zurich", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(8.5, 47.4), 5000)}}; + {"moscow", MercatorBounds::RectByCenterLatLonAndSizeInMeters(55.7, 37.7, 5000)}, + {"london", MercatorBounds::RectByCenterLatLonAndSizeInMeters(51.5, 0.0, 5000)}, + {"zurich", MercatorBounds::RectByCenterLatLonAndSizeInMeters(47.4, 8.5, 5000)}}; string const kDefaultQueriesPathSuffix = "/../search/search_quality_tests/queries.txt"; string const kEmptyResult = "";