1 files changed, 48 insertions, 11 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 2900497c4..b5a1cd8d3 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -545,10 +545,15 @@ Used by send-reports to attach nearest things to the bottom of the report
 =cut
 
 sub find_closest {
-    my ( $self, $latitude, $longitude ) = @_;
+    my ( $self, $latitude, $longitude, $problem ) = @_;
     my $str = '';
 
     if ( my $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude ) ) {
+        # cache the bing results for use in alerts
+        if ( $problem ) {
+            $problem->geocode( $j );
+            $problem->update;
+        }
         if ($j->{resourceSets}[0]{resources}[0]{name}) {
             $str .= sprintf(_("Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"),
                 $j->{resourceSets}[0]{resources}[0]{name}) . "\n\n";
@@ -576,23 +581,55 @@ Used by rss feeds to provide a bit more context
 =cut
 
 sub find_closest_address_for_rss {
-    my ( $self, $latitude, $longitude ) = @_;
+    my ( $self, $latitude, $longitude, $problem ) = @_;
     my $str = '';
 
-    if ( my $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude, 1 ) ) {
-        if ($j->{resourceSets}[0]{resources}[0]{name}) {
-            my $address = $j->{resourceSets}[0]{resources}[0]{address};
-            my @address;
-            push @address, $address->{addressLine} if $address->{addressLine} ne 'Street';
-            push @address, $address->{locality};
-            $str .= sprintf(_("Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"),
-                join( ', ', @address ) );
-        }
+    my $j;
+    if ( $problem && ref($problem) =~ /FixMyStreet/ && $problem->can( 'geocode' ) ) {
+       $j = $problem->geocode;
+    } else {
+        $problem = FixMyStreet::App->model('DB::Problem')->find( { id => $problem->{id} } );
+        $j = $problem->geocode;
+    }
+
+    # if we've not cached it then we don't want to look it up in order to avoid
+    # hammering the bing api
+    # if ( !$j ) {
+    #     $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude, 1 );
+
+    #     $problem->geocode( $j );
+    #     $problem->update;
+    # }
+
+    if ($j && $j->{resourceSets}[0]{resources}[0]{name}) {
+        my $address = $j->{resourceSets}[0]{resources}[0]{address};
+        my @address;
+        push @address, $address->{addressLine} if $address->{addressLine} and $address->{addressLine} !~ /^Street$/i;
+        push @address, $address->{locality} if $address->{locality};
+        $str .= sprintf(_("Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"),
+            join( ', ', @address ) ) if @address;
     }
 
     return $str;
 }
 
+=head2 format_postcode
+
+Takes a postcode string and if it looks like a valid postcode then transforms it
+into the canonical postcode.
+
+=cut
+
+sub format_postcode {
+    my ( $self, $postcode ) = @_;
+
+    if ( $postcode ) {
+        $postcode = mySociety::PostcodeUtil::canonicalise_postcode($postcode)
+            if $postcode && mySociety::PostcodeUtil::is_valid_postcode($postcode);
+    }
+
+    return $postcode;
+}
 =head2 council_check
 
 Paramters are COUNCILS, QUERY, CONTEXT. Return a boolean indicating whether