osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 10:43:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

further tweaks to geocodejson address output

Browse Source 
Removes the place itself from the address details and use
the lowest ranking element in the rank range for the output.
This commit is contained in:
Sarah Hoffmann 2020-04-08 10:11:08 +02:00
parent e68c1132da
commit 29df9771bb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/AddressDetails.php
View File

@ -9,10 +9,13 @@ require_once(CONST_BasePath.'/lib/ClassTypes.php');
*/
class AddressDetails
{
private $iPlaceID;
private $aAddressLines;
public function __construct(&$oDB, $iPlaceID, $sHousenumber, $mLangPref)
{
$this->iPlaceID = $iPlaceID;
if (is_array($mLangPref)) {
$mLangPref = $oDB->getArraySQL($oDB->getDBQuotedList($mLangPref));
}
@ -115,7 +118,7 @@ class AddressDetails
*/
public function addGeocodeJsonAddressParts(&$aJson)
{
foreach ($this->aAddressLines as $aLine) {
foreach (array_reverse($this->aAddressLines) as $aLine) {
if (!$aLine['isaddress']) {
continue;
}
@ -124,13 +127,19 @@ class AddressDetails
continue;
}
$iRank = (int)$aLine['rank_address'];
if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
$aJson['postcode'] = $aLine['localname'];
} elseif ($aLine['type'] == 'house_number') {
$aJson['housenumber'] = $aLine['localname'];
} elseif ($iRank > 25 && $iRank < 28) {
}
if ($this->iPlaceID == $aLine['place_id']) {
continue;
}
$iRank = (int)$aLine['rank_address'];
if ($iRank > 25 && $iRank < 28) {
$aJson['street'] = $aLine['localname'];
} elseif ($iRank >= 22 && $iRank <= 25) {
$aJson['locality'] = $aLine['localname'];