2 files changed, 37 insertions, 8 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index ec8df4450..a09161494 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -269,7 +269,7 @@ sub map_features : Private {
     # Allow the cobrand to add in any additional query parameters
     my $extra_params = $c->cobrand->call_hook('display_location_extra_params');
 
-    my ( $on_map, $nearby, $distance ) =
+    my ( $on_map, $nearby ) =
       FixMyStreet::Map::map_features(
         $c, %$extra,
         categories => [ keys %{$c->stash->{filter_category}} ],
@@ -290,7 +290,6 @@ sub map_features : Private {
     $c->stash->{pins} = \@pins;
     $c->stash->{on_map} = $on_map;
     $c->stash->{around_map} = $nearby;
-    $c->stash->{distance} = $distance;
 }
 
 =head2 ajax
@@ -318,6 +317,18 @@ sub ajax : Path('/ajax') {
     $c->forward('/reports/ajax', [ 'around/on_map_list_items.html' ]);
 }
 
+sub nearby : Path {
+    my ($self, $c) = @_;
+
+    my $states = FixMyStreet::DB::Result::Problem->open_states();
+    $c->forward('/report/_nearby_json', [ {
+        latitude => $c->get_param('latitude'),
+        longitude => $c->get_param('longitude'),
+        categories => [ $c->get_param('filter_category') || () ],
+        states => $states,
+    } ]);
+}
+
 sub location_closest_address : Path('/ajax/closest') {
     my ( $self, $c ) = @_;
     $c->res->content_type('application/json; charset=utf-8');
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 12f6ec1d1..e032caa09 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -600,22 +600,40 @@ sub nearby_json :PathPart('nearby.json') :Chained('id') :Args(0) {
     my ($self, $c) = @_;
 
     my $p = $c->stash->{problem};
-    my $dist = 1;
+    $c->forward('_nearby_json', [ {
+        latitude => $p->latitude,
+        longitude => $p->longitude,
+        categories => [ $p->category ],
+        ids => [ $p->id ],
+    } ]);
+}
+
+sub _nearby_json :Private {
+    my ($self, $c, $params) = @_;
 
     # This is for the list template, this is a list on that page.
     $c->stash->{page} = 'report';
 
-    my $extra_params = $c->cobrand->call_hook('display_location_extra_params');
+    # distance in metres
+    my $dist = $c->get_param('distance') || '';
+    $dist = 1000 unless $dist =~ /^\d+$/;
+    $dist = 1000 if $dist > 1000;
+    $params->{distance} = $dist / 1000;
+
+    my $pin_size = $c->get_param('pin_size') || '';
+    $pin_size = 'small' unless $pin_size =~ /^(mini|small|normal|big)$/;
+
+    $params->{extra} = $c->cobrand->call_hook('display_location_extra_params');
+    $params->{limit} = 5;
+
+    my $nearby = $c->model('DB::Nearby')->nearby($c, %$params);
 
-    my $nearby = $c->model('DB::Nearby')->nearby(
-        $c, $dist, [ $p->id ], 5, $p->latitude, $p->longitude, [ $p->category ], undef, $extra_params
-    );
     # Want to treat these as if they were on map
     $nearby = [ map { $_->problem } @$nearby ];
     my @pins = map {
         my $p = $_->pin_data($c, 'around');
         [ $p->{latitude}, $p->{longitude}, $p->{colour},
-          $p->{id}, $p->{title}, 'small', JSON->false
+          $p->{id}, $p->{title}, $pin_size, JSON->false
         ]
     } @$nearby;