8 files changed, 12 insertions, 9 deletions
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
index 59d012c4f..df45eced5 100644
--- a/templates/web/base/maps/bing.html
+++ b/templates/web/base/maps/bing.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-bing-ol.js'),
 ];
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
index e155ff778..ff5b4eab6 100644
--- a/templates/web/base/maps/fms.html
+++ b/templates/web/base/maps/fms.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-bing-ol.js'),
     version('/js/map-fms.js'),
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 7c7711de9..d88043403 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -6,7 +6,7 @@ END;
 
 map_js = [
     google_maps_url,
-    version('/js/OpenLayers/OpenLayers.google.js'),
+    version('/vendor/OpenLayers/OpenLayers.google.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-google-ol.js'),
 ]
diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index e469901a8..43d6106a5 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-OpenStreetMap.js'),
 ];
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 215b69d26..8f8d527e2 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -6,7 +6,9 @@
 
 <input type="hidden" name="zoom" value="[% map.zoom %]">
 <div id="js-map-data"
+[%- UNLESS c.cobrand.call_hook('hide_areas_on_reports') %]
     data-area="[% map.area.join(',') %]"
+[%- END %]
     data-all_pins='[% all_pins %]'
     data-latitude=[% map.latitude %]
     data-longitude=[% map.longitude %]
@@ -16,13 +18,14 @@
 [% IF map.zoom -%]
     data-zoom=[% map.zoom %]
 [%- END %]
-    data-pin_prefix='[% c.config.ADMIN_BASE_URL IF admin %][% c.cobrand.path_to_pin_icons %]',
+    data-pin_prefix='[% c.config.ADMIN_BASE_URL IF admin %][% c.cobrand.path_to_pin_icons %]'
+    data-pin_new_report_colour='[% c.cobrand.pin_new_report_colour %]'
     data-numZoomLevels=[% map.numZoomLevels %]
     data-zoomOffset=[% map.zoomOffset %]
     data-map_type="[% map.map_type %]"
 [% IF include_key -%]
     data-key='[% c.config.BING_MAPS_API_KEY %]'
-[%- END %]
+[%- END -%]
 >
 </div>
 <div id="map_box" aria-hidden="true">
diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html
index dcf45d3b6..f68f53039 100644
--- a/templates/web/base/maps/osm-streetview.html
+++ b/templates/web/base/maps/osm-streetview.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-streetview.js'),
 ];
diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html
index 6512eaf2c..22b6636c5 100644
--- a/templates/web/base/maps/osm-toner-lite.html
+++ b/templates/web/base/maps/osm-toner-lite.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     "https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0",
     version('/js/map-OpenLayers.js'),
     version('/js/map-toner-lite.js'),
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index e469901a8..43d6106a5 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -1,6 +1,6 @@
 [%
 map_js = [
-    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/vendor/OpenLayers/OpenLayers.fixmystreet.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-OpenStreetMap.js'),
 ];