Merge pull request #2633 from lonvia/fix-reverse-single-interpolation-point

[nominatim.git] / lib-php / AddressDetails.php

diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php
index 3d17ede51cb4d3c605f3d166dca58af542c7a15f..1bd475ad268427377b1d7f24676dad46bf2ce5b8 100644 (file)
--- a/lib-php/AddressDetails.php
+++ b/lib-php/AddressDetails.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 


@@ -61,7 +69,7 @@ class AddressDetails
         return join(', ', $aParts);
     }
 
         return join(', ', $aParts);
     }
 

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

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


@@ -79,13 +87,11 @@ class AddressDetails
                 $sName = $aLine['housenumber'];
             }
 
                 $sName = $aLine['housenumber'];
             }
 

-            if (isset($sName)) {
-                $sTypeLabel = strtolower(str_replace(' ', '_', $sTypeLabel));
-                if (!isset($aAddress[$sTypeLabel])
-                    || $aLine['class'] == 'place'
-                ) {
-                    $aAddress[$sTypeLabel] = $sName;
-                }
+            if (isset($sName)
+                && (!isset($aAddress[$sTypeLabel])
+                    || $aLine['class'] == 'place')
+            ) {
+                $aAddress[$sTypeLabel] = $sName;

             }
         }
 
             }
         }