From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Mar 2012 16:45:53 +0000 (+0100)
Subject: respect addressdetails parameter in json output
X-Git-Tag: v2.0.0~104
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d88778a561100db69ad439688698c673a2796bb6

respect addressdetails parameter in json output
---

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index e08b8ac3..3c7327a3 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -24,7 +24,7 @@
                 if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
                 if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-		$aFilteredPlaces['address'] = $aAddress;
+		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
 	}
 
 	if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index b6ff1627..d697730c 100644
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -29,7 +29,7 @@
 
 		$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
                 $aFilteredPlaces['name'] = $aPlace['placename'];
-		$aFilteredPlaces['address'] = $aAddress;
+		if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
 	}
 
 	if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_]+$/',$_GET['json_callback']))