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

do not mix partial names with other words

Browse Source 
As soon as a housenumber, postcode, etc. appear, the name term
must obviously be closed and no further partial terms can be
appended.
This commit is contained in:
Sarah Hoffmann 2021-03-11 22:44:49 +01:00
parent 3fbe4511f9
commit 6dd2b9c2ec
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib-php/SearchDescription.php
View File

@ -179,6 +179,7 @@ class SearchDescription
// - increase score for finding it anywhere else (optimisation) // - increase score for finding it anywhere else (optimisation)
if (!$bLastToken) { if (!$bLastToken) {
$oSearch->iSearchRank += 5; $oSearch->iSearchRank += 5;
$oSearch->iNamePhrase = -1;
} }
$aNewSearches[] = $oSearch; $aNewSearches[] = $oSearch;
} }
@ -205,6 +206,7 @@ class SearchDescription
) { ) {
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$oSearch->iNamePhrase = -1;
if (strlen($oSearchTerm->sPostcode) < 4) { if (strlen($oSearchTerm->sPostcode) < 4) {
$oSearch->iSearchRank += 4 - strlen($oSearchTerm->sPostcode); $oSearch->iSearchRank += 4 - strlen($oSearchTerm->sPostcode);
} }
@ -218,6 +220,7 @@ class SearchDescription
if (!$this->sHouseNumber && $this->iOperator != Operator::POSTCODE) { if (!$this->sHouseNumber && $this->iOperator != Operator::POSTCODE) {
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
$oSearch->iNamePhrase = -1;
$oSearch->sHouseNumber = $oSearchTerm->sToken; $oSearch->sHouseNumber = $oSearchTerm->sToken;
if ($this->iOperator != Operator::NONE) { if ($this->iOperator != Operator::NONE) {
$oSearch->iSearchRank++; $oSearch->iSearchRank++;
@ -259,6 +262,7 @@ class SearchDescription
if ($this->iOperator == Operator::NONE) { if ($this->iOperator == Operator::NONE) {
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iSearchRank += 2; $oSearch->iSearchRank += 2;
$oSearch->iNamePhrase = -1;
$iOp = $oSearchTerm->iOperator; $iOp = $oSearchTerm->iOperator;
if ($iOp == Operator::NONE) { if ($iOp == Operator::NONE) {
@ -293,6 +297,7 @@ class SearchDescription
if (!empty($this->aName) || !($bFirstPhrase || $sPhraseType == '')) { if (!empty($this->aName) || !($bFirstPhrase || $sPhraseType == '')) {
if (($sPhraseType == '' || !$bFirstPhrase) && !$bHasPartial) { if (($sPhraseType == '' || !$bFirstPhrase) && !$bHasPartial) {
$oSearch = clone $this; $oSearch = clone $this;
$oSearch->iNamePhrase = -1;
$oSearch->iSearchRank += 3 * $oSearchTerm->iTermCount; $oSearch->iSearchRank += 3 * $oSearchTerm->iTermCount;
$oSearch->aAddress[$iWordID] = $iWordID; $oSearch->aAddress[$iWordID] = $iWordID;
$aNewSearches[] = $oSearch; $aNewSearches[] = $oSearch;