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

[search] Move UpdateResults from PreRanker::Finish to Geocoder::GoImpl to avoid uncaught CancelException.

Browse source
This commit is contained in:
tatiana-yan 2019-09-12 14:58:49 +03:00 • committed by mpimenov
parent 65dfde46a3
commit 624ad39116
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
search/geocoder.cpp
View file

@ -570,6 +570,7 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> & infos, bool inViewport)
// Iterates through all alive mwms and performs geocoding.
ForEachCountry(infos, processCountry);
m_preRanker.UpdateResults(true /* lastUpdate */);
}
void Geocoder::InitBaseContext(BaseContext & ctx)

3
search/pre_ranker.cpp
View file

@ -68,9 +68,6 @@ void PreRanker::Init(Params const & params)
void PreRanker::Finish(bool cancelled)
{
if (!cancelled)
UpdateResults(true /* lastUpdate */);
m_ranker.Finish(cancelled);
}

2
search/ranker.cpp
View file

@ -511,7 +511,7 @@ void Ranker::Init(Params const & params, Geocoder::Params const & geocoderParams
void Ranker::Finish(bool cancelled)
{
// The results have been updated by PreRanker.
// The results should be updated by Geocoder before Finish call.
m_emitter.Finish(cancelled);
}