Merge remote-tracking branch 'upstream/master' into cmake-port

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

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 894038758411117edf6ed9a9a6350a3b3b3c0ec3..d62141769b89cc33ecc26e19fb6e03d585f95b74 100644 (file)
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -12,7 +12,7 @@
        {
                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':'')));
+               $sOSMType = formatOSMType($aPlace['osm_type']);
                if ($sOSMType)
                {
                        $aFilteredPlaces['osm_type'] = $sOSMType;
@@ -40,11 +40,6 @@
                if (isset($aPlace['aBoundingBox']))
                {
                        $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
-
-                       if (isset($aPlace['aPolyPoints']) && $bAsPoints)
-                       {
-                               $aFilteredPlaces['polygonpoints'] = $aPlace['aPolyPoints'];
-                       }
                }
 
                if (isset($aPlace['asgeojson']))