X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b14bc75dc4a0ca44485599d8ab4cf1c5781098e2..6a3c6c43ea7133c934834ce1face9212f4e3d239:/lib/template/search-jsonv2.php?ds=sidebyside diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php index e907a081..d550a7e6 100644 --- a/lib/template/search-jsonv2.php +++ b/lib/template/search-jsonv2.php @@ -1,78 +1,79 @@ $aPointDetails) - { - $aPlace = array( - 'place_id'=>$aPointDetails['place_id'], - 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright", - ); - - $sOSMType = formatOSMType($aPointDetails['osm_type']); - if ($sOSMType) - { - $aPlace['osm_type'] = $sOSMType; - $aPlace['osm_id'] = $aPointDetails['osm_id']; - } - - if (isset($aPointDetails['aBoundingBox'])) - { - $aPlace['boundingbox'] = $aPointDetails['aBoundingBox']; - - if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons) - { - $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints']; - } - } - - if (isset($aPointDetails['zoom'])) - { - $aPlace['zoom'] = $aPointDetails['zoom']; - } - - $aPlace['lat'] = $aPointDetails['lat']; - $aPlace['lon'] = $aPointDetails['lon']; - $aPlace['display_name'] = $aPointDetails['name']; - $aPlace['place_rank'] = $aPointDetails['rank_search']; - - $aPlace['category'] = $aPointDetails['class']; - $aPlace['type'] = $aPointDetails['type']; - - $aPlace['importance'] = $aPointDetails['importance']; - - if (isset($aPointDetails['icon'])) - { - $aPlace['icon'] = $aPointDetails['icon']; - } - - if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0) - { - $aPlace['address'] = $aPointDetails['address']; - } - - if (isset($aPointDetails['asgeojson'])) - { - $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']); - } - - if (isset($aPointDetails['assvg'])) - { - $aPlace['svg'] = $aPointDetails['assvg']; - } - - if (isset($aPointDetails['astext'])) - { - $aPlace['geotext'] = $aPointDetails['astext']; - } - - if (isset($aPointDetails['askml'])) - { - $aPlace['geokml'] = $aPointDetails['askml']; - } - - if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags']; - if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails']; - - $aFilteredPlaces[] = $aPlace; - } - - javascript_renderData($aFilteredPlaces); + +$aFilteredPlaces = array(); +foreach($aSearchResults as $iResNum => $aPointDetails) +{ + $aPlace = array( + 'place_id'=>$aPointDetails['place_id'], + 'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright", + ); + + $sOSMType = formatOSMType($aPointDetails['osm_type']); + if ($sOSMType) + { + $aPlace['osm_type'] = $sOSMType; + $aPlace['osm_id'] = $aPointDetails['osm_id']; + } + + if (isset($aPointDetails['aBoundingBox'])) + { + $aPlace['boundingbox'] = $aPointDetails['aBoundingBox']; + + if (isset($aPointDetails['aPolyPoints'])) + { + $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints']; + } + } + + if (isset($aPointDetails['zoom'])) + { + $aPlace['zoom'] = $aPointDetails['zoom']; + } + + $aPlace['lat'] = $aPointDetails['lat']; + $aPlace['lon'] = $aPointDetails['lon']; + $aPlace['display_name'] = $aPointDetails['name']; + $aPlace['place_rank'] = $aPointDetails['rank_search']; + + $aPlace['category'] = $aPointDetails['class']; + $aPlace['type'] = $aPointDetails['type']; + + $aPlace['importance'] = $aPointDetails['importance']; + + if (isset($aPointDetails['icon'])) + { + $aPlace['icon'] = $aPointDetails['icon']; + } + + if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0) + { + $aPlace['address'] = $aPointDetails['address']; + } + + if (isset($aPointDetails['asgeojson'])) + { + $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']); + } + + if (isset($aPointDetails['assvg'])) + { + $aPlace['svg'] = $aPointDetails['assvg']; + } + + if (isset($aPointDetails['astext'])) + { + $aPlace['geotext'] = $aPointDetails['astext']; + } + + if (isset($aPointDetails['askml'])) + { + $aPlace['geokml'] = $aPointDetails['askml']; + } + + if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags']; + if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails']; + + $aFilteredPlaces[] = $aPlace; +} + +javascript_renderData($aFilteredPlaces);