Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / AddressDetails.php

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index 3322c6b2da8d985f6473a2cecba540cd53d5dd14..dd86707974765570ae9a1766eb8d29a06fb299e7 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -61,23 +61,16 @@ class AddressDetails
         return join(', ', $aParts);
     }
 
         return join(', ', $aParts);
     }
 

-    public function getAddressNames()
+    public function getAddressNames($sCountry = null)

     {
         $aAddress = array();
     {
         $aAddress = array();

-        $aFallback = array();

 
         foreach ($this->aAddressLines as $aLine) {
             if (!self::isAddress($aLine)) {
                 continue;
             }
 
 
         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']!=='') {
 
             $sName = null;
             if (isset($aLine['localname']) && $aLine['localname']!=='') {


@@ -87,16 +80,11 @@ class AddressDetails
             }
 
             if (isset($sName)) {
             }
 
             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])
                 if (!isset($aAddress[$sTypeLabel])

-                    || isset($aFallback[$sTypeLabel])

                     || $aLine['class'] == 'place'
                 ) {
                     $aAddress[$sTypeLabel] = $sName;
                     || $aLine['class'] == 'place'
                 ) {
                     $aAddress[$sTypeLabel] = $sName;

-                    if ($bFallback) {
-                        $aFallback[$sTypeLabel] = $bFallback;
-                    }

                 }
             }
         }
                 }
             }
         }