Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 8950f14cc3f9687c61e66c2543139088d267402a..6108aca4e005582d9446a75ca44737a0ab0ae5c3 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,65 +1,73 @@
-<?php\r
-       header("Content-Type: application/json; charset=UTF-8");\r
-       header("Access-Control-Allow-Origin: *");\r
-\r
-       $aFilteredPlaces = array();\r
-       foreach($aSearchResults as $iResNum => $aPointDetails)\r
-       {\r
-               $aPlace = array(\r
-                               'place_id'=>$aPointDetails['place_id'],\r
-                               'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",\r
-                       );\r
-\r
-               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));\r
-               if ($sOSMType)\r
-               {\r
-                       $aPlace['osm_type'] = $sOSMType;\r
-                       $aPlace['osm_id'] = $aPointDetails['osm_id'];\r
-               }\r
-\r
-                if (isset($aPointDetails['aBoundingBox']))\r
-                {\r
-                       $aPlace['boundingbox'] = array(\r
-                               $aPointDetails['aBoundingBox'][0],\r
-                               $aPointDetails['aBoundingBox'][1],\r
-                               $aPointDetails['aBoundingBox'][2],\r
-                               $aPointDetails['aBoundingBox'][3]);\r
-\r
-                       if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)\r
-                       {\r
-                               $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];\r
-                       }\r
-                }\r
-\r
-               if (isset($aPointDetails['zoom']))\r
-               {\r
-                       $aPlace['zoom'] = $aPointDetails['zoom'];\r
-               }\r
-\r
-               $aPlace['lat'] = $aPointDetails['lat'];\r
-               $aPlace['lon'] = $aPointDetails['lon'];\r
-               $aPlace['display_name'] = $aPointDetails['name'];\r
-\r
-               $aPlace['class'] = $aPointDetails['class'];\r
-               $aPlace['type'] = $aPointDetails['type'];\r
-               if ($aPointDetails['icon'])\r
-               {\r
-                       $aPlace['icon'] = $aPointDetails['icon'];\r
-               }\r
-\r
-               if (isset($aPointDetails['address']))\r
-               {\r
-                       $aPlace['address'] = $aPointDetails['address'];\r
-                }\r
-\r
-               $aFilteredPlaces[] = $aPlace;\r
-       }\r
-\r
-       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))\r
-       {\r
-               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';\r
-       }\r
-       else\r
-       {\r
-               echo javascript_renderData($aFilteredPlaces);\r
-       }\r
+<?php
+
+$aFilteredPlaces = array();
+foreach ($aSearchResults as $iResNum => $aPointDetails) {
+    $aPlace = array(
+               'place_id'=>$aPointDetails['place_id'],
+               'licence'=>'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+              );
+    
+    $sOSMType = formatOSMType($aPointDetails['osm_type']);
+    if ($sOSMType) {
+        $aPlace['osm_type'] = $sOSMType;
+        $aPlace['osm_id'] = $aPointDetails['osm_id'];
+    }
+
+    if (isset($aPointDetails['aBoundingBox'])) {
+        $aPlace['boundingbox'] = $aPointDetails['aBoundingBox'];
+
+        if (isset($aPointDetails['aPolyPoints'])) {
+            $aPlace['polygonpoints'] = $aPointDetails['aPolyPoints'];
+        }
+    }
+
+    if (isset($aPointDetails['zoom'])) {
+        $aPlace['zoom'] = $aPointDetails['zoom'];
+    }
+
+    $aPlace['lat'] = $aPointDetails['lat'];
+    $aPlace['lon'] = $aPointDetails['lon'];
+
+    $aPlace['display_name'] = $aPointDetails['name'];
+
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
+        $aPlace['place_rank'] = $aPointDetails['rank_search'];
+        $aPlace['category'] = $aPointDetails['class'];
+    } else {
+        $aPlace['class'] = $aPointDetails['class'];
+    }
+    $aPlace['type'] = $aPointDetails['type'];
+
+    $aPlace['importance'] = $aPointDetails['importance'];
+
+    if (isset($aPointDetails['icon']) && $aPointDetails['icon']) {
+        $aPlace['icon'] = $aPointDetails['icon'];
+    }
+
+    if (isset($aPointDetails['address'])) {
+        $aPlace['address'] = $aPointDetails['address']->getAddressNames();
+    }
+
+    if (isset($aPointDetails['asgeojson'])) {
+        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
+    }
+
+    if (isset($aPointDetails['assvg'])) {
+        $aPlace['svg'] = $aPointDetails['assvg'];
+    }
+
+    if (isset($aPointDetails['astext'])) {
+        $aPlace['geotext'] = $aPointDetails['astext'];
+    }
+
+    if (isset($aPointDetails['askml'])) {
+        $aPlace['geokml'] = $aPointDetails['askml'];
+    }
+
+    if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+    if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+
+    $aFilteredPlaces[] = $aPlace;
+}
+
+javascript_renderData($aFilteredPlaces);