Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 095bfb797a6b5b27e1aaddb14ba298bc49db7e5f..1c2a04dd84028df86bfa3126ef3b2d647a7863a8 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -4,7 +4,7 @@
        {
                $aPlace = array(
                                'place_id'=>$aPointDetails['place_id'],
-                               'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+                               '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':'')));
@@ -36,10 +36,11 @@
                $aPlace['lat'] = $aPointDetails['lat'];
                $aPlace['lon'] = $aPointDetails['lon'];
                $aPlace['display_name'] = $aPointDetails['name'];
+               $aPlace['place_rank'] = $aPointDetails['rank_search'];
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
-               if ($aPointDetails['icon'])
+               if (isset($aPointDetails['icon']))
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
@@ -49,7 +50,27 @@
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 
+                if (isset($aPointDetails['asgeojson']))
+                {
+                       $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+                }
+
+                if (isset($aPointDetails['assvg']))
+                {
+                       $aPlace['svg'] = $aPointDetails['assvg'];
+                }
+
+                if (isset($aPointDetails['astext']))
+                {
+                        $aPlace['geotext'] = $aPointDetails['astext'];
+                }
+
+                if (isset($aPointDetails['askml']))
+                {
+                        $aPlace['geokml'] = $aPointDetails['askml'];
+                }
+
                $aFilteredPlaces[] = $aPlace;
        }
 
-       javascript_renderData($aFilteredPlaces);
+       javascript_renderData($aFilteredPlaces, array('geojson'));