Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / AddressDetails.php

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index 2aae0742e131cb6c314e691cb84273d31a2f7180..3d17ede51cb4d3c605f3d166dca58af542c7a15f 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -2,17 +2,20 @@
 
 namespace Nominatim;
 
-require_once(CONST_BasePath.'/lib/ClassTypes.php');
+require_once(CONST_LibDir.'/ClassTypes.php');
 
 /**
  * Detailed list of address parts for a single result
  */
 class AddressDetails
 {
+    private $iPlaceID;
     private $aAddressLines;
 
     public function __construct(&$oDB, $iPlaceID, $sHousenumber, $mLangPref)
     {
+        $this->iPlaceID = $iPlaceID;
+
         if (is_array($mLangPref)) {
             $mLangPref = $oDB->getArraySQL($oDB->getDBQuotedList($mLangPref));
         }
@@ -58,23 +61,16 @@ class AddressDetails
         return join(', ', $aParts);
     }
 
-    public function getAddressNames()
+    public function getAddressNames($sCountry = null)
     {
         $aAddress = array();
-        $aFallback = array();
 
         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']!=='') {
@@ -84,16 +80,11 @@ 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])
                     || $aLine['class'] == 'place'
                 ) {
                     $aAddress[$sTypeLabel] = $sName;
-                    if ($bFallback) {
-                        $aFallback[$sTypeLabel] = $bFallback;
-                    }
                 }
             }
         }
@@ -115,7 +106,7 @@ class AddressDetails
      */
     public function addGeocodeJsonAddressParts(&$aJson)
     {
-        foreach ($this->aAddressLines as $aLine) {
+        foreach (array_reverse($this->aAddressLines) as $aLine) {
             if (!$aLine['isaddress']) {
                 continue;
             }
@@ -124,25 +115,35 @@ class AddressDetails
                 continue;
             }
 
-            $iRank = (int)$aLine['rank_address'];
-
             if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
                 $aJson['postcode'] = $aLine['localname'];
-            } else if ($aLine['type'] == 'house_number') {
+                continue;
+            }
+
+            if ($aLine['type'] == 'house_number') {
                 $aJson['housenumber'] = $aLine['localname'];
-            } else if ($iRank > 25 && $iRank < 28) {
+                continue;
+            }
+
+            if ($this->iPlaceID == $aLine['place_id']) {
+                continue;
+            }
+
+            $iRank = (int)$aLine['rank_address'];
+
+            if ($iRank > 25 && $iRank < 28) {
                 $aJson['street'] = $aLine['localname'];
-            } else if ($iRank >= 22 && $iRank <= 25) {
+            } elseif ($iRank >= 22 && $iRank <= 25) {
                 $aJson['locality'] = $aLine['localname'];
-            } else if ($iRank >= 17 && $iRank <= 21) {
+            } elseif ($iRank >= 17 && $iRank <= 21) {
                 $aJson['district'] = $aLine['localname'];
-            } else if ($iRank >= 13 && $iRank <= 16) {
+            } elseif ($iRank >= 13 && $iRank <= 16) {
                 $aJson['city'] = $aLine['localname'];
-            } else if ($iRank >= 10 && $iRank <= 12) {
+            } elseif ($iRank >= 10 && $iRank <= 12) {
                 $aJson['county'] = $aLine['localname'];
-            } else if ($iRank >= 5 && $iRank <= 9) {
+            } elseif ($iRank >= 5 && $iRank <= 9) {
                 $aJson['state'] = $aLine['localname'];
-            } else if ($iRank == 4) {
+            } elseif ($iRank == 4) {
                 $aJson['country'] = $aLine['localname'];
             }
         }