X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/04d5d12ecd31afcbbc631b6c0997417f68586b52..86b95a946b6ce73a54defd5ea09c5e4c1303bb43:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 2fa170a6..1cbc4278 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -528,7 +528,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'];
 												}
@@ -596,7 +596,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'];
 											}
@@ -634,7 +634,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;
@@ -1058,7 +1058,7 @@
 						if (sizeof($aPhrases) > 1)
 						{
 							$aFinalPhrase = end($aPhrases);
-							$aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
+							$aPhrases[sizeof($aPhrases)-1]['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
 						}
 						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
 
@@ -1242,7 +1242,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";