lift restrictions on search with frequent terms slightly

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

diff --git a/lib-php/SearchContext.php b/lib-php/SearchContext.php
index 8316a01288c58673332640d72e35ef3bbb506ddf..3223b5c99ee298dd1fa8af91d60a25f6f400bf13 100644 (file)
--- a/lib-php/SearchContext.php
+++ b/lib-php/SearchContext.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;
 


@@ -28,6 +36,8 @@ class SearchContext
     public $sqlViewboxLarge = '';
     /// Reference along a route (as SQL).
     public $sqlViewboxCentre = '';
     public $sqlViewboxLarge = '';
     /// Reference along a route (as SQL).
     public $sqlViewboxCentre = '';

+    /// List of countries to restrict search to (as array).
+    public $aCountryList = null;

     /// List of countries to restrict search to (as SQL).
     public $sqlCountryList = '';
     /// List of place IDs to exclude (as SQL).
     /// List of countries to restrict search to (as SQL).
     public $sqlCountryList = '';
     /// List of place IDs to exclude (as SQL).


@@ -187,6 +197,7 @@ class SearchContext
     public function setCountryList($aCountries)
     {
         $this->sqlCountryList = '('.join(',', array_map('addQuotes', $aCountries)).')';
     public function setCountryList($aCountries)
     {
         $this->sqlCountryList = '('.join(',', array_map('addQuotes', $aCountries)).')';

+        $this->aCountryList = $aCountries;

     }
 
     /**
     }
 
     /**


@@ -279,6 +290,19 @@ class SearchContext
         return '';
     }
 
         return '';
     }
 

+    /**
+     * Check if the given country is covered by the search context.
+     *
+     * @param string $sCountryCode  Country code of the country to check.
+     *
+     * @return True, if no country code restrictions are set or the
+     *         country is included in the country list.
+     */
+    public function isCountryApplicable($sCountryCode)
+    {
+        return $this->aCountryList === null || in_array($sCountryCode, $this->aCountryList);
+    }
+

     public function debugInfo()
     {
         return array(
     public function debugInfo()
     {
         return array(