Merge remote-tracking branch 'lonvia/address-importance'

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 5e52238b73f029abc56a7e5e2f45994bfdc83919..126f78662df64970a3acc6c120599637fdaf975d 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -1,13 +1,10 @@
 <?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'],
        $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':'')));
                        );
 
                $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));


@@ -39,27 +36,44 @@
                $aPlace['lat'] = $aPointDetails['lat'];
                $aPlace['lon'] = $aPointDetails['lon'];
                $aPlace['display_name'] = $aPointDetails['name'];
                $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['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];

-               if ($aPointDetails['icon'])
+
+               $aPlace['importance'] = $aPointDetails['importance'];
+
+               if (isset($aPointDetails['icon']))

                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
 
                {
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
 

-               if (isset($aPointDetails['address']))
+               if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)

                {
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 
                {
                        $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;
        }
 
                $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, array('geojson'));