Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 0c93e0a96e429945d4a795fe32179fcc573f0544..af3262f9e7e866780be904fa7b870aed52471b33 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -18,7 +18,7 @@ class Geocode
     protected $aLangPrefOrder = array();
 
     protected $aExcludePlaceIDs = array();
-    protected $bReverseInPlan = false;
+    protected $bReverseInPlan = true;
 
     protected $iLimit = 20;
     protected $iFinalLimit = 10;
@@ -642,12 +642,6 @@ class Geocode
             $oValidTokens = new TokenList();
 
             if (!empty($aTokens)) {
-                $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
-                $sSQL .= ' FROM word ';
-                $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';
-
-                Debug::printSQL($sSQL);
-
                 $oValidTokens->addTokensFromDB(
                     $this->oDB,
                     $aTokens,
@@ -776,7 +770,7 @@ class Geocode
                         }
                     }
 
-                    if ($iQueryLoop > 20) break;
+                    //if ($iQueryLoop > 20) break;
                 }
 
                 if (!empty($aResults)) {
@@ -848,8 +842,8 @@ class Geocode
                 }
 
                 if (!empty($aResults)) break;
-                if ($iGroupLoop > 4) break;
-                if ($iQueryLoop > 30) break;
+                //if ($iGroupLoop > 4) break;
+                //if ($iQueryLoop > 30) break;
             }
         } else {
             // Just interpret as a reverse geocode