Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/TokenWord.php b/lib-php/TokenWord.php
index b9e28d91db7dde65cc235affd505b7b54081ce95..a7557d38b51c8c97a2cf12baf1c7776cb5bc25c8 100644 (file)
--- a/lib-php/TokenWord.php
+++ b/lib-php/TokenWord.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;
 


@@ -13,15 +21,12 @@ class Word
     private $iSearchNameCount;
     /// Number of terms in the word.
     private $iTermCount;
     private $iSearchNameCount;
     /// Number of terms in the word.
     private $iTermCount;

-    /// Match score.
-    private $iMatchScore;

 
 

-    public function __construct($iId, $iSearchNameCount, $iTermCount, $iMatchScore = 1)
+    public function __construct($iId, $iSearchNameCount, $iTermCount)

     {
         $this->iId = $iId;
         $this->iSearchNameCount = $iSearchNameCount;
         $this->iTermCount = $iTermCount;
     {
         $this->iId = $iId;
         $this->iSearchNameCount = $iSearchNameCount;
         $this->iTermCount = $iTermCount;

-        $this->iMatchScore = $iMatchScore;

     }
 
     public function getId()
     }
 
     public function getId()


@@ -57,7 +62,7 @@ class Word
     public function extendSearch($oSearch, $oPosition)
     {
         // Full words can only be a name if they appear at the beginning
     public function extendSearch($oSearch, $oPosition)
     {
         // Full words can only be a name if they appear at the beginning

-        // of the phrase. In structured search the name must forcably in
+        // of the phrase. In structured search the name must forcibly in

         // the first phrase. In unstructured search it may be in a later
         // phrase when the first phrase is a house number.
         if ($oSearch->hasName()
         // the first phrase. In unstructured search it may be in a later
         // phrase when the first phrase is a house number.
         if ($oSearch->hasName()


@@ -66,13 +71,13 @@ class Word
             if ($this->iTermCount > 1
                 && ($oPosition->isPhrase('') || !$oPosition->isFirstPhrase())
             ) {
             if ($this->iTermCount > 1
                 && ($oPosition->isPhrase('') || !$oPosition->isFirstPhrase())
             ) {

-                $oNewSearch = $oSearch->clone($this->iMatchScore);
+                $oNewSearch = $oSearch->clone(1);

                 $oNewSearch->addAddressToken($this->iId);
 
                 return array($oNewSearch);
             }
         } elseif (!$oSearch->hasName(true)) {
                 $oNewSearch->addAddressToken($this->iId);
 
                 return array($oNewSearch);
             }
         } elseif (!$oSearch->hasName(true)) {

-            $oNewSearch = $oSearch->clone($this->iMatchScore);
+            $oNewSearch = $oSearch->clone(1);

             $oNewSearch->addNameToken(
                 $this->iId,
                 CONST_Search_NameOnlySearchFrequencyThreshold
             $oNewSearch->addNameToken(
                 $this->iId,
                 CONST_Search_NameOnlySearchFrequencyThreshold


@@ -93,8 +98,7 @@ class Word
                 'Type' => 'word',
                 'Info' => array(
                            'count' => $this->iSearchNameCount,
                 'Type' => 'word',
                 'Info' => array(
                            'count' => $this->iSearchNameCount,

-                           'terms' => $this->iTermCount,
-                           'score' => $this->iMatchScore
+                           'terms' => $this->iTermCount

                           )
                );
     }
                           )
                );
     }