X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c8359181237a3b145ac48b5e58098b36674cd89f..d3f7465ccad9cce6c84f0b089282c5ece550c5ed:/lib/template/address-json.php diff --git a/lib/template/address-json.php b/lib/template/address-json.php index cea87745..691d6a74 100644 --- a/lib/template/address-json.php +++ b/lib/template/address-json.php @@ -2,7 +2,7 @@ $aFilteredPlaces = array(); -if (!sizeof($aPlace)) { +if (empty($aPlace)) { if (isset($sError)) $aFilteredPlaces['error'] = $sError; else $aFilteredPlaces['error'] = 'Unable to geocode'; @@ -16,8 +16,25 @@ if (!sizeof($aPlace)) { } if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat']; if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon']; + + if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') { + $aFilteredPlaces['place_rank'] = $aPlace['rank_search']; + + $aFilteredPlaces['category'] = $aPlace['class']; + $aFilteredPlaces['type'] = $aPlace['type']; + + $aFilteredPlaces['importance'] = $aPlace['importance']; + + $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']); + + $aFilteredPlaces['name'] = $aPlace['placename']; + } + $aFilteredPlaces['display_name'] = $aPlace['langaddress']; - if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress']; + + if (isset($aPlace['address'])) { + $aFilteredPlaces['address'] = $aPlace['address']->getAddressNames(); + } if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags']; if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];