Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index c994eb02781181ae9d554e915049cd4118ab649c..d1edaf0d14cb60c68f8afb70a0161351ef673505 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -13,18 +13,18 @@
                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 (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['osm_type'] = $sOSMType;
-                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
-                }
-                if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
-                if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+               if ($sOSMType)
+               {
+                       $aFilteredPlaces['osm_type'] = $sOSMType;
+                       $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
+               }
+               if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
+               if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];

                $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
                if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
                if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
                if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
        }
 
                $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
                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, JSON_FORCE_OBJECT);
+       javascript_renderData($aFilteredPlaces);