From a34562eed74dd102ff358c25a35a46115ec5d113 Mon Sep 17 00:00:00 2001
From: Yury Melnichek <melnichek@gmail.com>
Date: Tue, 31 May 2011 12:41:28 +0200
Subject: [PATCH] [search] Search in the world file as well.

---
 search/query.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/search/query.cpp b/search/query.cpp
index df648ae073..eccf93e7c8 100644
--- a/search/query.cpp
+++ b/search/query.cpp
@@ -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());