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

avoid PHP notices

Browse Source
This commit is contained in:
Sarah Hoffmann
2012-05-25 23:45:59 +02:00
parent c433a2d739
commit a44e21de49
6 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
website/reverse.php
View File

@@ -69,7 +69,7 @@
18 => 30, // or >, Building
19 => 30, // or >, Building
);
$iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28;
$iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
// Find the nearest point
$fSearchDiam = 0.0001;
@@ -144,13 +144,20 @@
$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
}
$aClassType = getClassTypes();
$sAddressType = '';
if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))
$sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel'];
elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']]))
$sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel'];
else $sAddressType = $aPlace['class'];
$aPlace['addresstype'] = $sAddressType;
$sAddressType = '';
$sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
{
$sAddressType = $aClassType[$aClassType]['simplelabel'];
}
else
{
$sClassType = $aPlace['class'].':'.$aPlace['type'];
if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
$sAddressType = $aClassType[$sClassType]['simplelabel'];
else $sAddressType = $aPlace['class'];
}
$aPlace['addresstype'] = $sAddressType;
}
include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

8
website/search.php
View File

@@ -92,7 +92,7 @@
// Search query
$sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
if (!$sQuery && $_SERVER['PATH_INFO'] && $_SERVER['PATH_INFO'][0] == '/')
if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
{
$sQuery = substr($_SERVER['PATH_INFO'], 1);
@@ -452,7 +452,7 @@
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
}
}
elseif ($aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null)
elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null)
{
if ($aSearch['fLat'] === '')
{
@@ -1312,10 +1312,10 @@
$bFirst = false;
}
if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']])))
&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']])))
{
$aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
$aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']] = true;
$aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']] = true;
$aSearchResults[] = $aResult;
}