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

first draft

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-05-15 17:36:37 +02:00
parent 431948d768
commit 82a11cae2d
2 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/AddressDetails.php
View File

@@ -61,7 +61,7 @@ class AddressDetails
return join(', ', $aParts);
}
public function getAddressNames()
public function getAddressNames($sCountry = null)
{
$aAddress = array();
$aFallback = array();
@@ -72,10 +72,11 @@ class AddressDetails
}
$bFallback = false;
$aTypeLabel = ClassTypes\getInfo($aLine);
$sTypeLabel = ClassTypes\getSimpleLabel($aLine);
if ($aTypeLabel === false) {
$aTypeLabel = ClassTypes\getFallbackInfo($aLine);
if ($sTypeLabel === false) {
$aTypeLabel = ClassTypes\getFallbackLabel($aLine['rank_address'],
$sCountry);
$bFallback = true;
}
@@ -87,16 +88,13 @@ 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])
|| (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel])
|| $aLine['class'] == 'place'
) {
$aAddress[$sTypeLabel] = $sName;
if ($bFallback) {
$aFallback[$sTypeLabel] = $bFallback;
}
$aFallback[$sTypeLabel] = $bFallback;
}
}
}