hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 11:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

make all Token menbers private

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-07-18 20:20:22 +02:00
parent 86ea077092
commit cca912af4e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib-php/Geocode.php
View File

@@ -555,15 +555,15 @@ class Geocode
if (!empty($aTokens)) { if (!empty($aTokens)) {
$aNewSearches = array(); $aNewSearches = array();
$oPosition = new SearchPosition('', 0, 1);
$oPosition->setTokenPosition(0, 1);
foreach ($aSearches as $oSearch) { foreach ($aSearches as $oSearch) {
foreach ($aTokens as $oToken) { foreach ($aTokens as $oToken) {
$oNewSearch = clone $oSearch; $aNewSearches = array_merge(
$oNewSearch->setPoiSearch( $aNewSearches,
$oToken->iOperator, $oToken->extendSearch($oSearch, $oPosition)
$oToken->sClass,
$oToken->sType
); );
$aNewSearches[] = $oNewSearch;
} }
} }
$aSearches = $aNewSearches; $aSearches = $aNewSearches;

8
lib-php/TokenSpecialTerm.php
View File

@@ -10,13 +10,13 @@ require_once(CONST_LibDir.'/SpecialSearchOperator.php');
class SpecialTerm class SpecialTerm
{ {
/// Database word id, if applicable. /// Database word id, if applicable.
public $iId; private $iId;
/// Class (or OSM tag key) of the place to look for. /// Class (or OSM tag key) of the place to look for.
public $sClass; private $sClass;
/// Type (or OSM tag value) of the place to look for. /// Type (or OSM tag value) of the place to look for.
public $sType; private $sType;
/// Relationship of the operator to the object (see Operator class). /// Relationship of the operator to the object (see Operator class).
public $iOperator; private $iOperator;
public function __construct($iID, $sClass, $sType, $iOperator) public function __construct($iID, $sClass, $sType, $iOperator)
{ {