X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2bf546fbf4a4e3509978d3360060a3d2dc665c5c..b66004c3c554c87886afa170f9065be249a3d9d4:/lib/template/search-batch-json.php diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php index a3ced45b..513f3c2b 100644 --- a/lib/template/search-batch-json.php +++ b/lib/template/search-batch-json.php @@ -1,42 +1,37 @@ $aPointDetails) - { + foreach ($aSearchResults as $iResNum => $aPointDetails) { $aPlace = array( - 'place_id'=>$aPointDetails['place_id'], - ); + 'place_id'=>$aPointDetails['place_id'], + ); $sOSMType = formatOSMType($aPointDetails['osm_type']); - if ($sOSMType) - { + if ($sOSMType) { $aPlace['osm_type'] = $sOSMType; $aPlace['osm_id'] = $aPointDetails['osm_id']; } - if (isset($aPointDetails['aBoundingBox'])) - { + if (isset($aPointDetails['aBoundingBox'])) { $aPlace['boundingbox'] = array( - $aPointDetails['aBoundingBox'][0], - $aPointDetails['aBoundingBox'][1], - $aPointDetails['aBoundingBox'][2], - $aPointDetails['aBoundingBox'][3]); + $aPointDetails['aBoundingBox'][0], + $aPointDetails['aBoundingBox'][1], + $aPointDetails['aBoundingBox'][2], + $aPointDetails['aBoundingBox'][3] + ); - if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons) - { + if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons) { $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints']; } } - if (isset($aPointDetails['zoom'])) - { + if (isset($aPointDetails['zoom'])) { $aPlace['zoom'] = $aPointDetails['zoom']; } @@ -50,33 +45,27 @@ foreach($aBatchResults as $aSearchResults) $aPlace['importance'] = $aPointDetails['importance']; - if (isset($aPointDetails['icon'])) - { + if (isset($aPointDetails['icon'])) { $aPlace['icon'] = $aPointDetails['icon']; } - if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0) - { + if (isset($aPointDetails['address']) && !empty($aPointDetails['address'])) { $aPlace['address'] = $aPointDetails['address']; } - if (isset($aPointDetails['asgeojson'])) - { + if (isset($aPointDetails['asgeojson'])) { $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']); } - if (isset($aPointDetails['assvg'])) - { + if (isset($aPointDetails['assvg'])) { $aPlace['svg'] = $aPointDetails['assvg']; } - if (isset($aPointDetails['astext'])) - { + if (isset($aPointDetails['astext'])) { $aPlace['geotext'] = $aPointDetails['astext']; } - if (isset($aPointDetails['askml'])) - { + if (isset($aPointDetails['askml'])) { $aPlace['geokml'] = $aPointDetails['askml']; }