osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-26 06:22:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

method /lookup.php: incorporate better PHP variable naming and other feedback in pull request

Browse Source
This commit is contained in:
Marc Tobias Metten 2015-06-25 04:12:44 +02:00
parent 8c656fb667
commit 86e946d369
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
website/lookup.php
View File

@ -37,32 +37,32 @@
$hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
$aSearchResults = array();
$aCleanedQueryParts = array();
if (isset($_GET['osm_ids']))
{
$oPlaceLookup = new PlaceLookup($oDB);
$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
$oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
$osm_ids = explode(',', $_GET['osm_ids']);
$aOsmIds = explode(',', $_GET['osm_ids']);
if ( count($osm_ids) > CONST_Places_Max_ID_count )
if ( count($aOsmIds) > CONST_Places_Max_ID_count )
{
userError('Bulk User: Only ' . CONST_Places_Max_ID_count . " ids are allowed in one request.");
exit;
}
$type = '';
$id = 0;
foreach ($osm_ids AS $item)
foreach ($aOsmIds AS $sItem)
{
// Skip empty items
if (empty($item)) continue;
// Skip empty sItem
if (empty($sItem)) continue;
$type = $item[0];
$id = (int) substr($item, 1);
if ( $id > 0 && ($type == 'N' || $type == 'W' || $type == 'R') )
$sType = $sItem[0];
$iId = (int) substr($sItem, 1);
if ( $iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R') )
{
$oPlaceLookup->setOSMID($type, $id);
$aCleanedQueryParts[] = $sType . $iId;
$oPlaceLookup->setOSMID($sType, $iId);
$oPlace = $oPlaceLookup->lookup();
if ($oPlace){
// we want to use the search-* output templates, so we need to fill
@ -70,7 +70,7 @@
// key names
$oResult = $oPlace;
unset($oResult['aAddress']);
$oResult['address'] = $oPlace['aAddress'];
if (isset($oPlace['aAddress'])) $oResult['address'] = $oPlace['aAddress'];
unset($oResult['langaddress']);
$oResult['name'] = $oPlace['langaddress'];
$aSearchResults[] = $oResult;
@ -83,8 +83,8 @@
if (CONST_Debug) exit;
$sXmlRootTag = 'lookupresults';
$sQuery = join(',',$aCleanedQueryParts);
// we initialize these to avoid warnings in our logfile
$sQuery = '';
$sViewBox = '';
$bShowPolygons = '';
$aExcludePlaceIDs = [];