diff options
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/TfL.pm | 14 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/GoogleOL.pm | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm index b80929f25..8e133fa58 100644 --- a/perllib/FixMyStreet/Cobrand/TfL.pm +++ b/perllib/FixMyStreet/Cobrand/TfL.pm @@ -421,7 +421,19 @@ sub munge_reports_area_list { } sub munge_report_new_contacts { } -sub munge_report_new_bodies { } + +sub munge_report_new_bodies { + my ($self, $bodies) = @_; + + # Highways England handling + my $c = $self->{c}; + my $he = FixMyStreet::Cobrand::HighwaysEngland->new({ c => $c }); + my $on_he_road = $c->stash->{on_he_road} = $he->report_new_is_on_he_road; + + if (!$on_he_road) { + %$bodies = map { $_->id => $_ } grep { $_->name ne 'Highways England' } values %$bodies; + } +} sub munge_surrounding_london { my ($self, $bodies) = @_; diff --git a/perllib/FixMyStreet/Map/GoogleOL.pm b/perllib/FixMyStreet/Map/GoogleOL.pm index 44d0e77e7..7049b27d4 100644 --- a/perllib/FixMyStreet/Map/GoogleOL.pm +++ b/perllib/FixMyStreet/Map/GoogleOL.pm @@ -16,7 +16,7 @@ sub map_template { 'google-ol' } sub map_javascript { my $google_maps_url = "https://maps.googleapis.com/maps/api/js?v=3"; my $key = FixMyStreet->config('GOOGLE_MAPS_API_KEY'); - $google_maps_url .= "&key=$key" if $key; + $google_maps_url .= "&key=$key" if $key; [ $google_maps_url, '/vendor/OpenLayers/OpenLayers.google.js', |