X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/82a11cae2ddb7cfe3b2a180346bb374efe2e6a9d..504922ffbecd42eed01dfb9da6bbf2c7aae9a094:/lib/AddressDetails.php?ds=sidebyside diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php index a721f4c5..3d17ede5 100644 --- a/lib/AddressDetails.php +++ b/lib/AddressDetails.php @@ -2,7 +2,7 @@ namespace Nominatim; -require_once(CONST_BasePath.'/lib/ClassTypes.php'); +require_once(CONST_LibDir.'/ClassTypes.php'); /** * Detailed list of address parts for a single result @@ -64,21 +64,13 @@ class AddressDetails public function getAddressNames($sCountry = null) { $aAddress = array(); - $aFallback = array(); foreach ($this->aAddressLines as $aLine) { if (!self::isAddress($aLine)) { continue; } - $bFallback = false; - $sTypeLabel = ClassTypes\getSimpleLabel($aLine); - - if ($sTypeLabel === false) { - $aTypeLabel = ClassTypes\getFallbackLabel($aLine['rank_address'], - $sCountry); - $bFallback = true; - } + $sTypeLabel = ClassTypes\getLabelTag($aLine); $sName = null; if (isset($aLine['localname']) && $aLine['localname']!=='') { @@ -90,11 +82,9 @@ class AddressDetails if (isset($sName)) { $sTypeLabel = strtolower(str_replace(' ', '_', $sTypeLabel)); if (!isset($aAddress[$sTypeLabel]) - || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place' ) { $aAddress[$sTypeLabel] = $sName; - $aFallback[$sTypeLabel] = $bFallback; } } } @@ -127,8 +117,12 @@ class AddressDetails if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') { $aJson['postcode'] = $aLine['localname']; - } elseif ($aLine['type'] == 'house_number') { + continue; + } + + if ($aLine['type'] == 'house_number') { $aJson['housenumber'] = $aLine['localname']; + continue; } if ($this->iPlaceID == $aLine['place_id']) {