add osm_type='tiger' to json, jsonv2 and xml output

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 66098d303e69272826030bee08a0f6b30a47156d..6f23ae26b431e601ca242a8e0256a24a316a069b 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -7,7 +7,7 @@
                                'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
 
                                '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':''))));

                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;
                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;


@@ -16,11 +16,7 @@
 
                if (isset($aPointDetails['aBoundingBox']))
                {
 
                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)
                        {
 
                        if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
                        {