X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/932d945b7f897fd18be7d4c2fac3eda3915aa296..de978c9987ddbb6595029b23b5dfd2823fc4ea3f:/lib/template/address-jsonv2.php?ds=sidebyside diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php index 96247182..92cf4f1c 100644 --- a/lib/template/address-jsonv2.php +++ b/lib/template/address-jsonv2.php @@ -3,7 +3,7 @@ if (!sizeof($aPlace)) { - if ($sError) + if (isset($sError)) $aFilteredPlaces['error'] = $sError; else $aFilteredPlaces['error'] = 'Unable to geocode'; @@ -11,7 +11,7 @@ else { if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id']; - $aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0."; + $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright"; $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':''))); if ($sOSMType) { @@ -20,13 +20,19 @@ } if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat']; if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon']; + + $aFilteredPlaces['place_rank'] = $aPlace['rank_search']; + $aFilteredPlaces['category'] = $aPlace['class']; $aFilteredPlaces['type'] = $aPlace['type']; + + $aFilteredPlaces['importance'] = $aPlace['importance']; + $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']); $aFilteredPlaces['display_name'] = $aPlace['langaddress']; $aFilteredPlaces['name'] = $aPlace['placename']; - if ($bShowAddressDetails && $aAddress && sizeof($aAddress)) $aFilteredPlaces['address'] = $aAddress; + if ($bShowAddressDetails && $aPlace['aAddress'] && sizeof($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress']; } javascript_renderData($aFilteredPlaces);