need phrase types in getGroupedSearches

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 1fbbd5c59250b2677b773d79d169e1269c5ce6a0..d96b6cb8e7c29dd801456bbd2187baf32abaa072 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -441,7 +441,7 @@
                        return $aSearchResults;
                }
 
                        return $aSearchResults;
                }
 

-               function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
+               function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)

                {
                        /*
                           Calculate all searches using aValidTokens i.e.
                {
                        /*
                           Calculate all searches using aValidTokens i.e.


@@ -1039,7 +1039,7 @@
                                        // Start the search process
                                        $aResultPlaceIDs = array();
 
                                        // 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)
                                        {
 
                                        if ($this->bReverseInPlan)
                                        {


@@ -1053,7 +1053,7 @@
                                                        $aFinalPhrase = end($aPhrases);
                                                        $aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
                                                }
                                                        $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)
                                                {
 
                                                foreach($aGroupedSearches as $aSearches)
                                                {