safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

merge marking rare name with adding name token

Browse Source 
Only name tokens can be rare, so this should be the same
function.
This commit is contained in:
Sarah Hoffmann
2021-07-18 16:52:37 +02:00
parent 5d6aabc457
commit 86ea077092
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib-php/SearchDescription.php
View File

@@ -223,11 +223,14 @@ class SearchDescription
* Add the given full-word token to the list of terms to search for in the * Add the given full-word token to the list of terms to search for in the
* name. * 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->aName[$iId] = $iId;
$this->bRareName = $bRareName;
} }
/** /**
@@ -250,11 +253,6 @@ class SearchDescription
$this->iNamePhrase = $iPhraseNumber; $this->iNamePhrase = $iPhraseNumber;
} }
public function markRareName()
{
$this->bRareName = true;
}
/** /**
* Set country restriction for the search. * Set country restriction for the search.
* *

9
lib-php/TokenWord.php
View File

@@ -70,13 +70,12 @@ class Word
} }
} elseif (!$oSearch->hasName(true)) { } elseif (!$oSearch->hasName(true)) {
$oNewSearch = $oSearch->clone(1); $oNewSearch = $oSearch->clone(1);
$oNewSearch->addNameToken($this->iId); $oNewSearch->addNameToken(
if (CONST_Search_NameOnlySearchFrequencyThreshold $this->iId,
CONST_Search_NameOnlySearchFrequencyThreshold
&& $this->iSearchNameCount && $this->iSearchNameCount
< CONST_Search_NameOnlySearchFrequencyThreshold < CONST_Search_NameOnlySearchFrequencyThreshold
) { );
$oNewSearch->markRareName();
}
return array($oNewSearch); return array($oNewSearch);
} }