Addresses with housenumber 0 are found

diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index 783a0fdae673b8b155b5a823cd913d201196cd08..61823b4ce9dc504010ed33e67aeb575df400d047 100644 (file)
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -76,14 +76,14 @@ class AddressDetails
                 $bFallback = true;
             }
 
                 $bFallback = true;
             }
 

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

                 $sName = $aLine['localname'];
                 $sName = $aLine['localname'];

-            } elseif (isset($aLine['housenumber']) && $aLine['housenumber']) {
+            } elseif (isset($aLine['housenumber']) && $aLine['housenumber']!=='') {

                 $sName = $aLine['housenumber'];
             }
 
                 $sName = $aLine['housenumber'];
             }
 

-            if ($sName) {
+            if (isset($sName)) {

                 $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel']) ? $aTypeLabel['simplelabel'] : $aTypeLabel['label']);
                 $sTypeLabel = str_replace(' ', '_', $sTypeLabel);
                 if (!isset($aAddress[$sTypeLabel])
                 $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel']) ? $aTypeLabel['simplelabel'] : $aTypeLabel['label']);
                 $sTypeLabel = str_replace(' ', '_', $sTypeLabel);
                 if (!isset($aAddress[$sTypeLabel])


@@ -97,6 +97,7 @@ class AddressDetails
                 }
             }
         }
                 }
             }
         }

+

         return $aAddress;
     }
 
         return $aAddress;
     }
 

diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php
index 506d4202253f61f909c46f3d1c08275b2c12faa9..4fafbec2b21c9899fb1e35c51ac8241647876b58 100644 (file)
--- a/lib/SearchDescription.php
+++ b/lib/SearchDescription.php
@@ -447,8 +447,8 @@ class SearchDescription
                 $iLimit
             );
 
                 $iLimit
             );
 

-            //now search for housenumber, if housenumber provided
-            if ($this->sHouseNumber && !empty($aResults)) {
+            // Now search for housenumber, if housenumber provided. Can be zero.
+            if (($this->sHouseNumber || $this->sHouseNumber === '0') && !empty($aResults)) {

                 // Downgrade the rank of the street results, they are missing
                 // the housenumber.
                 foreach ($aResults as $oRes) {
                 // Downgrade the rank of the street results, they are missing
                 // the housenumber.
                 foreach ($aResults as $oRes) {

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 9b76efc12f90977a4b91927a75be8e35bb950dc2..cfba6eb39d5f2344730de4ad68fd7bd8703094e3 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -64,7 +64,7 @@
         $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
 
         echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
         $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
 
         echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";

-        echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+        echo '  <td class="name">'.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";

         echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
         echo '  <td>' . osmLink($aAddressLine) . "</td>\n";
         echo '  <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n";
         echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
         echo '  <td>' . osmLink($aAddressLine) . "</td>\n";
         echo '  <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n";