merge in the postcode and is_in terms into the address vector for search

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 7c695ea5bd51573d19285d2cd21f463ee0932076..57586fb9eee3c3adeb24003e225d64fb11480aaf 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,13 +1,12 @@
 <?php
-       header("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
+       header("content-type: application/json; charset=UTF-8");
 
        $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.",
+                               'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
                        );
 
                $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
@@ -42,7 +41,10 @@
 
                $aPlace['class'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
-               if ($aPointDetails['icon'])
+
+               $aPlace['importance'] = $aPointDetails['importance'];
+
+               if (isset($aPointDetails['icon']) && $aPointDetails['icon'])
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
@@ -52,14 +54,27 @@
                        $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'];
+               }
+
                $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);
-       }
+       javascript_renderData($aFilteredPlaces);