Merge branch 'report-filtering-on-map'

This branch allows the map pages to be filtered by report category and
status with the 'filter_category' and 'status' GET parameters.

1 files changed, 7 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 7a50a3146..7885c28b3 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -131,20 +131,25 @@ sub _recent {
 # Problems around a location
 
 sub around_map {
-    my ( $rs, $min_lat, $max_lat, $min_lon, $max_lon, $interval, $limit ) = @_;
+    my ( $rs, $min_lat, $max_lat, $min_lon, $max_lon, $interval, $limit, $category, $states ) = @_;
     my $attr = {
         order_by => { -desc => 'created' },
     };
     $attr->{rows} = $limit if $limit;
 
+    unless ( $states ) {
+        $states = FixMyStreet::DB::Result::Problem->visible_states();
+    }
+
     my $q = {
             non_public => 0,
-            state => [ FixMyStreet::DB::Result::Problem->visible_states() ],
+            state => [ keys %$states ],
             latitude => { '>=', $min_lat, '<', $max_lat },
             longitude => { '>=', $min_lon, '<', $max_lon },
     };
     $q->{'current_timestamp - lastupdate'} = { '<', \"'$interval'::interval" }
         if $interval;
+    $q->{category} = $category if $category;
 
     my @problems = mySociety::Locale::in_gb_locale { $rs->search( $q, $attr )->all };
     return \@problems;