osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-23 13:44:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

disallow search for partials without address

Browse Source 
Very frequent partial terms take too long to look up and
do not return any valuable results unless the search is
further narrowed down by an address.
This commit is contained in:
Sarah Hoffmann 2021-10-26 10:23:55 +02:00
parent 9934421442
commit 4864bf1509
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib-php/SearchDescription.php
View File

@ -19,6 +19,8 @@ class SearchDescription
private $aName = array();
/// True if the name is rare enough to force index use on name.
private $bRareName = false;
/// True if the name requires to be accompanied by address terms.
private $bNameNeedsAddress = false;
/// List of word ids making up the address of the object.
private $aAddress = array();
/// List of word ids that appear in the name but should be ignored.
@ -113,6 +115,9 @@ class SearchDescription
return false;
}
}
if ($this->bNameNeedsAddress && empty($this->aAddress)) {
return false;
}
return true;
}
@ -231,6 +236,7 @@ class SearchDescription
{
$this->aName[$iId] = $iId;
$this->bRareName = $bRareName;
$this->bNeedsAddress = false;
}
/**
@ -240,11 +246,19 @@ class SearchDescription
* @param integer iID ID of term to add.
* @param bool bSearchable Term should be used to search for result
* (i.e. term is not a stop word).
* @param bool bNeedsAddress True if the term is too unspecific to be used
* in a stand-alone search without an address
* to narrow down the search.
* @param integer iPhraseNumber Index of phrase, where the partial term
* appears.
*/
public function addPartialNameToken($iId, $bSearchable, $iPhraseNumber)
public function addPartialNameToken($iId, $bSearchable, $bNeedsAddress, $iPhraseNumber)
{
if (empty($this->aName)) {
$this->bNameNeedsAddress = $bNeedsAddress;
} else {
$this->bNameNeedsAddress |= $bNeedsAddress;
}
if ($bSearchable) {
$this->aName[$iId] = $iId;
} else {

1
lib-php/TokenPartial.php
View File

@ -90,6 +90,7 @@ class Partial
$oNewSearch->addPartialNameToken(
$this->iId,
$this->iSearchNameCount < CONST_Max_Word_Frequency,
$this->iSearchNameCount > CONST_Search_NameOnlySearchFrequencyThreshold,
$oPosition->getPhrase()
);