[UK] Pull in cobrand asset files on national site.

Also add body name to layer defaults, so they are only used where appropriate.

Switch mapit area javascript calls to GeoJSON, so we can drop KML support in
OpenLayers.wfs.js which saves a small amount of bandwidth.

6 files changed, 10 insertions, 8 deletions

diff --git a/perllib/FixMyStreet/Map/BathNES.pm b/perllib/FixMyStreet/Map/BathNES.pm
index 9c9c3c11d..b21ba6ce7 100644
--- a/perllib/FixMyStreet/Map/BathNES.pm
+++ b/perllib/FixMyStreet/Map/BathNES.pm
@@ -7,12 +7,12 @@ use base 'FixMyStreet::Map::OSM';
 use strict;
 
 sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.bathnes.js',
+    '/vendor/OpenLayers/OpenLayers.wfs.js',
     '/vendor/OpenLayers.Projection.OrdnanceSurvey.js',
     '/js/map-OpenLayers.js',
     '/js/map-OpenStreetMap.js',
     '/cobrands/fixmystreet/assets.js',
-    '/cobrands/bathnes/js.js',
+    '/cobrands/bathnes/assets.js',
 ] }
 
-1;
\ No newline at end of file
+1;
diff --git a/perllib/FixMyStreet/Map/Bristol.pm b/perllib/FixMyStreet/Map/Bristol.pm
index 5d05fbd34..99bdd26d7 100644
--- a/perllib/FixMyStreet/Map/Bristol.pm
+++ b/perllib/FixMyStreet/Map/Bristol.pm
@@ -64,7 +64,7 @@ sub map_javascript { [
     '/js/map-wmts-base.js',
     '/js/map-wmts-bristol.js',
     '/cobrands/fixmystreet/assets.js',
-    '/cobrands/bristol/js.js',
+    '/cobrands/bristol/assets.js',
 ] }
 
 # Reproject a WGS84 lat/lon into BNG easting/northing
diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index 22e4147f6..cd50cc1d1 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -10,12 +10,13 @@ use base 'FixMyStreet::Map::FMS';
 use strict;
 
 sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.buckinghamshire.js',
+    '/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 {
diff --git a/perllib/FixMyStreet/Map/Buckinghamshire.pm b/perllib/FixMyStreet/Map/Buckinghamshire.pm
index b6d86d4b9..10ee2a080 100644
--- a/perllib/FixMyStreet/Map/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Map/Buckinghamshire.pm
@@ -7,13 +7,14 @@ use base 'FixMyStreet::Map::OSM';
 use strict;
 
 sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.buckinghamshire.js',
+    '/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/buckinghamshire/js.js',
+    '/cobrands/buckinghamshire/assets.js',
 ] }
 
 1;
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 89f872297..226123c69 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -12,7 +12,7 @@ use strict;
 sub map_template { 'fms' }
 
 sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
+    '/vendor/OpenLayers/OpenLayers.wfs.js',
     '/js/map-OpenLayers.js',
     '/js/map-bing-ol.js',
     '/js/map-fms.js',
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 47d6eeee7..67f12d526 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -19,7 +19,7 @@ sub map_type { 'OpenLayers.Layer.OSM.Mapnik' }
 sub map_template { 'osm' }
 
 sub map_javascript { [
-    '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
+    '/vendor/OpenLayers/OpenLayers.wfs.js',
     '/js/map-OpenLayers.js',
     '/js/map-OpenStreetMap.js',
 ] }