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