From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 18 Jul 2021 14:52:37 +0000 (+0200)
Subject: merge marking rare name with adding name token
X-Git-Tag: v4.0.0~50^2~1
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/86ea07709218a7ec8ae18e53268f8c67b42c9f17?hp=5d6aabc457e673e825c4cf46585938bcc77aec3b

merge marking rare name with adding name token

Only name tokens can be rare, so this should be the same
function.
---

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index 01d06725..4d944bfb 100644
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -223,11 +223,14 @@ class SearchDescription
      * Add the given full-word token to the list of terms to search for in the
      * name.
      *
-     * @param interger iId  ID of term to add.
+     * @param interger iId    ID of term to add.
+     * @param bool bRareName  True if the term is infrequent enough to not
+     *                        require other constraints for efficient search.
      */
-    public function addNameToken($iId)
+    public function addNameToken($iId, $bRareName)
     {
         $this->aName[$iId] = $iId;
+        $this->bRareName = $bRareName;
     }
 
     /**
@@ -250,11 +253,6 @@ class SearchDescription
         $this->iNamePhrase = $iPhraseNumber;
     }
 
-    public function markRareName()
-    {
-        $this->bRareName = true;
-    }
-
     /**
      * Set country restriction for the search.
      *
diff --git a/lib-php/TokenWord.php b/lib-php/TokenWord.php
index c9a43915..59456e35 100644
--- a/lib-php/TokenWord.php
+++ b/lib-php/TokenWord.php
@@ -70,13 +70,12 @@ class Word
             }
         } elseif (!$oSearch->hasName(true)) {
             $oNewSearch = $oSearch->clone(1);
-            $oNewSearch->addNameToken($this->iId);
-            if (CONST_Search_NameOnlySearchFrequencyThreshold
+            $oNewSearch->addNameToken(
+                $this->iId,
+                CONST_Search_NameOnlySearchFrequencyThreshold
                 && $this->iSearchNameCount
                           < CONST_Search_NameOnlySearchFrequencyThreshold
-            ) {
-                $oNewSearch->markRareName();
-            }
+            );
 
             return array($oNewSearch);
         }