Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 5e52238b73f029abc56a7e5e2f45994bfdc83919..d550a7e6706d19d6ea09f97031703b503657f089 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -1,65 +1,79 @@
 <?php
 <?php

-       header("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
-       $aFilteredPlaces = array();
-       foreach($aSearchResults as $iResNum => $aPointDetails)
-       {
-               $aPlace = array(
-                               'place_id'=>$aPointDetails['place_id'],
-                               'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
-                       );
-
-               $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
-               if ($sOSMType)
-               {
-                       $aPlace['osm_type'] = $sOSMType;
-                       $aPlace['osm_id'] = $aPointDetails['osm_id'];
-               }
-
-                if (isset($aPointDetails['aBoundingBox']))
-                {
-                       $aPlace['boundingbox'] = array(
-                               $aPointDetails['aBoundingBox'][0],
-                               $aPointDetails['aBoundingBox'][1],
-                               $aPointDetails['aBoundingBox'][2],
-                               $aPointDetails['aBoundingBox'][3]);
-
-                       if (isset($aPointDetails['aPolyPoints']) && $bShowPolygons)
-                       {
-                               $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'];
-
-               $aPlace['category'] = $aPointDetails['class'];
-               $aPlace['type'] = $aPointDetails['type'];
-               if ($aPointDetails['icon'])
-               {
-                       $aPlace['icon'] = $aPointDetails['icon'];
-               }
-
-               if (isset($aPointDetails['address']))
-               {
-                       $aPlace['address'] = $aPointDetails['address'];
-                }
-
-               $aFilteredPlaces[] = $aPlace;
-       }
-
-       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
-       {
-               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
-       }
-       else
-       {
-               echo javascript_renderData($aFilteredPlaces);
-       }
+
+$aFilteredPlaces = array();
+foreach($aSearchResults as $iResNum => $aPointDetails)
+{
+    $aPlace = array(
+            'place_id'=>$aPointDetails['place_id'],
+            'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.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'];
+    $aPlace['place_rank'] = $aPointDetails['rank_search'];
+
+    $aPlace['category'] = $aPointDetails['class'];
+    $aPlace['type'] = $aPointDetails['type'];
+
+    $aPlace['importance'] = $aPointDetails['importance'];
+
+    if (isset($aPointDetails['icon']))
+    {
+        $aPlace['icon'] = $aPointDetails['icon'];
+    }
+
+    if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
+    {
+        $aPlace['address'] = $aPointDetails['address'];
+    }
+
+    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);