Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 4eed52ae122490f8f8d0abbf2bdb6c16d15d12a0..45272d3540dc822511148b3bd1b5bcfb6ef80075 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -4,7 +4,7 @@
        {
                $aPlace = array(
                                'place_id'=>$aPointDetails['place_id'],
        {
                $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':'')));
                        );
 
                $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));


@@ -39,7 +39,7 @@
 
                $aPlace['class'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
 
                $aPlace['class'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];

-               if ($aPointDetails['icon'])
+               if (isset($aPointDetails['icon']) && $aPointDetails['icon'])

                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }


@@ -49,6 +49,26 @@
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 

+                if (isset($aResult['asgeojson']))
+                {
+                        $aPlace['geojson'] = json_decode($aResult['asgeojson']);
+                }
+
+                if (isset($aResult['assvg']))
+                {
+                        $aPlace['svg'] = $aResult['assvg'];
+                }
+
+                if (isset($aResult['astext']))
+                {
+                        $aPlace['geotext'] = $aResult['astext'];
+                }
+
+               if (isset($aResult['askml']))
+               {
+                       $aPlace['geokml'] = $aResult['askml'];
+               }
+

                $aFilteredPlaces[] = $aPlace;
        }
 
                $aFilteredPlaces[] = $aPlace;
        }