X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a48ebd9b477318bc5fdb44d7dc6bbf695911a4b9..b14ce959d9532f192b748b12f6c71f23a9c1a60b:/lib-php/TokenWord.php

diff --git a/lib-php/TokenWord.php b/lib-php/TokenWord.php
index 7c653f8f..c9a43915 100644
--- a/lib-php/TokenWord.php
+++ b/lib-php/TokenWord.php
@@ -26,6 +26,22 @@ class Word
         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.
      *
@@ -37,10 +53,6 @@ class Word
      */
     public function extendSearch($oSearch, $oPosition)
     {
-        if ($oPosition->isPhrase('country')) {
-            return array();
-        }
-
         // Full words can only be a name if they appear at the beginning
         // of the phrase. In structured search the name must forcably in
         // the first phrase. In unstructured search it may be in a later