Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/TokenPartial.php b/lib-php/TokenPartial.php
index e52161cc0168953f30fed95296cef5c196c64bcb..3dc6f308a9e3c1f41e4e236163ccfc448973da48 100644 (file)
--- a/lib-php/TokenPartial.php
+++ b/lib-php/TokenPartial.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\Token;
 
 
 namespace Nominatim\Token;
 


@@ -26,6 +34,22 @@ class Partial
         return $this->iId;
     }
 
         return $this->iId;
     }
 

+    /**
+     * Check if the token can be added to the given search.
+     * Derive new searches by adding this token to an existing search.
+     *
+     * @param object  $oSearch      Partial search description derived so far.
+     * @param object  $oPosition    Description of the token position within
+                                    the query.
+     *
+     * @return True if the token is compatible with the search configuration
+     *         given the position.
+     */
+    public function isExtendable($oSearch, $oPosition)
+    {
+        return !$oPosition->isPhrase('country');
+    }
+

     /**
      * Derive new searches by adding this token to an existing search.
      *
     /**
      * Derive new searches by adding this token to an existing search.
      *


@@ -37,10 +61,6 @@ class Partial
      */
     public function extendSearch($oSearch, $oPosition)
     {
      */
     public function extendSearch($oSearch, $oPosition)
     {

-        if ($oPosition->isPhrase('country')) {
-            return array();
-        }
-

         $aNewSearches = array();
 
         // Partial token in Address.
         $aNewSearches = array();
 
         // Partial token in Address.


@@ -78,6 +98,7 @@ class Partial
             $oNewSearch->addPartialNameToken(
                 $this->iId,
                 $this->iSearchNameCount < CONST_Max_Word_Frequency,
             $oNewSearch->addPartialNameToken(
                 $this->iId,
                 $this->iSearchNameCount < CONST_Max_Word_Frequency,

+                $this->iSearchNameCount > CONST_Search_NameOnlySearchFrequencyThreshold,

                 $oPosition->getPhrase()
             );
 
                 $oPosition->getPhrase()
             );