[UK] Improve owns_problem &c for use with TfL body

We need to call owns_problem all the time, not just in two-tier areas, for pin
colour and base URL, and ignore TfL in owns_problem and body lookup function.

1 files changed, 13 insertions, 13 deletions

diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 753aa2404..25f809d8c 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -38,10 +38,11 @@ sub restriction {
     return { cobrand => shift->moniker };
 }
 
-# UK cobrands assume that each MapIt area ID maps both ways with one body
+# UK cobrands assume that each MapIt area ID maps both ways with one
+# body. Except TfL.
 sub body {
     my $self = shift;
-    my $body = FixMyStreet::DB->resultset('Body')->for_areas($self->council_area_id)->first;
+    my $body = FixMyStreet::DB->resultset('Body')->for_areas($self->council_area_id)->search({ name => { '!=', 'TfL' } })->first;
     return $body;
 }
 
@@ -175,28 +176,27 @@ sub owns_problem {
     } else { # Object
         @bodies = values %{$report->bodies};
     }
-    my %areas = map { %{$_->areas} } @bodies;
+    # Want to ignore the TfL body that covers London councils
+    my %areas = map { %{$_->areas} } grep { $_->name ne 'TfL' } @bodies;
     return $areas{$self->council_area_id} ? 1 : undef;
 }
 
-# If the council is two-tier then show pins for the other council as grey
+# If the council is two-tier, or e.g. TfL reports,
+# then show pins for the other council as grey
 sub pin_colour {
     my ( $self, $p, $context ) = @_;
-    return 'grey' if $self->is_two_tier && !$self->owns_problem( $p );
+    return 'grey' if !$self->owns_problem( $p );
     return $self->next::method($p, $context);
 }
 
-# If we ever link to a county problem report, needs to be to main FixMyStreet
+# If we ever link to a county problem report, or a TfL report,
+# needs to be to main FixMyStreet
 sub base_url_for_report {
     my ( $self, $report ) = @_;
-    if ( $self->is_two_tier ) {
-        if ( $self->owns_problem( $report ) ) {
-            return $self->base_url;
-        } else {
-            return FixMyStreet->config('BASE_URL');
-        }
-    } else {
+    if ( $self->owns_problem( $report ) ) {
         return $self->base_url;
+    } else {
+        return FixMyStreet->config('BASE_URL');
     }
 }