From ca9a449aae48d14a19646e61cd0d23366a40878f Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Wed, 27 Jan 2016 16:37:10 +0300 Subject: [PATCH] [search] Fixed min viewport size for search. --- search/v2/geocoder.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index aeb07ab353..d935fe8de2 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -231,13 +231,19 @@ bool IsStopWord(strings::UniString const & s) return kStopWords.count(s) > 0; } -m2::RectD NormalizeViewport(m2::RectD const & viewport) +m2::RectD NormalizeViewport(m2::RectD viewport) { + double constexpr kMinViewportRadiusM = 5.0 * 1000; double constexpr kMaxViewportRadiusM = 50.0 * 1000; - m2::RectD limit = + + m2::RectD minViewport = + MercatorBounds::RectByCenterXYAndSizeInMeters(viewport.Center(), kMinViewportRadiusM); + viewport.Add(minViewport); + + m2::RectD maxViewport = MercatorBounds::RectByCenterXYAndSizeInMeters(viewport.Center(), kMaxViewportRadiusM); - VERIFY(limit.Intersect(viewport), ()); - return limit; + VERIFY(viewport.Intersect(maxViewport), ()); + return viewport; } m2::RectD GetRectAroundPoistion(m2::PointD const & position)