From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 6 Jan 2022 08:03:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~133
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c4f22a42eba499ed1854c5967b2e3932fe9b3896?hp=-c

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

c4f22a42eba499ed1854c5967b2e3932fe9b3896
diff --combined lib-php/Geocode.php
index 0d1fab89,bf9a3262..a12983b1
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -1,4 -1,12 +1,12 @@@
  <?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;
  
@@@ -609,16 -617,15 +617,15 @@@ class Geocod
                      }
                      $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens);
  
-                     foreach ($aGroupedSearches as $aSearches) {
+                     foreach ($aReverseGroupedSearches as $aSearches) {
                          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 {
@@@ -688,7 -695,7 +695,7 @@@
                          }
                      }
  
 -                    if ($iQueryLoop > 20) {
 +                    if ($iQueryLoop > 30) {
                          break;
                      }
                  }
@@@ -765,7 -772,7 +772,7 @@@
                      $aResults = $tempIDs;
                  }
  
 -                if (!empty($aResults) || $iGroupLoop > 4 || $iQueryLoop > 30) {
 +                if (!empty($aResults) || $iGroupLoop > 6 || $iQueryLoop > 40) {
                      break;
                  }
              }
diff --combined lib-php/website/search.php
index e553ef39,e8f23983..e1aab794
--- a/lib-php/website/search.php
+++ b/lib-php/website/search.php
@@@ -1,4 -1,12 +1,12 @@@
  <?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.
+  */
  
  require_once(CONST_LibDir.'/init-website.php');
  require_once(CONST_LibDir.'/log.php');
@@@ -54,12 -62,7 +62,12 @@@ if (!$oGeocode->getQueryString(
  
  $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
  
 -$aSearchResults = $oGeocode->lookup();
 +// Ignore requests from a faulty app.
 +if ($oGeocode->getQueryString() === '-1,-1') {
 +  $aSearchResults = array();
 +} else {
 +  $aSearchResults = $oGeocode->lookup();
 +}
  
  logEnd($oDB, $hLog, count($aSearchResults));
  
diff --combined lib-sql/functions/address_lookup.sql
index 3ea72cb1,8715798e..e144e9fd
--- a/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@@ -1,3 -1,10 +1,10 @@@
+ -- 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.
+ 
  -- Functions for returning address information for a place.
  
  DROP TYPE IF EXISTS addressline CASCADE;
@@@ -213,7 -220,7 +220,7 @@@ BEGI
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
             coalesce(extratags->'linked_place', extratags->'place') as place_type,
 -           admin_level, fromarea, isaddress,
 +           admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
             CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
             distance, country_code, postcode
        FROM place_addressline join placex on (address_place_id = placex.place_id)