Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / AddressDetails.php

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index 2aae0742e131cb6c314e691cb84273d31a2f7180..3322c6b2da8d985f6473a2cecba540cd53d5dd14 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -9,10 +9,13 @@ require_once(CONST_BasePath.'/lib/ClassTypes.php');
  */
 class AddressDetails
 {
  */
 class AddressDetails
 {

+    private $iPlaceID;

     private $aAddressLines;
 
     public function __construct(&$oDB, $iPlaceID, $sHousenumber, $mLangPref)
     {
     private $aAddressLines;
 
     public function __construct(&$oDB, $iPlaceID, $sHousenumber, $mLangPref)
     {

+        $this->iPlaceID = $iPlaceID;
+

         if (is_array($mLangPref)) {
             $mLangPref = $oDB->getArraySQL($oDB->getDBQuotedList($mLangPref));
         }
         if (is_array($mLangPref)) {
             $mLangPref = $oDB->getArraySQL($oDB->getDBQuotedList($mLangPref));
         }


@@ -115,7 +118,7 @@ class AddressDetails
      */
     public function addGeocodeJsonAddressParts(&$aJson)
     {
      */
     public function addGeocodeJsonAddressParts(&$aJson)
     {

-        foreach ($this->aAddressLines as $aLine) {
+        foreach (array_reverse($this->aAddressLines) as $aLine) {

             if (!$aLine['isaddress']) {
                 continue;
             }
             if (!$aLine['isaddress']) {
                 continue;
             }


@@ -124,25 +127,31 @@ class AddressDetails
                 continue;
             }
 
                 continue;
             }
 

-            $iRank = (int)$aLine['rank_address'];
-

             if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
                 $aJson['postcode'] = $aLine['localname'];
             if ($aLine['type'] == 'postcode' || $aLine['type'] == 'postal_code') {
                 $aJson['postcode'] = $aLine['localname'];

-            } else if ($aLine['type'] == 'house_number') {
+            } elseif ($aLine['type'] == 'house_number') {

                 $aJson['housenumber'] = $aLine['localname'];
                 $aJson['housenumber'] = $aLine['localname'];

-            } else if ($iRank > 25 && $iRank < 28) {
+            }
+
+            if ($this->iPlaceID == $aLine['place_id']) {
+                continue;
+            }
+
+            $iRank = (int)$aLine['rank_address'];
+
+            if ($iRank > 25 && $iRank < 28) {

                 $aJson['street'] = $aLine['localname'];
                 $aJson['street'] = $aLine['localname'];

-            } else if ($iRank >= 22 && $iRank <= 25) {
+            } elseif ($iRank >= 22 && $iRank <= 25) {

                 $aJson['locality'] = $aLine['localname'];
                 $aJson['locality'] = $aLine['localname'];

-            } else if ($iRank >= 17 && $iRank <= 21) {
+            } elseif ($iRank >= 17 && $iRank <= 21) {

                 $aJson['district'] = $aLine['localname'];
                 $aJson['district'] = $aLine['localname'];

-            } else if ($iRank >= 13 && $iRank <= 16) {
+            } elseif ($iRank >= 13 && $iRank <= 16) {

                 $aJson['city'] = $aLine['localname'];
                 $aJson['city'] = $aLine['localname'];

-            } else if ($iRank >= 10 && $iRank <= 12) {
+            } elseif ($iRank >= 10 && $iRank <= 12) {

                 $aJson['county'] = $aLine['localname'];
                 $aJson['county'] = $aLine['localname'];

-            } else if ($iRank >= 5 && $iRank <= 9) {
+            } elseif ($iRank >= 5 && $iRank <= 9) {

                 $aJson['state'] = $aLine['localname'];
                 $aJson['state'] = $aLine['localname'];

-            } else if ($iRank == 4) {
+            } elseif ($iRank == 4) {

                 $aJson['country'] = $aLine['localname'];
             }
         }
                 $aJson['country'] = $aLine['localname'];
             }
         }