Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/search
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2016-07-08 15:14:31 +0300
committerMaxim Pimenov <m@maps.me>2016-07-08 15:25:40 +0300
commitd93851e0cdf47254bbf76bcb5c5b590397c9c97c (patch)
tree01921411bf8e47bc4b338a4cdea6dd095ca24eec /search
parentd94908e979cec5452adee12ef13dd869bb6ceca0 (diff)
Review fixes.
Diffstat (limited to 'search')
-rw-r--r--search/processor.cpp8
-rw-r--r--search/processor.hpp2
-rw-r--r--search/ranker.hpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/search/processor.cpp b/search/processor.cpp
index c83a4d06ba..dac426b5d0 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -406,7 +406,7 @@ void Processor::Search(SearchParams const & params, m2::RectD const & viewport)
SetOnResults(params.m_onResults);
Geocoder::Params geocoderParams;
- InitGeocoderParams(geocoderParams);
+ InitGeocoder(geocoderParams);
InitPreRanker();
InitRanker();
@@ -668,7 +668,7 @@ void Processor::InitParams(QueryParams & params)
params.m_langs.insert(GetLanguage(i));
}
-void Processor::InitGeocoderParams(Geocoder::Params & params)
+void Processor::InitGeocoder(Geocoder::Params & params)
{
bool const viewportSearch = m_mode == Mode::Viewport;
@@ -699,11 +699,11 @@ void Processor::InitRanker()
if (viewportSearch)
{
params.m_viewport = GetViewport();
- params.m_limit = kResultsCount;
+ params.m_limit = kPreResultsCount;
}
else
{
- params.m_limit = numeric_limits<size_t>::max();
+ params.m_limit = kResultsCount;
}
params.m_position = GetPosition();
params.m_pivotRegion = GetPivotRegion();
diff --git a/search/processor.hpp b/search/processor.hpp
index b33b9da9c7..fd0d147251 100644
--- a/search/processor.hpp
+++ b/search/processor.hpp
@@ -98,7 +98,7 @@ public:
void SearchCoordinates(Results & res) const;
void InitParams(QueryParams & params);
- void InitGeocoderParams(Geocoder::Params & params);
+ void InitGeocoder(Geocoder::Params & params);
void InitPreRanker();
void InitRanker();
diff --git a/search/ranker.hpp b/search/ranker.hpp
index 4acbd9c30c..7eedba902c 100644
--- a/search/ranker.hpp
+++ b/search/ranker.hpp
@@ -65,7 +65,7 @@ public:
TLocales m_categoryLocales;
- size_t m_limit;
+ size_t m_limit = 0;
TOnResults m_onResults;
};