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

[search] Search in the world file as well.

Browse source
This commit is contained in:
Yury Melnichek 2011-05-31 12:41:28 +02:00 • committed by Alex Zolotarev
parent c7d0fe8f49
commit a34562eed7
1 changed files with 4 additions and 2 deletions

6
search/query.cpp
View file

@ -88,8 +88,10 @@ struct FeatureProcessor
void Query::Search(function<void (Result const &)> const & f)
{
FeatureProcessor featureProcessor(*this);
m_pIndex->ForEachInRect(featureProcessor, m_rect,
min(scales::GetUpperScale(), scales::GetScaleLevel(m_rect) + 1));
int const scale = scales::GetScaleLevel(m_rect) + 1;
if (scale > scales::GetUpperWorldScale())
m_pIndex->ForEachInRect(featureProcessor, m_rect, scales::GetUpperWorldScale());
m_pIndex->ForEachInRect(featureProcessor, m_rect, min(scales::GetUpperScale(), scale));
vector<Result> results;
results.reserve(m_results.size());