hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 11:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop special handling of short exact terms in address

Browse Source 
There is a double check against exact terms, so that results with
a matching exact short term will float to the top.
This commit is contained in:
Sarah Hoffmann
2015-02-15 19:36:39 +01:00
parent 02cd91d251
commit 2b2b6ffadc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Geocode.php
View File

@@ -526,7 +526,7 @@
if (sizeof($aSearch['aName'])) if (sizeof($aSearch['aName']))
{ {
if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false)) if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false))
{ {
$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
} }
@@ -594,7 +594,7 @@
{ {
if (sizeof($aSearch['aName'])) if (sizeof($aSearch['aName']))
{ {
if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strlen($sToken) < 4 || strpos($sToken, ' ') !== false)) if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false))
{ {
$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
} }
@@ -632,7 +632,7 @@
$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch; if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
} }
elseif (isset($aValidTokens[' '.$sToken]) && strlen($sToken) >= 4) // revert to the token version? elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version?
{ {
$aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id']; $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
$aSearch['iSearchRank'] += 1; $aSearch['iSearchRank'] += 1;