11 files changed, 31 insertions, 44 deletions
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 0ccf488c7..05c91c8dd 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -19,7 +19,7 @@ sub council_url { return 'bathnes'; }
 
 sub admin_user_domain { 'bathnes.gov.uk' }
 
-sub map_type { 'BathNES' }
+sub map_type { 'OSM' }
 
 sub on_map_default_status { 'open' }
 
diff --git a/perllib/FixMyStreet/Map/BathNES.pm b/perllib/FixMyStreet/Map/BathNES.pm
deleted file mode 100644
index 45261a625..000000000
--- a/perllib/FixMyStreet/Map/BathNES.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-# FixMyStreet:Map::BathNES
-# More JavaScript, for street assets
-
-package FixMyStreet::Map::BathNES;
-use base 'FixMyStreet::Map::OSM';
-
-use strict;
-
-sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.wfs.js',
-    '/vendor/OpenLayers.Projection.OrdnanceSurvey.js',
-    '/js/map-OpenLayers.js',
-    '/js/map-OpenStreetMap.js',
-    '/cobrands/fixmystreet-uk-councils/roadworks.js',
-    '/cobrands/fixmystreet/assets.js',
-    '/cobrands/bathnes/js.js',
-    '/cobrands/bathnes/assets.js',
-] }
-
-1;
diff --git a/perllib/FixMyStreet/Map/Bristol.pm b/perllib/FixMyStreet/Map/Bristol.pm
index 32f5724f5..f6f5406de 100644
--- a/perllib/FixMyStreet/Map/Bristol.pm
+++ b/perllib/FixMyStreet/Map/Bristol.pm
@@ -37,8 +37,6 @@ sub map_javascript { [
     '/js/map-OpenLayers.js',
     '/js/map-wmts-base.js',
     '/js/map-wmts-bristol.js',
-    '/cobrands/fixmystreet/assets.js',
-    '/cobrands/bristol/assets.js',
 ] }
 
 1;
diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index cd50cc1d1..595c83f6d 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -9,16 +9,6 @@ use base 'FixMyStreet::Map::FMS';
 
 use strict;
 
-sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.wfs.js',
-    '/js/map-OpenLayers.js',
-    '/js/map-bing-ol.js',
-    '/js/map-fms.js',
-    '/cobrands/fixmystreet/assets.js',
-    '/cobrands/bromley/map.js',
-    '/cobrands/bromley/assets.js',
-] }
-
 sub map_tile_base {
     '-', "https://%sfix.bromley.gov.uk/tilma/%d/%d/%d.png";
 }
