Merge remote-tracking branch 'upstream/master'

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 85aa31f08202d99ac1e26ba80ee3444ee4c785e4..9b35ebd83dc98b65ee7a9884f1a4091d8ad7eb8e 100644 (file)
--- 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)
                                {

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 51374918c46ca1d47eb26d821b5875b9b17e273c..1da693014a393dbfc00607e1c25f2266d1745d34 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -189,8 +189,12 @@
                $aGroupedAddressLines = array();
                foreach($aParentOfLines as $aAddressLine)
                {
-                       if (!isset($aGroupedAddressLines[$aAddressLine['type']])) $aGroupedAddressLines[$aAddressLine['type']] = array();
-                       $aGroupedAddressLines[$aAddressLine['type']][] = $aAddressLine;
+                       if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+                       else $sType = $aAddressLine['type'];
+
+                       if (!isset($aGroupedAddressLines[$sType]))
+                               $aGroupedAddressLines[$sType] = array();
+                       $aGroupedAddressLines[$sType][] = $aAddressLine;
                }
                foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
                {