Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/TokenCountry.php b/lib-php/TokenCountry.php
index 518c0a31e3df225c37a19073946dd6c0dfd11035..3f93f45e0fe8e5ef18ca990bcf007492e2a45370 100644 (file)
--- a/lib-php/TokenCountry.php
+++ b/lib-php/TokenCountry.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;
 


@@ -8,9 +16,9 @@ namespace Nominatim\Token;
 class Country
 {
     /// Database word id, if available.
 class Country
 {
     /// Database word id, if available.

-    public $iId;
+    private $iId;

     /// Two-letter country code (lower-cased).
     /// Two-letter country code (lower-cased).

-    public $sCountryCode;
+    private $sCountryCode;

 
     public function __construct($iId, $sCountryCode)
     {
 
     public function __construct($iId, $sCountryCode)
     {


@@ -18,6 +26,46 @@ class Country
         $this->sCountryCode = $sCountryCode;
     }
 
         $this->sCountryCode = $sCountryCode;
     }
 

+    public function getId()
+    {
+        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 !$oSearch->hasCountry()
+               && $oPosition->maybePhrase('country')
+               && $oSearch->getContext()->isCountryApplicable($this->sCountryCode);
+    }
+
+    /**
+     * 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 SearchDescription[] List of derived search descriptions.
+     */
+    public function extendSearch($oSearch, $oPosition)
+    {
+        $oNewSearch = $oSearch->clone($oPosition->isLastToken() ? 1 : 6);
+        $oNewSearch->setCountry($this->sCountryCode);
+
+        return array($oNewSearch);
+    }
+

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


@@ -26,4 +74,9 @@ class Country
                 'Info' => $this->sCountryCode
                );
     }
                 'Info' => $this->sCountryCode
                );
     }

+
+    public function debugCode()
+    {
+        return 'C';
+    }

 }
 }