diff --git a/perllib/FixMyStreet/Map/Hounslow.pm b/perllib/FixMyStreet/Map/Hounslow.pm
index ce0831196..d66188a83 100644
--- a/perllib/FixMyStreet/Map/Hounslow.pm
+++ b/perllib/FixMyStreet/Map/Hounslow.pm
@@ -55,14 +55,9 @@ sub copyright {
 
 sub map_javascript { [
     '/vendor/OpenLayers/OpenLayers.wmts.js',
-    '/vendor/OpenLayers.Projection.OrdnanceSurvey.js',
     '/js/map-OpenLayers.js',
     '/js/map-wmts-base.js',
     '/js/map-wmts-hounslow.js',
-    '/cobrands/fixmystreet-uk-councils/roadworks.js',
-    '/cobrands/fixmystreet/assets.js',
-    '/cobrands/hounslow/js.js',
-    '/cobrands/hounslow/assets.js',
 ] }
 
 1;
diff --git a/t/cobrand/national_assets.t b/t/cobrand/national_assets.t
index 378425193..32e27079b 100644
--- a/t/cobrand/national_assets.t
+++ b/t/cobrand/national_assets.t
@@ -20,6 +20,7 @@ subtest 'cobrand assets includes not applied on cobrand sites', sub {
         ALLOWED_COBRANDS => [ 'bathnes' ],
         MAPIT_URL => 'http://mapit.uk/',
         MAP_TYPE => 'FMS,OSM,BathNES,Buckinghamshire',
+        STAGING_FLAGS => { skip_checks => 1 },
     }, sub {
         $mech->get_ok("/report/new?latitude=51.494885&longitude=-2.602237");
         $mech->content_lacks('buckinghamshire/assets.js');
diff --git a/t/map/tests.t b/t/map/tests.t
index 7e3b6f6bd..a06759a33 100644
--- a/t/map/tests.t
+++ b/t/map/tests.t
@@ -2,16 +2,15 @@ use FixMyStreet::Map;
 use Test::More;
 
 my $requires = {
-    'BathNES' => 'bathnes/assets.js',
     'Bing' => 'map-bing-ol.js',
-    'Bristol' => 'bristol/assets.js',
-    'Bromley' => 'bromley/assets.js',
+    'Bristol' => 'map-wmts-bristol.js',
+    'Bromley' => 'map-fms.js',
     'Buckinghamshire' => 'map-wmts-buckinghamshire.js',
     'Lincolnshire' => 'lincolnshire/assets.js',
     'FMS' => 'map-fms.js',
     'Google' => 'map-google.js',
     'GoogleOL' => 'map-google-ol.js',
-    'Hounslow' => 'hounslow/assets.js',
+    'Hounslow' => 'map-wmts-hounslow.js',
     'OSM' => 'OpenStreetMap.js',
     'CycleMap' => 'OpenStreetMap.js',
     'MapQuest' => 'OpenStreetMap.js',
diff --git a/templates/web/bathnes/footer_extra_js.html b/templates/web/bathnes/footer_extra_js.html
index 8113befc9..c195600fc 100644
--- a/templates/web/bathnes/footer_extra_js.html
+++ b/templates/web/bathnes/footer_extra_js.html
@@ -1,3 +1,14 @@
 [% scripts.push(
     version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'),
 ) %]
+[%~
+IF bodyclass.match('mappage');
+    scripts.push(
+        version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
+        version('/cobrands/fixmystreet/assets.js'),
+        version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
+        version('/cobrands/bathnes/js.js'),
+        version('/cobrands/bathnes/assets.js'),
+    );
+END
+%]
diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html
index 1742a55e2..deff4e395 100644
--- a/templates/web/bristol/footer_extra_js.html
+++ b/templates/web/bristol/footer_extra_js.html
@@ -1,5 +1,13 @@
 [% scripts.push(
-    version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js')
     version('/cobrands/fixmystreet-uk-councils/js.js'),
-    version('/cobrands/highways/assets.js'),
 ) %]
+[%~
+IF bodyclass.match('mappage');
+    scripts.push(
+        version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
+        version('/cobrands/fixmystreet/assets.js'),
+        version('/cobrands/bristol/assets.js'),
+        version('/cobrands/highways/assets.js'),
+    );
+END
+%]
diff --git a/templates/web/bromley/footer_extra_js.html b/templates/web/bromley/footer_extra_js.html
index 27eb438ca..26c8fe9f5 100644
--- a/templates/web/bromley/footer_extra_js.html
+++ b/templates/web/bromley/footer_extra_js.html
@@ -6,5 +6,9 @@
 [% IF bodyclass.match('mappage');
     scripts.push(
         version('/cobrands/bromley/js.js'),
+        version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
+        version('/cobrands/fixmystreet/assets.js'),
+        version('/cobrands/bromley/map.js'),
+        version('/cobrands/bromley/assets.js'),
     );
 END %]
diff --git a/templates/web/hounslow/footer_extra_js.html b/templates/web/hounslow/footer_extra_js.html
index ccec09313..5ca03231b 100644
--- a/templates/web/hounslow/footer_extra_js.html
+++ b/templates/web/hounslow/footer_extra_js.html
@@ -6,6 +6,7 @@ IF bodyclass.match('mappage');
     version('/cobrands/fixmystreet/assets.js'),
     version('/cobrands/highways/assets.js'),
     version('/cobrands/hounslow/js.js'),
+    version('/cobrands/hounslow/assets.js'),
   );
 END
 %]