safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

determine geocodejson address by rank instead of type

Browse Source 
Using the address rank to set the address parts catches
a much wider variety of types like 'town' and 'suburb'.
With recent address ranking changes the rank ranges
are relatively reliable.
This commit is contained in:
Sarah Hoffmann
2020-04-01 11:12:52 +02:00
parent fdc40d5169
commit ca8d776724
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/AddressDetails.php
View File

@@ -101,24 +101,47 @@ class AddressDetails
return $aAddress;
}
/**
* Annotates the given json with geocodejson address information fields.
*
* @param array $aJson Json hash to add the fields to.
*
* Geocodejson has the following fields:
* street, locality, postcode, city, district,
* county, state, country
*
* Postcode and housenumber are added by type, district is not used.
* All other fields are set according to address rank.
*/
public function addGeocodeJsonAddressParts(&$aJson)
{
$aFieldMappings = array(
'house_number' => 'housenumber',
'road' => 'street',
'locality' => 'locality',
'postcode' => 'postcode',
'city' => 'city',
'district' => 'district',
'county' => 'county',
'state' => 'state',
'country' => 'country'
);
foreach ($this->aAddressLines as $aLine) {
if (!$aLine['isaddress']) {
continue;
}
$aAddrNames = $this->getAddressNames();
foreach ($aFieldMappings as $sFrom => $sTo) {
if (isset($aAddrNames[$sFrom])) {
$aJson[$sTo] = $aAddrNames[$sFrom];
if (!isset($aLine['localname']) || $aLine['localname'] == '') {
continue;
}
$iRank = (int)$aLine['rank_address'];
if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
$aJson['postcode'] = $aLine['localname'];
} else if ($aLine['type'] == 'house_number') {
$aJson['housenumber'] = $aLine['localname'];
} else if ($iRank > 25 && $iRank < 28) {
$aJson['street'] = $aLine['localname'];
} else if ($iRank >= 17 && $iRank <= 25) {
$aJson['locality'] = $aLine['localname'];
} else if ($iRank >= 13 && $iRank <= 16) {
$aJson['city'] = $aLine['localname'];
} else if ($iRank >= 10 && $iRank <= 12) {
$aJson['county'] = $aLine['localname'];
} else if ($iRank >= 5 && $iRank <= 9) {
$aJson['state'] = $aLine['localname'];
} else if ($iRank == 4) {
$aJson['country'] = $aLine['localname'];
}
}
}