Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / AddressDetails.php

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index dd86707974765570ae9a1766eb8d29a06fb299e7..3d17ede51cb4d3c605f3d166dca58af542c7a15f 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -2,7 +2,7 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/ClassTypes.php');
+require_once(CONST_LibDir.'/ClassTypes.php');

 
 /**
  * Detailed list of address parts for a single result
 
 /**
  * Detailed list of address parts for a single result


@@ -117,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']) {