Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / Geocode.php

diff --git a/lib-php/Geocode.php b/lib-php/Geocode.php
index 43d10368eb9292ffcd90d2fcc8103b4a07ded395..a12983b15acf331a87e9952c44d5273a1b25705e 100644 (file)
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 


@@ -609,16 +617,15 @@ class Geocode
                     }
                     $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens);
 
                     }
                     $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens);
 

-                    foreach ($aGroupedSearches as $aSearches) {
+                    foreach ($aReverseGroupedSearches as $aSearches) {

                         foreach ($aSearches as $aSearch) {
                         foreach ($aSearches as $aSearch) {

-                            if (!isset($aReverseGroupedSearches[$aSearch->getRank()])) {
-                                $aReverseGroupedSearches[$aSearch->getRank()] = array();
+                            if (!isset($aGroupedSearches[$aSearch->getRank()])) {
+                                $aGroupedSearches[$aSearch->getRank()] = array();

                             }
                             }

-                            $aReverseGroupedSearches[$aSearch->getRank()][] = $aSearch;
+                            $aGroupedSearches[$aSearch->getRank()][] = $aSearch;

                         }
                     }
 
                         }
                     }
 

-                    $aGroupedSearches = $aReverseGroupedSearches;

                     ksort($aGroupedSearches);
                 }
             } else {
                     ksort($aGroupedSearches);
                 }
             } else {


@@ -688,7 +695,7 @@ class Geocode
                         }
                     }
 
                         }
                     }
 

-                    if ($iQueryLoop > 20) {
+                    if ($iQueryLoop > 30) {

                         break;
                     }
                 }
                         break;
                     }
                 }


@@ -765,7 +772,7 @@ class Geocode
                     $aResults = $tempIDs;
                 }
 
                     $aResults = $tempIDs;
                 }
 

-                if (!empty($aResults) || $iGroupLoop > 4 || $iQueryLoop > 30) {
+                if (!empty($aResults) || $iGroupLoop > 6 || $iQueryLoop > 40) {

                     break;
                 }
             }
                     break;
                 }
             }