respect addressdetails parameter in json output

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index e08b8ac3623b199a14d774356ea30878278ba9b0..3c7327a32465dc0c568005b1b41d867e2d997c1d 100644 (file)
--- 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'];
                 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']))
        }
 
        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 b6ff1627dcb33d550cba8fbe952c64cc4e4bf8bc..d697730c14226dd68378517376443bd2bcc272b7 100644 (file)
--- 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['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']))
        }
 
        if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_]+$/',$_GET['json_callback']))