diff options
author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-04-01 10:47:11 +0100 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-04-04 17:50:55 +0100 |
commit | 98e61f99be442523fdfb38e95d9a8c2132ea0405 (patch) | |
tree | 4640cacbaf8392cb7c4df332a3a7bc6b19fb7b47 /perllib/FixMyStreet/App/Controller/Admin | |
parent | 8ca5583e62b1c24128b8d691a8b5f5236ce99eef (diff) |
Factor to common FixMyStreet::MapIt call.
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Admin')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 11 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin/Users.pm | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm index 1f8840bcb..0e47d2238 100644 --- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm +++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm @@ -6,6 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; } use POSIX qw(strcoll); use mySociety::EmailUtil qw(is_valid_email_list); +use FixMyStreet::MapIt; use FixMyStreet::SendReport; =head1 NAME @@ -104,7 +105,7 @@ sub body : Chained('/') : PathPart('admin/body') : CaptureArgs(1) { $c->stash->{body} = $body; if ($body->body_areas->first) { - my $example_postcode = mySociety::MaPit::call('area/example_postcode', $body->body_areas->first->area_id); + my $example_postcode = FixMyStreet::MapIt::call('area/example_postcode', $body->body_areas->first->area_id); if ($example_postcode && ! ref $example_postcode) { $c->stash->{example_pc} = $example_postcode; } @@ -187,14 +188,10 @@ sub body_form_dropdowns : Private { my $areas; my $whitelist = $c->config->{MAPIT_ID_WHITELIST}; - my %params; - $params{generation} = $c->config->{MAPIT_GENERATION} - if $c->config->{MAPIT_GENERATION}; - if ( $whitelist && ref $whitelist eq 'ARRAY' && @$whitelist ) { - $areas = mySociety::MaPit::call('areas', $whitelist, %params); + $areas = FixMyStreet::MapIt::call('areas', $whitelist); } else { - $areas = mySociety::MaPit::call('areas', $c->cobrand->area_types, %params); + $areas = FixMyStreet::MapIt::call('areas', $c->cobrand->area_types); } # Some cobrands may want to add extra areas at runtime beyond those diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm index 11a6d9962..bcbc808ed 100644 --- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm +++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm @@ -8,6 +8,7 @@ use POSIX qw(strcoll); use mySociety::EmailUtil qw(is_valid_email); use Text::CSV; +use FixMyStreet::MapIt; use FixMyStreet::SMS; use Utils; @@ -450,7 +451,7 @@ sub user_alert_details : Private { } if (@wards) { - $c->stash->{alert_areas} = mySociety::MaPit::call('areas', join(',', @wards) ); + $c->stash->{alert_areas} = FixMyStreet::MapIt::call('areas', join(',', @wards) ); } my %body_names = map { $_->{id} => $_->{name} } @{ $c->stash->{bodies} }; |