From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 9 Aug 2022 18:09:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~96
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6f0eb1797000bb8ee9faa0657917803ed5bd50a6?hp=-c

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

6f0eb1797000bb8ee9faa0657917803ed5bd50a6
diff --combined lib-php/Geocode.php
index 978ca679,ec1fa81d..cd8b6edd
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -103,7 -103,7 +103,7 @@@ class Geocod
          }
  
          $this->iFinalLimit = $iLimit;
-         $this->iLimit = $iLimit + min($iLimit, 10);
+         $this->iLimit = $iLimit + max($iLimit, 10);
      }
  
      public function setFeatureType($sFeatureType)
@@@ -695,7 -695,7 +695,7 @@@
                          }
                      }
  
 -                    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;
                  }
              }