From 3fa291aee6def9ed121d6b56d586b90b02c786a8 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Wed, 1 Jun 2016 22:49:56 +0100
Subject: [PATCH] imagery: set sane zoom levels

---
 cookbooks/imagery/recipes/au_agri.rb             | 1 +
 cookbooks/imagery/recipes/gb_hampshire_aerial.rb | 2 ++
 cookbooks/imagery/recipes/gb_os_sv.rb            | 7 ++++---
 cookbooks/imagery/recipes/gb_surrey_aerial.rb    | 1 +
 cookbooks/imagery/resources/layer.rb             | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index fd1606173..03a55a6ad 100644
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -33,5 +33,6 @@ imagery_layer "au_ga_agri" do
   background_colour "0 0 0" # Black
   projection "EPSG:3857"
   source "/data/imagery/au/agri/combine.vrt"
+  max_zoom 17
   revision 1
 end
diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 8f304c88b..ae1fdf4b8 100644
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -30,6 +30,7 @@ imagery_layer "gb_hampshire_aerial_rgb" do
   default_layer true
   title "Hampshire Aerial - Summer 2013"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
+  max_zoom 20
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-rgb"]
@@ -39,6 +40,7 @@ imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
   title "Hampshire Aerial - Summer 2013 (False Colour IR)"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
+  max_zoom 20
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-fcir"]
diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 83b4de210..87f1c2450 100644
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -244,7 +244,7 @@ imagery_layer "gb_os_sv_diff_2010_04_2012_11" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2012-11"]
   overlay true
-  revision 1
+  revision 2
 end
 
 imagery_layer "gb_os_sv_diff_2010_04_2013_05" do
@@ -255,7 +255,7 @@ imagery_layer "gb_os_sv_diff_2010_04_2013_05" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2013-05"]
   overlay true
-  revision 1
+  revision 2
 end
 
 imagery_layer "gb_os_sv_diff_2010_04_2013_11" do
@@ -266,7 +266,7 @@ imagery_layer "gb_os_sv_diff_2010_04_2013_11" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2013-11"]
   overlay true
-  revision 1
+  revision 2
 end
 
 imagery_layer "gb_os_sv_diff_2010_04_2014_04" do
@@ -277,6 +277,7 @@ imagery_layer "gb_os_sv_diff_2010_04_2014_04" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2014-04"]
   overlay true
+  revision 2
 end
 
 imagery_layer "gb_os_sv_diff_2010_04_2014_10" do
diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 1ea762715..13cd84239 100644
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -30,6 +30,7 @@ imagery_layer "gb_surrey_aerial" do
   default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
+  max_zoom 21
   title "Surrey Air Survey - 2008/2009"
   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 46b584e1d..8c98e5ddb 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -34,7 +34,7 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
-property :max_zoom, Fixnum, :default => 23
+property :max_zoom, Fixnum, :default => 18
 property :url_aliases, [String, Array], :default => []
 property :revision, Fixnum, :default => 1
 property :overlay, [TrueClass, FalseClass], :default => false
-- 
2.43.2