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

fix array-related errors according to PSR2 coding style guide

Browse Source
This commit is contained in:
marc tobias
2016-09-10 21:10:52 +02:00
parent f05ea577f4
commit 3887423381
16 changed files with 532 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/Geocode.php
View File

@@ -258,8 +258,12 @@ class Geocode
} else {
$aViewbox = $oParams->getStringList('viewbox');
if ($aViewbox) {
$this->setViewBox(array($aViewbox[0], $aViewbox[3],
$aViewbox[2], $aViewbox[1]));
$this->setViewBox(array(
$aViewbox[0],
$aViewbox[3],
$aViewbox[2],
$aViewbox[1]
));
} else {
$aRoute = $oParams->getStringList('route');
$fRouteWidth = $oParams->getFloat('routewidth');
@@ -771,24 +775,25 @@ class Geocode
if ($sQuery || $this->aStructuredQuery) {
// Start with a blank search
$aSearches = array(
array('iSearchRank' => 0,
'iNamePhrase' => -1,
'sCountryCode' => false,
'aName' => array(),
'aAddress' => array(),
'aFullNameAddress' => array(),
'aNameNonSearch' => array(),
'aAddressNonSearch' => array(),
'sOperator' => '',
'aFeatureName' => array(),
'sClass' => '',
'sType' => '',
'sHouseNumber' => '',
'fLat' => '',
'fLon' => '',
'fRadius' => ''
)
);
array(
'iSearchRank' => 0,
'iNamePhrase' => -1,
'sCountryCode' => false,
'aName' => array(),
'aAddress' => array(),
'aFullNameAddress' => array(),
'aNameNonSearch' => array(),
'aAddressNonSearch' => array(),
'sOperator' => '',
'aFeatureName' => array(),
'sClass' => '',
'sType' => '',
'sHouseNumber' => '',
'fLat' => '',
'fLon' => '',
'fRadius' => ''
)
);
// Do we have a radius search?
$sNearPointSQL = false;
@@ -940,7 +945,7 @@ class Geocode
foreach ($aTokens as $sToken) {
// Unknown single word token with a number - assume it is a house number
if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken)) {
$aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
$aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house'));
}
}