From 0e3c8613155401042fa0b6956f9532c2fb3376cb Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Wed, 28 Nov 2018 15:33:48 +0300 Subject: [PATCH] [search] Fixed wrong units in a call to IsEqualMercator. SearchAPITest_MultipleViewportsRequests waited indefinitely on a future-promise because of a wrong eps in IsEqualMercator. --- map/search_api.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/map/search_api.cpp b/map/search_api.cpp index a1c4d900af..b79c89f49e 100644 --- a/map/search_api.cpp +++ b/map/search_api.cpp @@ -34,6 +34,7 @@ namespace using BookmarkIdDoc = pair; double const kDistEqualQueryMeters = 100.0; +double const kDistEqualQueryMercator = MercatorBounds::MetersToMercator(kDistEqualQueryMeters); // Cancels search query by |handle|. void CancelQuery(weak_ptr & handle) @@ -407,14 +408,14 @@ bool SearchAPI::QueryMayBeSkipped(SearchParams const & prevParams, return false; if (!prevViewport.IsValid() || - !IsEqualMercator(prevViewport, currViewport, kDistEqualQueryMeters)) + !IsEqualMercator(prevViewport, currViewport, kDistEqualQueryMercator)) { return false; } if (prevParams.m_position && currParams.m_position && MercatorBounds::DistanceOnEarth(*prevParams.m_position, *currParams.m_position) > - kDistEqualQueryMeters) + kDistEqualQueryMercator) { return false; }