Merge branch 'fix-assets-disappearing-at-max-zoom'

14 files changed, 4 insertions, 14 deletions

diff --git a/web/cobrands/bathnes/assets.js b/web/cobrands/bathnes/assets.js
index fb31749f2..3866c42e1 100644
--- a/web/cobrands/bathnes/assets.js
+++ b/web/cobrands/bathnes/assets.js
@@ -24,7 +24,6 @@ fixmystreet.maps.banes_defaults = {
     asset_item: "asset",
     asset_type: 'spot',
     max_resolution: 4.777314267158508,
-    min_resolution: 0.5971642833948135,
     asset_id_field: 'feature_no',
     attributes: null,
     geometryName: 'msGeometry',
diff --git a/web/cobrands/bexley/assets.js b/web/cobrands/bexley/assets.js
index a500ebbf3..f81c7f62e 100644
--- a/web/cobrands/bexley/assets.js
+++ b/web/cobrands/bexley/assets.js
@@ -15,7 +15,6 @@ var defaults = {
         }
     },
     max_resolution: 4.777314267158508,
-    min_resolution: 0.5971642833948135,
     geometryName: 'msGeometry',
     srsName: "EPSG:3857",
     body: "London Borough of Bexley",
diff --git a/web/cobrands/bristol/assets.js b/web/cobrands/bristol/assets.js
index 0e1ac603f..e06c11ed4 100644
--- a/web/cobrands/bristol/assets.js
+++ b/web/cobrands/bristol/assets.js
@@ -11,7 +11,6 @@ var options = {
         'bristol': 0.33072982812632296,
         'fixmystreet': 4.777314267158508
     },
-    min_resolution: 0.00001,
     asset_type: 'spot',
     body: "Bristol City Council",
     srsName: "EPSG:27700",
diff --git a/web/cobrands/bromley/assets.js b/web/cobrands/bromley/assets.js
index 397735007..758c627ea 100644
--- a/web/cobrands/bromley/assets.js
+++ b/web/cobrands/bromley/assets.js
@@ -16,7 +16,6 @@ var defaults = {
     },
     asset_type: 'spot',
     max_resolution: 4.777314267158508,
-    min_resolution: 0.5971642833948135,
     asset_id_field: 'CENTRAL_AS',
     geometryName: 'msGeometry',
     srsName: "EPSG:3857",
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 53198a0a9..8c3a47d9a 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -19,7 +19,6 @@ var defaults = {
       'buckinghamshire': 2.116670900008467,
       'fixmystreet': 4.777314267158508
     },
-    min_resolution: 0.00001,
     asset_id_field: 'central_as',
     attributes: {
         central_asset_id: 'central_as',
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index 435576408..bca654af7 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -10,7 +10,6 @@ var defaults = {
         fixmystreet: 4.777314267158508,
         cheshireeast: 1.4000028000056002
     },
-    min_resolution: 0.00001,
     attributes: {
         central_asset_id: 'central_as',
         site_code: 'site_code'
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index bd8b97135..ac22b6dde 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -590,7 +590,10 @@ function construct_layer_options(options, protocol) {
         protocol: protocol,
         visibility: false,
         maxResolution: max_resolution,
-        minResolution: options.min_resolution,
+        // If minimum resolution not specified, we only want to set a default
+        // if max_resolution is specified, otherwise the default minimum will
+        // be used to construct all the resolutions and it won't work
+        minResolution: options.min_resolution || (max_resolution ? 0.00001 : undefined),
         styleMap: options.stylemap || get_asset_stylemap(),
         assets: true
     };
diff --git a/web/cobrands/highways/assets.js b/web/cobrands/highways/assets.js
index 5c57f308a..3d987c2d9 100644
--- a/web/cobrands/highways/assets.js
+++ b/web/cobrands/highways/assets.js
@@ -18,7 +18,6 @@ var defaults = {
     // this covers zoomed right out on Cumbrian sections of
     // the M6
     max_resolution: 20,
-    min_resolution: 0.5971642833948135,
     srsName: "EPSG:900913",
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
diff --git a/web/cobrands/hounslow/assets.js b/web/cobrands/hounslow/assets.js
index 2dd996c68..603a56e85 100644
--- a/web/cobrands/hounslow/assets.js
+++ b/web/cobrands/hounslow/assets.js
@@ -19,7 +19,6 @@ var defaults = {
         'hounslow': 0.5291677250021167,
         'fixmystreet': 1.194328566789627
     },
-    min_resolution: 0.00001,
     asset_id_field: 'CentralAssetId',
     attributes: {
         central_asset_id: 'CentralAssetId',
diff --git a/web/cobrands/isleofwight/assets.js b/web/cobrands/isleofwight/assets.js
index 0a43e9e2c..e8d30e596 100644
--- a/web/cobrands/isleofwight/assets.js
+++ b/web/cobrands/isleofwight/assets.js
@@ -27,7 +27,6 @@ var defaults = {
         central_asset_id: 'central_asset_id',
         site_code: 'site_code'
     },
-    min_resolution: 0.00001,
     asset_id_field: 'asset_id',
     geometryName: 'msGeometry',
     srsName: "EPSG:27700",
diff --git a/web/cobrands/lincolnshire/assets.js b/web/cobrands/lincolnshire/assets.js
index ac1ae8cd5..3fe314e55 100644
--- a/web/cobrands/lincolnshire/assets.js
+++ b/web/cobrands/lincolnshire/assets.js
@@ -8,7 +8,6 @@ var defaults = {
     wfs_url: "https://tilma.mysociety.org/mapserver/lincs",
     asset_type: 'spot',
     max_resolution: 2.388657133579254,
-    min_resolution: 0.5971642833948135,
     asset_id_field: 'Confirm_CA',
     attributes: {
         central_asset_id: 'Confirm_CA',
diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index 47172712d..185289011 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -15,7 +15,6 @@ var defaults = {
         }
     },
     max_resolution: 4.777314267158508,
-    min_resolution: 0.5971642833948135,
     geometryName: 'msGeometry',
     srsName: "EPSG:3857",
     body: "Peterborough City Council",
diff --git a/web/cobrands/tfl/assets.js b/web/cobrands/tfl/assets.js
index 86b0143a9..7538d45e1 100644
--- a/web/cobrands/tfl/assets.js
+++ b/web/cobrands/tfl/assets.js
@@ -16,7 +16,6 @@ var defaults = {
     },
     asset_type: 'spot',
     max_resolution: 2.388657133579254,
-    min_resolution: 0.5971642833948135,
     geometryName: 'msGeometry',
     srsName: "EPSG:3857",
     strategy_class: OpenLayers.Strategy.FixMyStreet
diff --git a/web/cobrands/westminster/assets.js b/web/cobrands/westminster/assets.js
index 408d62041..95b29d06c 100644
--- a/web/cobrands/westminster/assets.js
+++ b/web/cobrands/westminster/assets.js
@@ -60,7 +60,6 @@ var defaults = {
     },
     asset_type: 'spot',
     max_resolution: 4.777314267158508,
-    min_resolution: 0.5971642833948135,
     asset_id_field: 'central_asset_id',
     srsName: "EPSG:4326",
     body: "Westminster City Council",