Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index d00104178fe7459de78789977c82b9fff7ca9565..e9b304d251abbe4c6c7cf6e09c5c130297a27953 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -19,7 +19,7 @@ class Geocode
     protected $bIncludeAddressDetails = false;
 
     protected $aExcludePlaceIDs = array();
     protected $bIncludeAddressDetails = false;
 
     protected $aExcludePlaceIDs = array();

-    protected $bReverseInPlan = false;
+    protected $bReverseInPlan = true;

 
     protected $iLimit = 20;
     protected $iFinalLimit = 10;
 
     protected $iLimit = 20;
     protected $iFinalLimit = 10;


@@ -620,7 +620,7 @@ class Geocode
             }
 
             Debug::printDebugArray('Search context', $oCtx);
             }
 
             Debug::printDebugArray('Search context', $oCtx);

-            Debug::printDebugArray('Base search', $aSearches[0]);
+            Debug::printDebugArray('Base search', empty($aSearches) ? null : $aSearches[0]);

             Debug::printVar('Final query phrases', $aInPhrases);
 
             // Convert each phrase to standard form
             Debug::printVar('Final query phrases', $aInPhrases);
 
             // Convert each phrase to standard form


@@ -658,7 +658,6 @@ class Geocode
                     $this->oDB->getAll($sSQL),
                     'Could not get word tokens.'
                 );
                     $this->oDB->getAll($sSQL),
                     'Could not get word tokens.'
                 );

-                $aWordFrequencyScores = array();

                 foreach ($aDatabaseWords as $aToken) {
                     // Filter country tokens that do not match restricted countries.
                     if ($this->aCountryCodes
                 foreach ($aDatabaseWords as $aToken) {
                     // Filter country tokens that do not match restricted countries.
                     if ($this->aCountryCodes


@@ -681,7 +680,6 @@ class Geocode
                     } else {
                         $aValidTokens[$aToken['word_token']] = array($aToken);
                     }
                     } else {
                         $aValidTokens[$aToken['word_token']] = array($aToken);
                     }

-                    $aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;

                 }
 
                 // US ZIP+4 codes - if there is no token, merge in the 5-digit ZIP code
                 }
 
                 // US ZIP+4 codes - if there is no token, merge in the 5-digit ZIP code


@@ -781,7 +779,6 @@ class Geocode
 
                     $aResults += $oSearch->query(
                         $this->oDB,
 
                     $aResults += $oSearch->query(
                         $this->oDB,

-                        $aWordFrequencyScores,

                         $this->iMinAddressRank,
                         $this->iMaxAddressRank,
                         $this->iLimit
                         $this->iMinAddressRank,
                         $this->iMaxAddressRank,
                         $this->iLimit