X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fa1f23edfbd0672ae430722152314ecc69615b56..991bd0004a400c84c2a63053eb6671a6442204f8:/lib/template/search-jsonv2.php diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php index e1552a15..773cfd96 100644 --- a/lib/template/search-jsonv2.php +++ b/lib/template/search-jsonv2.php @@ -14,19 +14,15 @@ $aPlace['osm_id'] = $aPointDetails['osm_id']; } - if (isset($aPointDetails['aBoundingBox'])) - { - $aPlace['boundingbox'] = array( - $aPointDetails['aBoundingBox'][0], - $aPointDetails['aBoundingBox'][1], - $aPointDetails['aBoundingBox'][2], - $aPointDetails['aBoundingBox'][3]); + if (isset($aPointDetails['aBoundingBox'])) + { + $aPlace['boundingbox'] = $aPointDetails['aBoundingBox']; if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons) { $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints']; } - } + } if (isset($aPointDetails['zoom'])) { @@ -40,6 +36,9 @@ $aPlace['category'] = $aPointDetails['class']; $aPlace['type'] = $aPointDetails['type']; + + $aPlace['importance'] = $aPointDetails['importance']; + if (isset($aPointDetails['icon'])) { $aPlace['icon'] = $aPointDetails['icon']; @@ -48,29 +47,32 @@ if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0) { $aPlace['address'] = $aPointDetails['address']; - } + } + + if (isset($aPointDetails['asgeojson'])) + { + $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']); + } - if (isset($aResult['asgeojson'])) - { - $aPlace['geojson'] = json_decode($aResult['asgeojson']); - } + if (isset($aPointDetails['assvg'])) + { + $aPlace['svg'] = $aPointDetails['assvg']; + } - if (isset($aResult['assvg'])) - { - $aPlace['svg'] = $aResult['assvg']; - } + if (isset($aPointDetails['astext'])) + { + $aPlace['geotext'] = $aPointDetails['astext']; + } - if (isset($aResult['astext'])) - { - $aPlace['geotext'] = $aResult['astext']; - } + if (isset($aPointDetails['askml'])) + { + $aPlace['geokml'] = $aPointDetails['askml']; + } - if (isset($aResult['askml'])) - { - $aPlace['geokml'] = $aResult['askml']; - } + if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags']; + if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails']; $aFilteredPlaces[] = $aPlace; } - javascript_renderData($aFilteredPlaces, array('geojson')); + javascript_renderData($aFilteredPlaces);