4 files changed, 23 insertions, 51 deletions
diff --git a/templates/web/base/maps/wmts_config.html b/templates/web/base/maps/wmts_config.html
new file mode 100644
index 000000000..333455605
--- /dev/null
+++ b/templates/web/base/maps/wmts_config.html
@@ -0,0 +1,15 @@
+<script type="text/javascript">
+  var fixmystreet = window.fixmystreet || {};
+  fixmystreet.wmts_config = {
+        'map_projection': '[% map.map_projection %]',
+        'tile_dpi': [% map.tile_dpi %],
+        'tile_urls': [% map.tile_urls %],
+        'tile_suffix': '[% map.tile_suffix %]',
+        'layer_names': [% map.layer_names %],
+        'layer_style': '[% map.layer_style %]',
+        'matrix_set': '[% map.matrix_set %]',
+        'scales': [% map.scales %],
+        'origin_x': [% map.origin_x %],
+        'origin_y': [% map.origin_y %]
+  };
+</script>
diff --git a/templates/web/bristol/maps/fms.html b/templates/web/bristol/maps/bristol.html
index fa3f01af4..c6e74022b 100644
--- a/templates/web/bristol/maps/fms.html
+++ b/templates/web/bristol/maps/bristol.html
@@ -2,8 +2,12 @@
 <script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
 [% END %]
 
-[% map_html = INCLUDE maps/openlayers.html %]
+[% map_html = BLOCK %]
+[% INCLUDE maps/openlayers.html %]
+[% INCLUDE maps/wmts_config.html %]
+[% END %]
+\ No newline at end of file
diff --git a/templates/web/bristol/maps/openlayers.html b/templates/web/bristol/maps/openlayers.html
deleted file mode 100644
index 4b178e21a..000000000
--- a/templates/web/bristol/maps/openlayers.html
+++ /dev/null
@@ -1,49 +0,0 @@
-[% IF map.clickable %]
-    [% map.img_type = 'input type="image"' %]
-[% ELSE %]
-    [% map.img_type = 'img' %]
-[% END %]
-
-<input type="hidden" name="zoom" value="[% map.zoom %]">
-<script type="text/javascript">
-var fixmystreet = {
-    'page': '[% page %]',
-    'area': [ [% map.area.join(',') %] ],
-    'all_pins': '[% all_pins %]',
-    'latitude': [% map.latitude %],
-    'longitude': [% map.longitude %],
-[% IF map.any_zoom -%]
-    'zoomToBounds': 1,
-[%- END %]
-[% IF map.zoom -%]
-    'zoom': [% map.zoom %],
-[%- END %]
-    'pin_prefix': '[% c.cobrand.path_to_pin_icons %]',
-    'numZoomLevels': [% map.numZoomLevels %],
-    'zoomOffset': [% map.zoomOffset %],
-    'map_type': [% map.map_type %],
-    'pins': [% INCLUDE maps/pins_js.html %],
-
-    'wmts_config': {
-        'map_projection': '[% map.map_projection %]',
-        'tile_dpi': [% map.tile_dpi %],
-        'tile_url': '[% map.tile_url %]',
-        'tile_suffix': '[% map.tile_suffix %]',
-        'layer_name': '[% map.layer_name %]',
-        'layer_style': '[% map.layer_style %]',
-        'matrix_set': '[% map.matrix_set %]',
-        'scales': [% map.scales %],
-        'origin_x': [% map.origin_x %],
-        'origin_y': [% map.origin_y %]
-    }
-}
-</script>
-<div id="map_box" aria-hidden="true">
-    [% pre_map %]
-    <div id="map">
-      [% INCLUDE 'maps/noscript_map.html' %]
-    </div>
-    [% IF map.copyright %]
-    <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
-    [% END %]
-
diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html
index e0c258223..e0a3979ed 100644
--- a/templates/web/zurich/maps/zurich.html
+++ b/templates/web/zurich/maps/zurich.html
@@ -1,7 +1,8 @@
 [% map_js = BLOCK %]
 <script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903Plus.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-wmts-zurich.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
 [% END %]
@@ -12,6 +13,7 @@
 
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
+[% INCLUDE maps/wmts_config.html %]
 [% UNLESS around_page %]
 <p id="sub_map_links">
      [% map_sub_links %]