safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

move excluded place list to SearchContext

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

7
lib/Geocode.php
View File

@@ -849,6 +849,9 @@ class Geocode
} else if ($this->aViewBox) {
$oCtx->setViewboxFromBox($this->aViewBox, $this->bBoundedSearch);
}
if ($this->aExcludePlaceIDs) {
$oCtx->setExcludeList($this->aExcludePlaceIDs);
}
$sNormQuery = $this->normTerm($this->sQuery);
$sLanguagePrefArraySQL = getArraySQL(
@@ -1108,7 +1111,6 @@ class Geocode
$aPlaceIDs = $oSearch->queryNearbyPoi(
$this->oDB,
$sCountryCodesSQL,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit
);
} elseif ($oSearch->isOperator(Operator::POSTCODE)) {
@@ -1126,7 +1128,6 @@ class Geocode
$sCountryCodesSQL,
$this->iMinAddressRank,
$this->iMaxAddressRank,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit
);
@@ -1142,7 +1143,6 @@ class Geocode
$aResult = $oSearch->queryHouseNumber(
$this->oDB,
$aPlaceIDs,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit
);
@@ -1159,7 +1159,6 @@ class Geocode
$aPlaceIDs = $oSearch->queryPoiByOperator(
$this->oDB,
$aPlaceIDs,
$this->aExcludePlaceIDs ? join(',', $this->aExcludePlaceIDs) : '',
$this->iLimit
);
}