X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8fd7d319b7ef6ee4d4f8cf3b61eb47903e7fb1eb..797c2d1e74a14d8d52d963f1efad9be53fca5f5f:/lib/template/search-batch-json.php

diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php
index 13c61952..60d38041 100644
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -6,22 +6,23 @@
 
 	foreach($aBatchResults as $aSearchResults)
 	{
+		if (!$aSearchResults) $aSearchResults = array();
 		$aFilteredPlaces = array();
 		foreach($aSearchResults as $iResNum => $aPointDetails)
 		{
 			$aPlace = array(
-					'place_id'=>$aPointDetails['place_id'],
-				  );
+						'place_id'=>$aPointDetails['place_id'],
+					);
 
-			$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
+			$sOSMType = formatOSMType($aPointDetails['osm_type']);
 			if ($sOSMType)
 			{
 				$aPlace['osm_type'] = $sOSMType;
 				$aPlace['osm_id'] = $aPointDetails['osm_id'];
 			}
 
-        	        if (isset($aPointDetails['aBoundingBox']))
-                	{
+			if (isset($aPointDetails['aBoundingBox']))
+			{
 				$aPlace['boundingbox'] = array(
 					$aPointDetails['aBoundingBox'][0],
 					$aPointDetails['aBoundingBox'][1],
@@ -32,7 +33,7 @@
 				{
 					$aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
 				}
-	                }
+			}
 
 			if (isset($aPointDetails['zoom']))
 			{
@@ -57,27 +58,27 @@
 			if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
 			{
 				$aPlace['address'] = $aPointDetails['address'];
-        	        }
+			}
 
-	                if (isset($aPointDetails['asgeojson']))
-        	        {
+			if (isset($aPointDetails['asgeojson']))
+			{
 				$aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
-        	        }
+			}
 
-	                if (isset($aPointDetails['assvg']))
-        	        {
+			if (isset($aPointDetails['assvg']))
+			{
 				$aPlace['svg'] = $aPointDetails['assvg'];
-	                }
+			}
 
-	                if (isset($aPointDetails['astext']))
-        	        {
-                	        $aPlace['geotext'] = $aPointDetails['astext'];
-	                }
+			if (isset($aPointDetails['astext']))
+			{
+				$aPlace['geotext'] = $aPointDetails['astext'];
+			}
 
-        	        if (isset($aPointDetails['askml']))
-                	{
-                        	$aPlace['geokml'] = $aPointDetails['askml'];
-	                }
+			if (isset($aPointDetails['askml']))
+			{
+				$aPlace['geokml'] = $aPointDetails['askml'];
+			}
 
 			$aFilteredPlaces[] = $aPlace;
 		}