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 542e37afdc39b6d9a54b32239e0064b47b9c6d03..d3dc00f3b505b497eb90f404d770f9ce2e2d0f56 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -8,27 +8,23 @@
                                'place_id'=>$aPointDetails['place_id'],
                                'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
                                '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 = formatOSMType($aPointDetails['osm_type']);

                if ($sOSMType)
                {
                        $aPlace['osm_type'] = $sOSMType;
                        $aPlace['osm_id'] = $aPointDetails['osm_id'];
                }
 
                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['aPolyPoints']) && $bShowPolygons)
                        {
                                $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
                        }

-                }
+               }

 
                if (isset($aPointDetails['zoom']))
                {
 
                if (isset($aPointDetails['zoom']))
                {


@@ -41,6 +37,9 @@
 
                $aPlace['class'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
 
                $aPlace['class'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];

+
+               $aPlace['importance'] = $aPointDetails['importance'];
+

                if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
                {
                        $aPlace['icon'] = $aPointDetails['icon'];


@@ -49,28 +48,31 @@
                if (isset($aPointDetails['address']))
                {
                        $aPlace['address'] = $aPointDetails['address'];
                if (isset($aPointDetails['address']))
                {
                        $aPlace['address'] = $aPointDetails['address'];

-                }
+               }

 
 

-                if (isset($aPointDetails['asgeojson']))
-                {
-                        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-                }
+               if (isset($aPointDetails['asgeojson']))
+               {
+                       $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+               }

 
 

-                if (isset($aPointDetails['assvg']))
-                {
-                        $aPlace['svg'] = $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;
        }
 
                $aFilteredPlaces[] = $aPlace;
        }