osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 10:43:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix more syntax issues

Browse Source
This commit is contained in:
Sarah Hoffmann 2017-10-08 16:42:04 +02:00
parent fd08d41962
commit 795153b213
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Geocode.php
View File

@ -741,12 +741,15 @@ class Geocode
// If the token is valid
if (isset($aValidTokens[' '.$sToken])) {
// Recheck if the original word shows up in the query.
$bWordInQuery = false;
if (isset($aSearchTerm['word']) && $aSearchTerm['word']) {
$bWordInQuery = $this->normTerm($aSearchTerm['word']) !== false;
}
foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) {
// Recheck if the original word shows up in the query.
$bWordInQuery = false;
if (isset($aSearchTerm['word']) && $aSearchTerm['word']) {
$bWordInQuery = strpos(
$sNormQuery,
$this->normTerm($aSearchTerm['word'])
) !== false;
}
$aNewSearches = $oCurrentSearch->extendWithFullTerm(
$aSearchTerm,
$bWordInQuery,
@ -1180,7 +1183,7 @@ class Geocode
);
} elseif ($oSearch->isOperator(Operator::POSTCODE)) {
$aPlaceIDs = $oSearch->queryPostcode(
$oDB,
$this->oDB,
$sCountryCodesSQL,
$this->iLimit
);

16
lib/SearchDescription.php
View File

@ -20,7 +20,7 @@ abstract class Operator
/// Search for postcodes.
const POSTCODE = 5;
private $aConstantNames = null;
private static $aConstantNames = null;
public static function toString($iOperator)
{
@ -28,17 +28,17 @@ abstract class Operator
return '';
}
if ($aConstantNames === null) {
if (Operator::$aConstantNames === null) {
$oReflector = new \ReflectionClass ('Nominatim\Operator');
$aConstants = $oReflector->getConstants();
$aConstantNames = array();
Operator::$aConstantNames = array();
foreach ($aConstants as $sName => $iValue) {
$aConstantNames[$iValue] = $sName;
Operator::$aConstantNames[$iValue] = $sName;
}
}
return $aConstantNames[$iOperator];
return Operator::$aConstantNames[$iOperator];
}
}
@ -322,7 +322,7 @@ class SearchDescription
}
$oSearch->setPoiSearch($iOp, $aSearchTerm['class'], $aSearchTerm['type']);
$aNewWordsetSearches[] = $oSearch;
$aNewSearches[] = $oSearch;
}
} elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
$iWordID = $aSearchTerm['word_id'];
@ -501,10 +501,10 @@ class SearchDescription
$sSQL .= 'WHERE ';
}
$sSQL .= "p.postcode = '".pg_escape_string(reset($this->$aName))."'";
$sSQL .= "p.postcode = '".pg_escape_string(reset($this->aName))."'";
$sCountryTerm = $this->countryCodeSQL('p.country_code', $sCountryList);
if ($sCountryTerm) {
$sSQL .= ' AND '.$sCountyTerm;
$sSQL .= ' AND '.$sCountryTerm;
}
$sSQL .= " LIMIT $iLimit";