Updates for rubocop and foodcritic changes

[chef.git] / cookbooks / imagery / recipes / gb_os_sv.rb

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 7c7e9ad72feaf4fdfed811ddfe028d686ec0cf53..7553e2a1557ad2e89a7b917667f25753639dbc3e 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -36,9 +36,8 @@ imagery_layer "gb_os_sv_2010_04" do
   source "/data/imagery/gb/os-sv/ossv-2010-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2010-04"]
 end
 
 imagery_layer "gb_os_sv_2010_11" do
@@ -47,9 +46,8 @@ imagery_layer "gb_os_sv_2010_11" do
   source "/data/imagery/gb/os-sv/ossv-2010-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2010-11"]
 end
 
 imagery_layer "gb_os_sv_2011_05" do
@@ -58,9 +56,8 @@ imagery_layer "gb_os_sv_2011_05" do
   source "/data/imagery/gb/os-sv/ossv-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2011-05"]
 end
 
 imagery_layer "gb_os_sv_2011_11" do
@@ -69,9 +66,8 @@ imagery_layer "gb_os_sv_2011_11" do
   source "/data/imagery/gb/os-sv/ossv-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2011-11"]
 end
 
 imagery_layer "gb_os_sv_2012_05" do
@@ -80,9 +76,8 @@ imagery_layer "gb_os_sv_2012_05" do
   source "/data/imagery/gb/os-sv/ossv-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2012-05"]
 end
 
 imagery_layer "gb_os_sv_2012_11" do
@@ -91,9 +86,8 @@ imagery_layer "gb_os_sv_2012_11" do
   source "/data/imagery/gb/os-sv/ossv-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2012-11"]
 end
 
 imagery_layer "gb_os_sv_2013_05" do
@@ -102,9 +96,8 @@ imagery_layer "gb_os_sv_2013_05" do
   source "/data/imagery/gb/os-sv/ossv-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2013-05"]
 end
 
 imagery_layer "gb_os_sv_2013_11" do
@@ -113,9 +106,8 @@ imagery_layer "gb_os_sv_2013_11" do
   source "/data/imagery/gb/os-sv/ossv-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2013-11"]
 end
 
 imagery_layer "gb_os_sv_2014_04" do
@@ -124,9 +116,8 @@ imagery_layer "gb_os_sv_2014_04" do
   source "/data/imagery/gb/os-sv/ossv-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2014-04"]
 end
 
 imagery_layer "gb_os_sv_2014_10" do
@@ -135,29 +126,27 @@ imagery_layer "gb_os_sv_2014_10" do
   source "/data/imagery/gb/os-sv/ossv-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2014-10"]
 end
 
-imagery_layer "gb_os_sv_2015-05" do
+imagery_layer "gb_os_sv_2015_05" do
   site "os.openstreetmap.org"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2015-05"]
 end
 
 imagery_layer "gb_os_sv_2015_11" do
   site "os.openstreetmap.org"
+  root_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   background_colour "230 246 255" # OSSV Water Blue
-  extension "png"
-  palette "/srv/imagery/common/ossv-palette.txt"
-  extent "5000 5000 660000 1225000"
+  extension "os_sv_png"
+  url_aliases ["/sv-2015-11", "/sv"]
 end