X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3233cb9512105d65442a40260cf16d8688d76a5..932d945b7f897fd18be7d4c2fac3eda3915aa296:/lib/template/search-jsonv2.php

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 5e52238b..89479dfb 100644
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -1,7 +1,4 @@
 <?php
-	header("Content-Type: application/json; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
-
 	$aFilteredPlaces = array();
 	foreach($aSearchResults as $iResNum => $aPointDetails)
 	{
@@ -39,6 +36,7 @@
 		$aPlace['lat'] = $aPointDetails['lat'];
 		$aPlace['lon'] = $aPointDetails['lon'];
 		$aPlace['display_name'] = $aPointDetails['name'];
+		$aPlace['place_rank'] = $aResult['rank_search'];
 
 		$aPlace['category'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
@@ -47,7 +45,7 @@
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
 
-		if (isset($aPointDetails['address']))
+		if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
 		{
 			$aPlace['address'] = $aPointDetails['address'];
                 }
@@ -55,11 +53,4 @@
 		$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);