X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/76c146f3269ff07fdad66cb1d2d74c2acbc2af91..82dbcbb12a1285e7b345e232196b02b9cae35f9a:/lib-php/AddressDetails.php diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index a1a2a636..657dc3e2 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -93,8 +93,8 @@ class AddressDetails ) { $aAddress[$sTypeLabel] = $sName; - if ('state' === $sTypeLabel && !empty($aLine['name'])) { - $this->addStateCode($aAddress, $aLine['name']); + if (!empty($aLine['name'])) { + $this->addStateCode($aAddress, $sTypeLabel, $aLine['name']); } } } @@ -182,14 +182,13 @@ class AddressDetails /** * Add `state_code` field to address details to represent second part of ISO 3166-2 country subdivision code */ - private function addStateCode(&$aAddress, $nameDetails) + private function addStateCode(&$aAddress, $sTypeLabel, $nameDetails) { if (is_string($nameDetails)) { $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); } - - if (!empty($nameDetails['ref'])) { - $aAddress['state_code'] = $nameDetails['ref']; + if (!empty($nameDetails['ISO3166-2'])) { + $aAddress["$sTypeLabel:ISO3166-2"] = $nameDetails['ISO3166-2']; } } }