more tests for libphp - incorporate lonvias feedback

[nominatim.git] / lib / template / address-jsonv2.php

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 92cf4f1cc5025d830ea92556682f2eb8e746348e..a8a05dd48cfa3c5a7e34c81372630245e93864bb 100644 (file)
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -23,16 +23,19 @@
 
                $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
 
-                $aFilteredPlaces['category'] = $aPlace['class'];
-                $aFilteredPlaces['type'] = $aPlace['type'];
+               $aFilteredPlaces['category'] = $aPlace['class'];
+               $aFilteredPlaces['type'] = $aPlace['type'];
 
                $aFilteredPlaces['importance'] = $aPlace['importance'];
 
-                $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+               $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
 
                $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-                $aFilteredPlaces['name'] = $aPlace['placename'];
-               if ($bShowAddressDetails && $aPlace['aAddress'] && sizeof($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+               $aFilteredPlaces['name'] = $aPlace['placename'];
+
+               if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+               if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+               if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
        }
 
        javascript_renderData($aFilteredPlaces);