5 files changed, 83 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/Geocode/Bexley.pm b/perllib/FixMyStreet/Geocode/Bexley.pm
new file mode 100644
index 000000000..a70a42cd1
--- /dev/null
+++ b/perllib/FixMyStreet/Geocode/Bexley.pm
@@ -0,0 +1,69 @@
+package FixMyStreet::Geocode::Bexley;
+use parent 'FixMyStreet::Geocode::OSM';
+
+use warnings;
+use strict;
+
+use URI::Escape;
+
+my $base = 'http://tilma.mysociety.org/mapserver/bexley?SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=Streets&outputFormat=geojson&Filter=%3CFilter%3E%3CPropertyIsLike%20wildcard=%27*%27%20singleChar=%27.%27%20escape=%27!%27%3E%3CPropertyName%3EADDRESS%3C/PropertyName%3E%3CLiteral%3E{{str}}%3C/Literal%3E%3C/PropertyIsLike%3E%3C/Filter%3E';
+
+# Data is ALL CAPS
+sub recase {
+    my $word = shift;
+    return $word if $word =~ /FP/;
+    return lc $word if $word =~ /^(AND|TO)$/;
+    return ucfirst lc $word;
+}
+
+sub string {
+    my ($cls, $s, $c) = @_;
+
+    my $osm = $cls->SUPER::string($s, $c);
+    my $js = query_layer($s);
+    return $osm unless $js && @{$js->{features}};
+
+    my ( $error, @valid_locations, $latitude, $longitude, $address );
+    foreach (sort { $a->{properties}{ADDRESS} cmp $b->{properties}{ADDRESS} } @{$js->{features}}) {
+        my @lines = @{$_->{geometry}{coordinates}};
+        @lines = ([ @lines ]) if $_->{geometry}{type} eq 'LineString';
+        my @points = map { @$_ } @lines;
+        my $mid = int @points/2;
+        my $e = $points[$mid][0];
+        my $n = $points[$mid][1];
+        ( $latitude, $longitude ) = Utils::convert_en_to_latlon_truncated( $e, $n );
+        $address = sprintf("%s, %s", $_->{properties}{ADDRESS}, $_->{properties}{TOWN});
+        $address =~ s/([\w']+)/recase($1)/ge;
+        push @$error, {
+            address => $address,
+            latitude => $latitude,
+            longitude => $longitude
+        };
+        push (@valid_locations, $_);
+    }
+
+    if ($osm->{latitude}) { # one result from OSM
+        push @$error, {
+            address => $osm->{address},
+            latitude => $osm->{latitude},
+            longitude => $osm->{longitude},
+        };
+        return { error => $error };
+    }
+
+    if (ref $osm->{error} eq 'ARRAY') {
+        push @$error, @{$osm->{error}};
+        return { error => $error };
+    }
+
+    return { latitude => $latitude, longitude => $longitude, address => $address }
+        if scalar @valid_locations == 1;
+    return { error => $error };
+}
+
+sub query_layer {
+    my $s = uc shift;
+    $s = URI::Escape::uri_escape_utf8("*$s*");
+    (my $url = $base) =~ s/\{\{str\}\}/$s/;
+    return FixMyStreet::Geocode::cache('bexley', $url);
+}
diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm
index 9e425441a..ee5e15f8c 100644
--- a/perllib/FixMyStreet/Geocode/Bing.pm
+++ b/perllib/FixMyStreet/Geocode/Bing.pm
@@ -11,13 +11,19 @@ use strict;
 use FixMyStreet::Geocode;
 use Utils;
 
+sub setup {
+    my $cls = shift;
+    return 1 if FixMyStreet->config('BING_MAPS_API_KEY');
+    return 0;
+}
+
 # string STRING CONTEXT
 # Looks up on Bing Maps API, and caches, a user-inputted location.
 # Returns array of (LAT, LON, ERROR), where ERROR is either undef, a string, or
 # an array of matches if there are more than one. The information in the query
 # may be used to disambiguate the location in cobranded versions of the site.
 sub string {
-    my ( $s, $c ) = @_;
+    my ( $cls, $s, $c ) = @_;
 
     my $params = $c->cobrand->disambiguate_location($s);
     # Allow cobrand to fixup the user input
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm
index ad1881541..455d9cec0 100644
--- a/perllib/FixMyStreet/Geocode/Google.pm
+++ b/perllib/FixMyStreet/Geocode/Google.pm
@@ -16,7 +16,7 @@ use URI::Escape;
 # an array of matches if there are more than one. The information in the query
 # may be used to disambiguate the location in cobranded versions of the site.
 sub string {
-    my ( $s, $c ) = @_;
+    my ( $cls, $s, $c ) = @_;
 
     my $params = $c->cobrand->disambiguate_location($s);
     # Allow cobrand to fixup the user input
diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm
index 0d296f299..a36ae3192 100644
--- a/perllib/FixMyStreet/Geocode/OSM.pm
+++ b/perllib/FixMyStreet/Geocode/OSM.pm
@@ -23,7 +23,7 @@ my $nominatimbase = "http://nominatim.openstreetmap.org/";
 # an array of matches if there are more than one. The information in the query
 # may be used to disambiguate the location in cobranded versions of the site.
 sub string {
-    my ( $s, $c ) = @_;
+    my ( $cls, $s, $c ) = @_;
 
     my $params = $c->cobrand->disambiguate_location($s);
     # Allow cobrand to fixup the user input
@@ -52,14 +52,15 @@ sub string {
         return { error => _('Sorry, we could not find that location.') };
     }
 
-    my ( $error, @valid_locations, $latitude, $longitude );
+    my ( $error, @valid_locations, $latitude, $longitude, $address );
     foreach (@$js) {
         $c->cobrand->call_hook(geocoder_munge_results => $_);
         ( $latitude, $longitude ) =
             map { Utils::truncate_coordinate($_) }
             ( $_->{lat}, $_->{lon} );
+        $address = $_->{display_name};
         push (@$error, {
-            address => $_->{display_name},
+            address => $address,
             icon => $_->{icon},
             latitude => $latitude,
             longitude => $longitude
@@ -67,7 +68,7 @@ sub string {
         push (@valid_locations, $_);
     }
 
-    return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1;
+    return { latitude => $latitude, longitude => $longitude, address => $address } if scalar @valid_locations == 1;
     return { error => $error };
 }
 
diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm
index c7bd9e9d9..38df431c9 100644
--- a/perllib/FixMyStreet/Geocode/Zurich.pm
+++ b/perllib/FixMyStreet/Geocode/Zurich.pm
@@ -60,7 +60,7 @@ sub setup_soap {
 # versions of the site.
 
 sub string {
-    my ( $s, $c ) = @_;
+    my ( $cls, $s, $c ) = @_;
 
     setup_soap();