hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

move country list to SearchContext

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-10-08 23:33:54 +02:00
parent 907133a38c
commit 55629a4891
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Geocode.php
View File

@@ -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