Merge tag 'v1.6.1' into fiksgatami-dev

1 files changed, 7 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
index 91c44d5f4..a0ccb8a6d 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
@@ -5,11 +5,15 @@ use strict;
 use warnings;
 
 sub nearby {
-    my ( $rs, $c, $dist, $ids, $limit, $mid_lat, $mid_lon, $interval ) = @_;
+    my ( $rs, $c, $dist, $ids, $limit, $mid_lat, $mid_lon, $interval, $category, $states ) = @_;
+
+    unless ( $states ) {
+        $states = FixMyStreet::DB::Result::Problem->visible_states();
+    }
 
     my $params = {
         non_public => 0,
-        state => [ FixMyStreet::DB::Result::Problem::visible_states() ],
+        state => [ keys %$states ],
     };
     $params->{'current_timestamp-lastupdate'} = { '<', \"'$interval'::interval" }
         if $interval;
@@ -19,6 +23,7 @@ sub nearby {
         %{ $c->cobrand->problems_clause },
         %$params
     } if $c->cobrand->problems_clause;
+    $params->{category} = $category if $category;
 
     my $attrs = {
         prefetch => 'problem',