google maps don't seem to pay as much attention to region hinting as they once did so make sure we add UK on to the end.

also update tests to take into account changed results because of this.

1 files changed, 14 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index c06c3bb55..cbfa3c4e7 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -126,8 +126,20 @@ sub string {
     if (-s $cache_file) {
         $js = File::Slurp::read_file($cache_file);
     } else {
-        $url .= ',+UK' unless $url =~ /united\++kingdom$/ || $url =~ /uk$/i
-            || mySociety::Config::get('COUNTRY') ne 'GB';
+        # For some reason adding gl=uk is no longer sufficient to make google
+        # think we are in the UK for some locations so we explictly add UK to
+        # the address. We do it here so as not to invalidate existing cache
+        # entries
+        if (   mySociety::Config::get('COUNTRY') eq 'GB'
+            && $url !~ /,\+UK/
+            && $url !~ /united\++kingdom$/ )
+        {
+            if ( $url =~ /&/ ) {
+                $url =~ s/&/,+UK&/;
+            } else {
+                $url .= ',+UK';
+            }
+        }
         $url .= '&sensor=false&key=' . mySociety::Config::get('GOOGLE_MAPS_API_KEY');
         $js = LWP::Simple::get($url);
         $js = encode_utf8($js) if utf8::is_utf8($js);