Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/TokenHousenumber.php b/lib-php/TokenHousenumber.php
index 0cc67a1212d17fc8bbd5a6251f5b86827fc05efe..f7bdc4713e913d0e466d48779e14a9a0924b0bc5 100644 (file)
--- a/lib-php/TokenHousenumber.php
+++ b/lib-php/TokenHousenumber.php
@@ -23,6 +23,24 @@ class HouseNumber
         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->hasHousenumber()
+               && !$oSearch->hasOperator(\Nominatim\Operator::POSTCODE)
+               && $oPosition->maybePhrase('street');
+    }
+
     /**
      * Derive new searches by adding this token to an existing search.
      *
@@ -36,19 +54,12 @@ class HouseNumber
     {
         $aNewSearches = array();
 
-        if ($oSearch->hasHousenumber()
-            || $oSearch->hasOperator(\Nominatim\Operator::POSTCODE)
-            || !$oPosition->maybePhrase('street')
-        ) {
-            return $aNewSearches;
-        }
-
         // sanity check: if the housenumber is not mainly made
         // up of numbers, add a penalty
         $iSearchCost = 1;
         if (preg_match('/\\d/', $this->sToken) === 0
             || preg_match_all('/[^0-9]/', $this->sToken, $aMatches) > 2) {
-            $iSearchCost++;
+            $iSearchCost += strlen($this->sToken) - 1;
         }
         if (!$oSearch->hasOperator(\Nominatim\Operator::NONE)) {
             $iSearchCost++;