X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e0c184e0971dacdb37c6301638f810d5773fccba..f71478e49c1a9462ca3b94a72d280581d98b8fff:/lib-php/Geocode.php?ds=sidebyside

diff --git a/lib-php/Geocode.php b/lib-php/Geocode.php
index ec1fa81d..20edd9a5 100644
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@ -695,7 +695,7 @@ class Geocode
                         }
                     }
 
-                    if ($iQueryLoop > 20) {
+                    if ($iQueryLoop > 30) {
                         break;
                     }
                 }
@@ -772,7 +772,7 @@ class Geocode
                     $aResults = $tempIDs;
                 }
 
-                if (!empty($aResults) || $iGroupLoop > 4 || $iQueryLoop > 30) {
+                if (!empty($aResults) || $iGroupLoop > 6 || $iQueryLoop > 40) {
                     break;
                 }
             }
@@ -874,7 +874,7 @@ class Geocode
                 $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;