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

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 126f78662df64970a3acc6c120599637fdaf975d..251388b51a4157e6a7bd54871936eb79880d028f 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -7,26 +7,22 @@
                                '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;
                        $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']))
                {
@@ -51,29 +47,32 @@
                if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
                {
                        $aPlace['address'] = $aPointDetails['address'];
-                }
+               }
 
-                if (isset($aPointDetails['asgeojson']))
-                {
+               if (isset($aPointDetails['asgeojson']))
+               {
                        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-                }
+               }
 
-                if (isset($aPointDetails['assvg']))
-                {
+               if (isset($aPointDetails['assvg']))
+               {
                        $aPlace['svg'] = $aPointDetails['assvg'];
-                }
+               }
+
+               if (isset($aPointDetails['astext']))
+               {
+                       $aPlace['geotext'] = $aPointDetails['astext'];
+               }
 
-                if (isset($aPointDetails['astext']))
-                {
-                        $aPlace['geotext'] = $aPointDetails['astext'];
-                }
+               if (isset($aPointDetails['askml']))
+               {
+                       $aPlace['geokml'] = $aPointDetails['askml'];
+               }
 
-                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, array('geojson'));
+       javascript_renderData($aFilteredPlaces);