Merge remote-tracking branch 'upstream/master' into move-mouse-position-info-on-map

[nominatim.git] / lib / template / search-json.php

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index aae906220ce92d250dc1ed1bcb935ee19e344150..d3dc00f3b505b497eb90f404d770f9ce2e2d0f56 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -9,7 +9,7 @@
                                'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
         
-               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':($aPointDetails['osm_type'] == 'T'?'tiger':''))));
+               $sOSMType = formatOSMType($aPointDetails['osm_type']);
                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;
@@ -18,11 +18,7 @@
 
                if (isset($aPointDetails['aBoundingBox']))
                {
-                       $aPlace['boundingbox'] = array(
-                               $aPointDetails['aBoundingBox'][0],
-                               $aPointDetails['aBoundingBox'][1],
-                               $aPointDetails['aBoundingBox'][2],
-                               $aPointDetails['aBoundingBox'][3]);
+                       $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
 
                        if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
                        {