3 files changed, 14 insertions, 14 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index f69e9ea23..84a406a97 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -278,8 +278,10 @@ sub body_form_dropdowns : Private {
     my ( $self, $c ) = @_;
 
     my $areas;
-    if ($c->cobrand->moniker eq 'zurich') {
-        $areas = mySociety::MaPit::call('areas', 274456);
+    my $whitelist = $c->config->{MAPIT_ID_WHITELIST};
+
+    if ( $whitelist && ref $whitelist eq 'ARRAY' && @$whitelist ) {
+        $areas = mySociety::MaPit::call('areas', $whitelist);
     } else {
         $areas = mySociety::MaPit::call('areas', $c->cobrand->area_types);
     }
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 257d9ec24..96b3625a8 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -562,8 +562,16 @@ Remove areas whose reports go to another area (XXX)
 =cut
 
 sub remove_redundant_areas {
-  my $self = shift;
-  my $all_areas = shift;
+    my $self = shift;
+    my $all_areas = shift;
+
+    my $whitelist = FixMyStreet->config('MAPIT_ID_WHITELIST');
+    return unless $whitelist && ref $whitelist eq 'ARRAY' && @$whitelist;
+
+    my %whitelist = map { $_ => 1 } @$whitelist;
+    foreach (keys %$all_areas) {
+        delete $all_areas->{$_} unless $whitelist{$_};
+    }
 }
 
 =item short_name
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index d69fdebd2..9c725e7aa 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -103,16 +103,6 @@ sub updates_as_hashref {
     return $hashref;
 }
 
-sub remove_redundant_areas {
-    my $self = shift;
-    my $all_areas = shift;
-
-    # Remove all except Zurich
-    foreach (keys %$all_areas) {
-        delete $all_areas->{$_} unless $_ eq 274456;
-    }
-}
-
 sub show_unconfirmed_reports {
     1;
 }