Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index f05dbd809d8d696f8ae07febbbcdf8efd0a03f8b..b157ed56d5e75e9e5c27c0904f16170f1067be15 100644 (file)
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -1,41 +1,68 @@
 <?php
 <?php

-       $aFilteredPlaces = array();
-
-       if (!sizeof($aPlace))
-       {
-               if (isset($sError))
-                       $aFilteredPlaces['error'] = $sError;
-               else
-                       $aFilteredPlaces['error'] = 'Unable to geocode';
-       }
-       else
-       {
-               if ($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'];
-
-               $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
-
-               $aFilteredPlaces['category'] = $aPlace['class'];
-               $aFilteredPlaces['type'] = $aPlace['type'];
-
-               $aFilteredPlaces['importance'] = $aPlace['importance'];
-
-               $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
-
-               $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
-               $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, JSON_FORCE_OBJECT);
+
+$aFilteredPlaces = array();
+
+if (!sizeof($aPlace))
+{
+    if (isset($sError))
+        $aFilteredPlaces['error'] = $sError;
+    else
+        $aFilteredPlaces['error'] = 'Unable to geocode';
+}
+else
+{
+    if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+    $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    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['place_rank'] = $aPlace['rank_search'];
+
+    $aFilteredPlaces['category'] = $aPlace['class'];
+    $aFilteredPlaces['type'] = $aPlace['type'];
+
+    $aFilteredPlaces['importance'] = $aPlace['importance'];
+
+    $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+
+    $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+    $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'];
+
+    if (isset($aPlace['aBoundingBox']))
+    {
+        $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
+    }
+
+    if (isset($aPlace['asgeojson']))
+    {
+        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
+    }
+
+    if (isset($aPlace['assvg']))
+    {
+        $aFilteredPlaces['svg'] = $aPlace['assvg'];
+    }
+
+    if (isset($aPlace['astext']))
+    {
+        $aFilteredPlaces['geotext'] = $aPlace['astext'];
+    }
+
+    if (isset($aPlace['askml']))
+    {
+        $aFilteredPlaces['geokml'] = $aPlace['askml'];
+    }
+
+}
+
+javascript_renderData($aFilteredPlaces);