From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 15 Feb 2015 18:36:39 +0000 (+0100)
Subject: drop special handling of short exact terms in address
X-Git-Tag: v2.4.0~35
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2b2b6ffadc94b1c144c1d9624c5c744162f02bac

drop special handling of short exact terms in address

There is a double check against exact terms, so that results with
a matching exact short term will float to the top.
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a8fe11e2..16bf71b9 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -526,7 +526,7 @@
 
 											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'];
 												}
@@ -594,7 +594,7 @@
 									{
 										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'];
 											}
@@ -632,7 +632,7 @@
 												$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
 												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['iSearchRank'] += 1;