move country list to SearchContext

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index b978a72c077a1c77e1f20f7dbfb5d8758a062b1f..b27f69e8647e27eb0aaf308cd91df9bde9d059dd 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -852,15 +852,14 @@ class Geocode
         if ($this->aExcludePlaceIDs) {
             $oCtx->setExcludeList($this->aExcludePlaceIDs);
         }
+        if ($this->aCountryCodes) {
+            $oCtx->setCountryList($this->aCountryCodes);
+        }
 
         $sNormQuery = $this->normTerm($this->sQuery);
         $sLanguagePrefArraySQL = getArraySQL(
             array_map("getDBQuoted", $this->aLangPrefOrder)
         );
-        $sCountryCodesSQL = false;
-        if ($this->aCountryCodes) {
-            $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
-        }
 
         $sQuery = $this->sQuery;
         if (!preg_match('//u', $sQuery)) {
@@ -1107,25 +1106,16 @@ class Geocode
                         if (!$oCtx->isBoundedSearch()) {
                             continue;
                         }
-
-                        $aPlaceIDs = $oSearch->queryNearbyPoi(
-                            $this->oDB,
-                            $sCountryCodesSQL,
-                            $this->iLimit
-                        );
+                        $aPlaceIDs = $oSearch->queryNearbyPoi($this->oDB, $this->iLimit);
                     } elseif ($oSearch->isOperator(Operator::POSTCODE)) {
-                        $aPlaceIDs = $oSearch->queryPostcode(
-                            $this->oDB,
-                            $sCountryCodesSQL,
-                            $this->iLimit
-                        );
+                        // looking for postcode
+                        $aPlaceIDs = $oSearch->queryPostcode($this->oDB, $this->iLimit);
                     } else {
                         // Ordinary search:
                         // First search for places according to name and address.
                         $aNamedPlaceIDs = $oSearch->queryNamedPlace(
                             $this->oDB,
                             $aWordFrequencyScores,
-                            $sCountryCodesSQL,
                             $this->iMinAddressRank,
                             $this->iMaxAddressRank,
                             $this->iLimit