X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/329948e68522e9c48a4dbed327529632156233c6..473bbb7234dc21a74b3d7ed0115a02ca3379014b:/lib/Geocode.php?ds=sidebyside diff --git a/lib/Geocode.php b/lib/Geocode.php index 612c1a0f..e9b304d2 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -19,7 +19,7 @@ class Geocode protected $bIncludeAddressDetails = false; protected $aExcludePlaceIDs = array(); - protected $bReverseInPlan = false; + protected $bReverseInPlan = true; protected $iLimit = 20; protected $iFinalLimit = 10; @@ -658,7 +658,6 @@ class Geocode $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 @@ -681,7 +680,6 @@ class Geocode } 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 @@ -781,7 +779,6 @@ class Geocode $aResults += $oSearch->query( $this->oDB, - $aWordFrequencyScores, $this->iMinAddressRank, $this->iMaxAddressRank, $this->iLimit