4 files changed, 20 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Barnet.pm b/perllib/FixMyStreet/Cobrand/Barnet.pm
index bccd27885..9496570ea 100644
--- a/perllib/FixMyStreet/Cobrand/Barnet.pm
+++ b/perllib/FixMyStreet/Cobrand/Barnet.pm
@@ -63,9 +63,11 @@ sub all_councils_report {
 }
 
 sub disambiguate_location {
-    my ( $self, $s ) = @_;
-    $s = "ll=51.612832,-0.218169&spn=0.0563,0.09&$s";
-    return $s;
+    return {
+        centre => '51.612832,-0.218169',
+        span   => '0.0563,0.09',
+        bounds => [ '51.584682,-0.263169', '51.640982,-0.173169' ],
+    };
 }
 
 sub recent_photos {
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index d8cd426ba..29061ebd8 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -303,12 +303,15 @@ sub front_stats_data {
 
 =head2 disambiguate_location
 
-Given a STRING ($_[1]) representing a location and a QUERY, return a string that
-includes any disambiguating information available
+Returns disambiguating information available
 
 =cut 
 
-sub disambiguate_location { "$_[1]&gl=uk" }
+sub disambiguate_location {
+    return {
+        country => 'uk',
+    };
+}
 
 =head2 form_elements
 
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index 29d2ec867..3d855cf8e 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -28,9 +28,10 @@ sub enter_postcode_text {
 
 # Is also adding language parameter
 sub disambiguate_location {
-    my ( $self, $s ) = @_;
-    $s = "hl=no&gl=no&$s";
-    return $s;
+    return {
+        lang => 'no',
+        country => 'no',
+    };
 }
 
 sub area_types {
diff --git a/perllib/FixMyStreet/Cobrand/Southampton.pm b/perllib/FixMyStreet/Cobrand/Southampton.pm
index 6b4aae742..abf6e3082 100644
--- a/perllib/FixMyStreet/Cobrand/Southampton.pm
+++ b/perllib/FixMyStreet/Cobrand/Southampton.pm
@@ -63,9 +63,11 @@ sub all_councils_report {
 }
 
 sub disambiguate_location {
-    my ( $self, $s ) = @_;
-    $s = "ll=50.913822,-1.400493&spn=0.084628,0.15701&$s";
-    return $s;
+    return {
+        centre => '50.913822,-1.400493',
+        span   => '0.084628,0.15701',
+        bounds => [ '50.871508,-1.478998', '50.956136,-1.321988' ],
+    };
 }
 
 sub recent_photos {