From 80d7ff175fc01fab1f819ad7f0c5cb52cb1b2acd Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Tue, 5 Jan 2016 18:48:39 +0300 Subject: [PATCH] [search] Fixed search without localities. --- search/v2/geocoder.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index 41faedd31e..6152389f42 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -362,15 +362,20 @@ void Geocoder::DoGeocodingWithoutLocalities() if (coding::CompressedBitVector::IsEmpty(viewportFeatures) && coding::CompressedBitVector::IsEmpty(positionFeatures)) { - return; + m_filter.SetFilter(nullptr); } - - if (coding::CompressedBitVector::IsEmpty(viewportFeatures)) + else if (coding::CompressedBitVector::IsEmpty(viewportFeatures)) + { m_filter.SetFilter(move(positionFeatures)); + } else if (coding::CompressedBitVector::IsEmpty(positionFeatures)) + { m_filter.SetFilter(move(viewportFeatures)); + } else + { m_filter.SetFilter(coding::CompressedBitVector::Union(*viewportFeatures, *positionFeatures)); + } // Filter will be applied only for large bit vectors. m_filter.SetThreshold(m_params.m_maxNumResults);