RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #3786 from ygorshenin/fix-nasty-search-bugs

Browse source 
[search] Fixed nasty search bugs.
This commit is contained in:
Vlad Mihaylenko 2016-07-14 06:55:25 -07:00 • committed by GitHub
commit 775690d1dd
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
search/processor.cpp
View file

@ -408,7 +408,7 @@ void Processor::Search(SearchParams const & params, m2::RectD const & viewport)
Geocoder::Params geocoderParams;
InitGeocoder(geocoderParams);
InitPreRanker();
InitPreRanker(geocoderParams);
InitRanker();
try
@ -681,11 +681,12 @@ void Processor::InitGeocoder(Geocoder::Params & params)
m_geocoder.SetParams(params);
}
void Processor::InitPreRanker()
void Processor::InitPreRanker(Geocoder::Params const & geocoderParams)
{
PreRanker::Params params;
params.m_accuratePivotCenter = GetPivotPoint();
params.m_scale = geocoderParams.m_scale;
m_preRanker.Init(params);
}

2
search/processor.hpp
View file

@ -99,7 +99,7 @@ public:
void InitParams(QueryParams & params);
void InitGeocoder(Geocoder::Params & params);
void InitPreRanker();
void InitPreRanker(Geocoder::Params const & geocoderParams);
void InitRanker();
void ClearCaches();

6
search/ranker.cpp
View file

@ -311,11 +311,13 @@ void Ranker::MakePreResult2(Geocoder::Params const & geocoderParams, vector<Inde
{
auto p = maker(r);
if (!p)
return;
continue;
if (geocoderParams.m_mode == Mode::Viewport &&
!geocoderParams.m_pivot.IsPointInside(p->GetCenter()))
return;
{
continue;
}
if (p->IsStreet())
streets.push_back(p->GetID());