Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / AddressDetails.php

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index a721f4c5ea689b66c6aa208c99c0458c00911653..a27d3e797feefd123bbd11ab52c48a630ac14929 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -64,21 +64,13 @@ class AddressDetails
     public function getAddressNames($sCountry = null)
     {
         $aAddress = array();
     public function getAddressNames($sCountry = null)
     {
         $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;
-            $sTypeLabel = ClassTypes\getSimpleLabel($aLine);
-
-            if ($sTypeLabel === false) {
-                $aTypeLabel = ClassTypes\getFallbackLabel($aLine['rank_address'],
-                                                          $sCountry);
-                $bFallback = true;
-            }
+            $sTypeLabel = ClassTypes\getLabelTag($aLine);

 
             $sName = null;
             if (isset($aLine['localname']) && $aLine['localname']!=='') {
 
             $sName = null;
             if (isset($aLine['localname']) && $aLine['localname']!=='') {


@@ -90,11 +82,9 @@ class AddressDetails
             if (isset($sName)) {
                 $sTypeLabel = strtolower(str_replace(' ', '_', $sTypeLabel));
                 if (!isset($aAddress[$sTypeLabel])
             if (isset($sName)) {
                 $sTypeLabel = strtolower(str_replace(' ', '_', $sTypeLabel));
                 if (!isset($aAddress[$sTypeLabel])

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

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

-                    $aFallback[$sTypeLabel] = $bFallback;

                 }
             }
         }
                 }
             }
         }


@@ -127,8 +117,12 @@ class AddressDetails
 
             if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
                 $aJson['postcode'] = $aLine['localname'];
 
             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'];
                 $aJson['housenumber'] = $aLine['localname'];

+                continue;

             }
 
             if ($this->iPlaceID == $aLine['place_id']) {
             }
 
             if ($this->iPlaceID == $aLine['place_id']) {