X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d396505786ce3be105249c740e0d3365beb4ef10..e891aa304193e274992d96a8bef01fd3f7ebe7e2:/lib/template/search-json.php

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 4eed52ae..57586fb9 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,10 +1,12 @@
 <?php
+	header("content-type: application/json; charset=UTF-8");
+
 	$aFilteredPlaces = array();
 	foreach($aSearchResults as $iResNum => $aPointDetails)
 	{
 		$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':'')));
@@ -39,7 +41,10 @@
 
 		$aPlace['class'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
-		if ($aPointDetails['icon'])
+
+		$aPlace['importance'] = $aPointDetails['importance'];
+
+		if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
@@ -49,6 +54,26 @@
 			$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;
 	}