From 378150a466ccac89855b6035f226bd9aeee4d496 Mon Sep 17 00:00:00 2001
From: Hakim Cassimally <hakim@mysociety.org>
Date: Fri, 12 Sep 2014 14:11:21 +0000
Subject: Let cobrand override geocoder

Fixing issues with Bing geocoding for East Sussex,
for example "Church Street".
---
 perllib/FixMyStreet/Cobrand/Default.pm    | 13 +++++++++++++
 perllib/FixMyStreet/Cobrand/EastSussex.pm |  4 ++++
 perllib/FixMyStreet/Geocode.pm            |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 8eb637879..779c0a7a2 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -862,6 +862,19 @@ Perform any extra validation on the contact form.
 
 sub extra_contact_validation { (); }
 
+
+=head2 get_geocoder
+
+Return the default geocoder from config.
+
+=cut
+
+sub get_geocoder {
+    my ($self, $c) = @_;
+    return $c->config->{GEOCODER};
+}
+
+
 sub problem_as_hashref {
     my $self = shift;
     my $problem = shift;
diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
index 94b404bc3..c039b8410 100644
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ b/perllib/FixMyStreet/Cobrand/EastSussex.pm
@@ -106,5 +106,9 @@ sub temp_update_potholes_contact {
     $contact->update({ extra => $fields });
 }
 
+sub get_geocoder {
+    return 'OSM'; # default of Bing gives poor results, let's try overriding.
+}
+
 1;
 
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index 61c398985..2a318ea5a 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -35,7 +35,7 @@ sub lookup {
 sub string {
     my ($s, $c) = @_;
 
-    my $service = $c->config->{GEOCODER};
+    my $service = $c->cobrand->get_geocoder($c);
     $service = $service->{type} if ref $service;
     $service = 'OSM' unless $service =~ /^(Bing|Google|OSM|Zurich)$/;
     $service = 'OSM' if $service eq 'Bing' && !FixMyStreet->config('BING_MAPS_API_KEY');
-- 
cgit v1.2.3