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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 7c695ea5..4b3b279d 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,13 +1,12 @@
 <?php
-	header("Content-Type: application/json; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
+	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':'')));
@@ -42,7 +41,7 @@
 
 		$aPlace['class'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
-		if ($aPointDetails['icon'])
+		if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
@@ -52,14 +51,27 @@
 			$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;
 	}
 
-	if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
-	{
-		echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
-	}
-	else
-	{
-		echo javascript_renderData($aFilteredPlaces);
-	}
+	javascript_renderData($aFilteredPlaces);