X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/29df9771bb137aec22302a3d6c01326a4e6a5f2f..36447c488a78017dc533f7ed42bc8cf20c72556d:/lib/AddressDetails.php?ds=inline diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php index 3322c6b2..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 @@ -61,23 +61,16 @@ class AddressDetails return join(', ', $aParts); } - public function getAddressNames() + public function getAddressNames($sCountry = null) { $aAddress = array(); - $aFallback = array(); foreach ($this->aAddressLines as $aLine) { if (!self::isAddress($aLine)) { continue; } - $bFallback = false; - $aTypeLabel = ClassTypes\getInfo($aLine); - - if ($aTypeLabel === false) { - $aTypeLabel = ClassTypes\getFallbackInfo($aLine); - $bFallback = true; - } + $sTypeLabel = ClassTypes\getLabelTag($aLine); $sName = null; if (isset($aLine['localname']) && $aLine['localname']!=='') { @@ -87,16 +80,11 @@ class AddressDetails } if (isset($sName)) { - $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel']) ? $aTypeLabel['simplelabel'] : $aTypeLabel['label']); - $sTypeLabel = str_replace(' ', '_', $sTypeLabel); + $sTypeLabel = strtolower(str_replace(' ', '_', $sTypeLabel)); if (!isset($aAddress[$sTypeLabel]) - || isset($aFallback[$sTypeLabel]) || $aLine['class'] == 'place' ) { $aAddress[$sTypeLabel] = $sName; - if ($bFallback) { - $aFallback[$sTypeLabel] = $bFallback; - } } } } @@ -129,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']) {