X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/8809839125847348681613ec120e42f96f8bbe60..6300d3619a6c429204c589a29a4abea88e15d47e:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 85aa31f0..9b35ebd8 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -443,7 +443,7 @@
 			return $aSearchResults;
 		}
 
-		function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
+		function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
 		{
 			/*
 			   Calculate all searches using aValidTokens i.e.
@@ -613,7 +613,10 @@
 									}
 								}
 							}
-							if (isset($aValidTokens[$sToken]))
+							// Look for partial matches.
+							// Note that there is no point in adding country terms here
+							// because country are omitted in the address.
+							if (isset($aValidTokens[$sToken]) && $sPhraseType != 'country')
 							{
 								// Allow searching for a word - but at extra cost
 								foreach($aValidTokens[$sToken] as $aSearchTerm)
@@ -1041,7 +1044,7 @@
 					// Start the search process
 					$aResultPlaceIDs = array();
 
-					$aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
+					$aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
 
 					if ($this->bReverseInPlan)
 					{
@@ -1055,7 +1058,7 @@
 							$aFinalPhrase = end($aPhrases);
 							$aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
 						}
-						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
+						$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
 
 						foreach($aGroupedSearches as $aSearches)
 						{
@@ -1785,7 +1788,6 @@
 			$bFirst = true;
 			foreach($aToFilter as $iResNum => $aResult)
 			{
-				if ($aResult['type'] == 'adminitrative') $aResult['type'] = 'administrative';
 				$this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
 				if ($bFirst)
 				{