don't use tokens from country parameter in address field of searches

fixes #218

diff --git a/lib/Geocode.php b/lib/Geocode.php
index d96b6cb8e7c29dd801456bbd2187baf32abaa072..11e47d9a4d7263aa3ba6456b300f134556a26075 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -611,7 +611,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)