From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 26 Jan 2015 20:34:21 +0000 (+0100)
Subject: need phrase types in getGroupedSearches
X-Git-Tag: v2.4.0~51
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b121da0ca35c2ff08ecd5a02dd4eb5d4a9dcc3b1

need phrase types in getGroupedSearches
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 1fbbd5c5..d96b6cb8 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -441,7 +441,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.
@@ -1039,7 +1039,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)
 					{
@@ -1053,7 +1053,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)
 						{