switch attributions to ODbL

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 57c162cacaa4926102bbf39633a17e9c5d52317d..fa801ac497585ddfda7d7e9a7e0d2b5a16dd35fd 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -4,7 +4,7 @@
        {
                $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':'')));
@@ -36,6 +36,7 @@
                $aPlace['lat'] = $aPointDetails['lat'];
                $aPlace['lon'] = $aPointDetails['lon'];
                $aPlace['display_name'] = $aPointDetails['name'];
+               $aPlace['place_rank'] = $aResult['rank_search'];
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
@@ -44,7 +45,7 @@
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
 
-               if (isset($aPointDetails['address']))
+               if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
                {
                        $aPlace['address'] = $aPointDetails['address'];
                 }