prepare 4.5.0 release

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

diff --git a/lib-php/TokenSpecialTerm.php b/lib-php/TokenSpecialTerm.php
index cdd04e6c41dccf6ae8646816849244a1b39b50e0..475ae71ba184349242d20143a67538186a0535a6 100644 (file)
--- a/lib-php/TokenSpecialTerm.php
+++ b/lib-php/TokenSpecialTerm.php
@@ -69,19 +69,31 @@ class SpecialTerm
      */
     public function extendSearch($oSearch, $oPosition)
     {
      */
     public function extendSearch($oSearch, $oPosition)
     {

-        $iSearchCost = 2;
+        $iSearchCost = 0;

 
         $iOp = $this->iOperator;
         if ($iOp == \Nominatim\Operator::NONE) {
 
         $iOp = $this->iOperator;
         if ($iOp == \Nominatim\Operator::NONE) {

-            if ($oSearch->hasName() || $oSearch->getContext()->isBoundedSearch()) {
+            if ($oPosition->isFirstToken()
+                || $oSearch->hasName()
+                || $oSearch->getContext()->isBoundedSearch()
+            ) {

                 $iOp = \Nominatim\Operator::NAME;
                 $iOp = \Nominatim\Operator::NAME;

+                $iSearchCost += 3;

             } else {
                 $iOp = \Nominatim\Operator::NEAR;
             } else {
                 $iOp = \Nominatim\Operator::NEAR;

-                $iSearchCost += 2;
+                $iSearchCost += 4;
+                if (!$oPosition->isFirstToken()) {
+                    $iSearchCost += 3;
+                }

             }
             }

-        } elseif (!$oPosition->isFirstToken() && !$oPosition->isLastToken()) {
+        } elseif ($oPosition->isFirstToken()) {

             $iSearchCost += 2;
             $iSearchCost += 2;

+        } elseif ($oPosition->isLastToken()) {
+            $iSearchCost += 4;
+        } else {
+            $iSearchCost += 6;

         }
         }

+

         if ($oSearch->hasHousenumber()) {
             $iSearchCost ++;
         }
         if ($oSearch->hasHousenumber()) {
             $iSearchCost ++;
         }