Merge remote-tracking branch 'markus/master' into master

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 068599191b0d01e4a5e5a25842bda2a6783aa731..5d5ebfe81f9782706c4cb9ed24a74920c9baf15e 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -8,8 +8,9 @@
                                'place_id'=>$aPointDetails['place_id'],
                                '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':'')));
+        
+               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?
+                                       'relation':($aPointDetails['osm_type'] == 'T'?'tiger':($aPointDetails['osm_type'] == 'I'?'interpolation':'')))));
                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;
@@ -18,7 +19,7 @@
 
                if (isset($aPointDetails['aBoundingBox']))
                {
-                       $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'][0];
+                       $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
 
                        if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
                        {