[TfL] Allow bus stop reports outside London.

After this change, you can safely add the TfL body to other councils
(namely the ones surrounding London that include TfL bus stops);
clicking in those councils on other cobrands will have no change, as the
TfL body will be fully ignored on a non-London council, but on the TfL
cobrand it will allow it for e.g. the selection of bus stops outside
London.

It removes the body rather than just all its categories to prevent a "We
do not have details of the other body covering this area" message
appearing.

4 files changed, 57 insertions, 6 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index a3df4aa82..14aa7b83e 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -688,6 +688,8 @@ sub setup_categories_and_bodies : Private {
     my @bodies = $c->model('DB::Body')->active->for_areas(keys %$all_areas)->all;
     my %bodies = map { $_->id => $_ } @bodies;
 
+    $c->cobrand->call_hook(munge_report_new_bodies => \%bodies);
+
     my $contacts                #
       = $c                      #
       ->model('DB::Contact')    #
@@ -774,7 +776,7 @@ sub setup_categories_and_bodies : Private {
     $c->stash->{bodies} = \%bodies;
     $c->stash->{contacts} = \@contacts;
     $c->stash->{bodies_to_list} = \%bodies_to_list;
-    $c->stash->{bodies_ids} = [ map { $_->id } @bodies];
+    $c->stash->{bodies_ids} = [ map { $_ } keys %bodies ];
     $c->stash->{category_options} = \@category_options;
     $c->stash->{category_extras}  = \%category_extras;
     $c->stash->{category_extras_hidden}  = \%category_extras_hidden;
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index ba82949c7..9ab804c9f 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -83,6 +83,17 @@ sub munge_reports_categories_list {
     }
 }
 
+sub munge_report_new_bodies {
+    my ($self, $bodies) = @_;
+
+    my %bodies = map { $_->name => 1 } values %$bodies;
+    if ( $bodies{'TfL'} ) {
+        # Presented categories vary if we're on/off a red route
+        my $tfl = FixMyStreet::Cobrand->get_class_for_moniker( 'tfl' )->new({ c => $self->{c} });
+        $tfl->munge_surrounding_london($bodies);
+    }
+}
+
 sub munge_report_new_contacts {
     my ($self, $contacts) = @_;
 
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 1fa0aabe0..96f1d446d 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -10,16 +10,29 @@ use FixMyStreet::MapIt;
 use mySociety::ArrayUtils;
 use Utils;
 
-sub council_area_id { return [
+sub london_boroughs { (
     2511, 2489, 2494, 2488, 2482, 2505, 2512, 2481, 2484, 2495,
     2493, 2508, 2502, 2509, 2487, 2485, 2486, 2483, 2507, 2503,
     2480, 2490, 2492, 2500, 2510, 2497, 2499, 2491, 2498, 2506,
-    2496, 2501, 2504
-]; }
+    2496, 2501, 2504,
+) }
+
+# Surrounding areas for bus stops which can be outside London
+sub surrounding_london { (
+    # Clockwise from top left: South Bucks, Three Rivers, Watford, Hertsmere,
+    # Welwyn Hatfield, Broxbourne, Epping Forest, Brentwood, Thurrock,
+    # Dartford, Sevenoaks, Tandridge, Reigate and Banstead, Epsom and Ewell,
+    # Mole Valley, Elmbridge, Spelthorne, Slough
+    2256, 2338, 2346, 2339, 2344, 2340, 2311, 2309, 2615,
+    2358, 2350, 2448, 2453, 2457, 2454, 2455, 2456, 2606,
+) }
+
+sub council_area_id { [ $_[0]->london_boroughs, $_[0]->surrounding_london ] }
+
 sub council_area { return 'TfL'; }
 sub council_name { return 'TfL'; }
 sub council_url { return 'tfl'; }
-sub area_types  { [ 'LBO' ] }
+sub area_types  { [ 'LBO', 'UTA', 'DIS' ] }
 sub is_council { 0 }
 
 sub borough_for_report {
@@ -205,7 +218,9 @@ sub state_groups_inspect {
 sub fetch_area_children {
     my $self = shift;
 
-    my $areas = FixMyStreet::MapIt::call('areas', $self->area_types);
+    # This is for user admin display, in testing can only be London (for MapIt mock)
+    my $ids = FixMyStreet->test_mode ? 'LBO' : $self->council_area_id;
+    my $areas = FixMyStreet::MapIt::call('areas', $ids);
     foreach (keys %$areas) {
         $areas->{$_}->{name} =~ s/\s*(Borough|City|District|County) Council$//;
     }
@@ -454,6 +469,18 @@ sub report_new_is_on_tlrn {
 }
 
 sub munge_report_new_contacts { }
+sub munge_report_new_bodies { }
+
+sub munge_surrounding_london {
+    my ($self, $bodies) = @_;
+    # Are we in a London borough?
+    my $all_areas = $self->{c}->stash->{all_areas};
+    my %london_hash = map { $_ => 1 } $self->london_boroughs;
+    if (!grep { $london_hash{$_} } keys %$all_areas) {
+        # Don't send any TfL categories
+        %$bodies = map { $_->id => $_ } grep { $_->name ne 'TfL' } values %$bodies;
+    }
+}
 
 sub munge_red_route_categories {
     my ($self, $contacts) = @_;
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 60cecd0bb..6709ef565 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -291,6 +291,17 @@ sub prefill_report_fields_for_inspector { 1 }
 
 sub social_auth_disabled { 1 }
 
+sub munge_report_new_bodies {
+    my ($self, $bodies) = @_;
+
+    my %bodies = map { $_->name => 1 } values %$bodies;
+    if ( $bodies{'TfL'} ) {
+        # Presented categories vary if we're on/off a red route
+        my $tfl = FixMyStreet::Cobrand->get_class_for_moniker( 'tfl' )->new({ c => $self->{c} });
+        $tfl->munge_surrounding_london($bodies);
+    }
+}
+
 sub munge_report_new_contacts {
     my ($self, $contacts) = @_;