imagery: set sane zoom levels

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index fd16061730bb37941f9a83022190f40c074374a5..03a55a6ade74268ac17fb8d603cfaa85f8239bda 100644 (file)
--- 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 8f304c88b2b88976862f515a252eaa1fdc449c9d..ae1fdf4b872146edebe0061e36cdc834774fe59a 100644 (file)
--- 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 83b4de2100ef8ed6c0f0c36940f15b9c6add28cb..87f1c2450f3b533edaccce315810ecda548733f2 100644 (file)
--- 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 1ea762715780749528f74665d7d4dd5647ac578c..13cd84239b9e0ac19e384595278db3ebde79eb36 100644 (file)
--- 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 46b584e1db3214298474b6f7f95cacbcc6f250b1..8c98e5ddbd4b60a274cf2d6a11dc721632bccbce 100644 (file)
--- 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