Reverted change on FIPS 35013 to remain ASCII

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 0a1d074a3540e8f68aa0d323fbeff98307e1e0f0..ff245e145f4dac3414cd073592634c6cd933115e 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -10,7 +10,7 @@
        }
        else
        {
        }
        else
        {

-               if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+               if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];

                $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
                $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
                 if ($sOSMType)
                $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
                $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
                 if ($sOSMType)


@@ -21,7 +21,9 @@
                 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'];

-               if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
+               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);
        }
 
        javascript_renderData($aFilteredPlaces);