From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 29 Jun 2022 18:18:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~102
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d2ec1abaedd12792e1f544ee9b2fabf5edecc714?hp=-c

Merge remote-tracking branch 'upstream/master'
---

d2ec1abaedd12792e1f544ee9b2fabf5edecc714
diff --combined lib-php/Geocode.php
index a12983b1,acb79493..85d871f0
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -695,7 -695,7 +695,7 @@@ class Geocod
                          }
                      }
  
 -                    if ($iQueryLoop > 20) {
 +                    if ($iQueryLoop > 30) {
                          break;
                      }
                  }
@@@ -772,7 -772,7 +772,7 @@@
                      $aResults = $tempIDs;
                  }
  
 -                if (!empty($aResults) || $iGroupLoop > 4 || $iQueryLoop > 30) {
 +                if (!empty($aResults) || $iGroupLoop > 6 || $iQueryLoop > 40) {
                      break;
                  }
              }
@@@ -843,7 -843,9 +843,9 @@@
                  $aResult['importance'] = 0.001;
                  $aResult['foundorder'] = $aResult['addressimportance'];
              } else {
-                 $aResult['importance'] = max(0.001, $aResult['importance']);
+                 if ($aResult['importance'] == 0) {
+                     $aResult['importance'] = 0.0001;
+                 }
                  $aResult['importance'] *= $this->viewboxImportanceFactor(
                      $aResult['lon'],
                      $aResult['lat']