X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cf5ced6618c0c18eed4cafc2287e8c3813c9131f..27ce2afbcfa81de6651a16eda311cb109b2a8ba4:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 2c736475..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;
@@ -1240,7 +1240,7 @@
 							$aTerms = array();
 							$aOrder = array();
 
-							if ($aSearch['sHouseNumber'])
+							if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
 							{
 								$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
 								$aOrder[] = "exists(select place_id from placex where parent_place_id = search_name.place_id and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) desc";