Merge branch 'bristol-map-resolution'

5 files changed, 14 insertions, 5 deletions

diff --git a/web/cobrands/bathnes/assets.js b/web/cobrands/bathnes/assets.js
index e455d78e9..16ecb3076 100644
--- a/web/cobrands/bathnes/assets.js
+++ b/web/cobrands/bathnes/assets.js
@@ -23,7 +23,7 @@ fixmystreet.maps.banes_defaults = {
     asset_category: "",
     asset_item: "asset",
     asset_type: 'spot',
-    max_resolution: 2.388657133579254,
+    max_resolution: 4.777314267158508,
     min_resolution: 0.5971642833948135,
     asset_id_field: 'feature_no',
     attributes: null,
diff --git a/web/cobrands/bristol/assets.js b/web/cobrands/bristol/assets.js
index 6d2020bfe..1b32379dc 100644
--- a/web/cobrands/bristol/assets.js
+++ b/web/cobrands/bristol/assets.js
@@ -7,7 +7,10 @@ if (!fixmystreet.maps) {
 var options = {
     wfs_url: "https://maps.bristol.gov.uk/arcgis/services/ext/FixMyStreetSupportData/MapServer/WFSServer",
     wfs_feature: "COD_ASSETS_POINT",
-    max_resolution: 0.33072982812632296,
+    max_resolution: {
+        'bristol': 0.33072982812632296,
+        'fixmystreet': 4.777314267158508
+    },
     min_resolution: 0.00001,
     asset_id_field: 'COD_ASSET_ID',
     asset_type: 'spot',
@@ -17,6 +20,7 @@ var options = {
         usrn: 'COD_USRN'
     },
     body: "Bristol City Council",
+    srsName: "EPSG:27700",
     geometryName: 'SHAPE'
 };
 
diff --git a/web/cobrands/bromley/assets.js b/web/cobrands/bromley/assets.js
index 959148e5d..32c00d32d 100644
--- a/web/cobrands/bromley/assets.js
+++ b/web/cobrands/bromley/assets.js
@@ -16,7 +16,7 @@ var defaults = {
     },
     format_class: OpenLayers.Format.GML.v3.MultiCurveFix,
     asset_type: 'spot',
-    max_resolution: 2.388657133579254,
+    max_resolution: 4.777314267158508,
     min_resolution: 0.5971642833948135,
     asset_id_field: 'CENTRAL_AS',
     geometryName: 'msGeometry',
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 82301c4f2..f2c85872d 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -16,7 +16,7 @@ var defaults = {
     },
     format_class: OpenLayers.Format.GML.v3.MultiCurveFix,
     asset_type: 'spot',
-    max_resolution: 2.388657133579254,
+    max_resolution: 4.777314267158508,
     min_resolution: 0.5971642833948135,
     asset_id_field: 'central_as',
     attributes: {
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index f53d26bbb..31dcaec07 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -491,12 +491,17 @@ fixmystreet.assets = {
             options.asset_category = [ options.asset_category ];
         }
 
+        var max_resolution = options.max_resolution;
+        if (typeof max_resolution === 'object') {
+            max_resolution = max_resolution[fixmystreet.cobrand];
+        }
+
         var layer_options = {
             fixmystreet: options,
             strategies: [new StrategyClass()],
             protocol: protocol,
             visibility: false,
-            maxResolution: options.max_resolution,
+            maxResolution: max_resolution,
             minResolution: options.min_resolution,
             styleMap: options.stylemap || get_asset_stylemap(),
             assets: true