pass nearest address over to Oxfordshire in its entirety, parse at point of insertion

1 files changed, 1 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 259dc7202..efd172640 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -72,21 +72,10 @@ sub send {
 
         # extra Oxfordshire fields: send nearest street, postcode, northing and easting, and the FMS id
         if ( $row->council =~ /$COUNCIL_ID_OXFORDSHIRE/ ) {
-            my ($postcode, $nearest_street) = ('', '');
-            for ($h->{closest_address}) {
-                $postcode = sprintf("%-10s", $1) if /Nearest postcode [^:]+: ((\w{1,4}\s?\w+|\w+))/;
-                    # use partial postcode or comma as delimiter, strip leading number (possible letter 221B) off too
-                    #    "99 Foo Street, London N11 1XX" becomes Foo Street
-                    #    "99 Foo Street N11 1XX" becomes Foo Street
-                $nearest_street = $1 if /Nearest road [^:]+: (?:\d+\w? )?(.*?)(\b[A-Z]+\d|,|$)/m;
-            }
-            $postcode = mySociety::PostcodeUtil::is_valid_postcode($h->{query})
-                ? $h->{query} : $postcode; # use given postcode if available
 
             my $extra = $row->extra;
             push @$extra, { name => 'external_id', value => $row->id };
-            push @$extra, { name => 'postcode', value => $postcode } if $postcode;
-            push @$extra, { name => 'nearest_street', value => $nearest_street } if $nearest_street;
+            push @$extra, { name => 'closest_address', value => $h->{closest_address} } if $h->{closest_address};
             if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
                 push @$extra, { name => 'northing', value => $h->{northing} };
                 push @$extra, { name => 'easting', value => $h->{easting} };