Merge tag 'v1.8.1' into fiksgatami-dev

1 files changed, 7 insertions, 6 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 4aa695ae5..1e6d9ec9e 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -6,6 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use FixMyStreet::Map;
 use Encode;
+use JSON::MaybeXS;
 use Utils;
 
 =head1 NAME
@@ -306,7 +307,7 @@ sub ajax : Path('/ajax') {
     # JSON encode the response
     my $json = { pins => $pins };
     $json->{current} = $on_map_list_html if $on_map_list_html;
-    my $body = JSON->new->utf8(1)->encode($json);
+    my $body = encode_json($json);
     $c->res->body($body);
 }
 
@@ -350,8 +351,10 @@ sub _geocode : Private {
     } else {
         if ( ref($suggestions) eq 'ARRAY' ) {
             foreach (@$suggestions) {
-                push @addresses, decode_utf8($_->{address});
-                push @locations, { address => decode_utf8($_->{address}), lat => $_->{latitude}, long => $_->{longitude} };
+                my $address = $_->{address};
+                $address = decode_utf8($address) if !utf8::is_utf8($address);
+                push @addresses, $address;
+                push @locations, { address => $address, lat => $_->{latitude}, long => $_->{longitude} };
             }
             $response = { suggestions => \@addresses, locations => \@locations };
         } else {
@@ -363,9 +366,7 @@ sub _geocode : Private {
         $response = \@addresses;
     }
 
-    my $body = JSON->new->utf8(1)->encode(
-        $response
-    );
+    my $body = encode_json($response);
     $c->res->body($body);
 
 }