From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Dec 2022 15:24:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~84
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/702eb862026f4e5c056d73657e6802023a83cc2a?ds=inline;hp=-c

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

702eb862026f4e5c056d73657e6802023a83cc2a
diff --combined lib-php/Geocode.php
index cd8b6edd,0881d20a..20edd9a5
--- 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;
                  }
              }
@@@ -874,7 -874,7 +874,7 @@@
                  $iCountWords = 0;
                  $sAddress = $aResult['langaddress'];
                  foreach ($aRecheckWords as $i => $sWord) {
-                     if (stripos($sAddress, $sWord)!==false) {
+                     if (grapheme_stripos($sAddress, $sWord)!==false) {
                          $iCountWords++;
                          if (preg_match('/(^|,)\s*'.preg_quote($sWord, '/').'\s*(,|$)/', $sAddress)) {
                              $iCountWords += 0.1;