Merge remote-tracking branch 'markus/master' into master

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index d1edaf0d14cb60c68f8afb70a0161351ef673505..6254357a711b3727498a722b06c61640d04ca308 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -12,7 +12,8 @@
        {
                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':'')));
+               $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':
+               ($aPlace['osm_type'] == 'T'?'tiger':($aPlace['osm_type'] == 'I'?'interpolation':'')))));
                if ($sOSMType)
                {
                        $aFilteredPlaces['osm_type'] = $sOSMType;
@@ -24,6 +25,38 @@
                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['aPolyPoints']) && $bAsPoints)
+                       {
+                               $aFilteredPlaces['polygonpoints'] = $aPlace['aPolyPoints'];
+                       }
+               }
+
+               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);