From: Grant Slater <git@firefishy.com>
Date: Sun, 31 Jan 2016 17:48:19 +0000 (+0000)
Subject: Imagery - remove layer in site nest
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/97d128e6fd3d8f1ad3a52da652b2a29b02e3d304

Imagery - remove layer in site nest
---

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 3474c4cda..366eff416 100644
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -21,12 +21,12 @@ include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
   # aliases ["agri.openstreetmap.org.au"]
+end
 
-  imagery_layer "au_ga_agri" do
-    site new_resource.name
-    text "AGRI: The Australian Geographic Reference Image"
-    copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
-    projection "EPSG:3857"
-    source "/data/imagery/au/agri/combine.vrt"
-  end
+imagery_layer "au_ga_agri" do
+  site "agri.openstreetmap.org"
+  text "AGRI: The Australian Geographic Reference Image"
+  copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
+  projection "EPSG:3857"
+  source "/data/imagery/au/agri/combine.vrt"
 end
diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 8209c0d28..5132f1b44 100644
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -20,19 +20,21 @@
 include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
-  imagery_layer "gb_hampshire_aerial-rgb" do
-    site new_resource.name
-    text "Hampshire Aerial - Summer 2013"
-    source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
-    projection "EPSG:27700"
-    copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
-  end
+  # aliases
+end
+
+imagery_layer "gb_hampshire_aerial_rgb" do
+  site "hampshire.aerial.openstreetmap.org.uk"
+  text "Hampshire Aerial - Summer 2013"
+  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
+  projection "EPSG:27700"
+  copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
+end
 
-  imagery_layer "gb_hampshire_aerial_fcir" do
-    site new_resource.name
-    text "Hampshire Aerial - Summer 2013 (FCIR)"
-    source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
-    projection "EPSG:27700"
-    copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
-  end
+imagery_layer "gb_hampshire_aerial_fcir" do
+  site "hampshire.aerial.openstreetmap.org.uk"
+  text "Hampshire Aerial - Summer 2013 (FCIR)"
+  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
+  projection "EPSG:27700"
+  copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
 end
diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 0817029e7..a6fe8a878 100644
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -28,136 +28,136 @@ end
 
 imagery_site "os.openstreetmap.org" do
   aliases ["os.openstreetmap.org.uk"]
+end
 
-  imagery_layer "gb_os_sv_2010_04" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2010_04" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2010_11" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2010_11" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2011_05" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2011_05" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2011_11" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2011_11" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2012_05" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2012_05" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2012_11" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2012_11" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2013_05" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2013_05" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2013_11" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2013_11" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2014_04" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2014_04" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2014_10" do
-    site new_resource.name
-    projection "EPSG:27700"
-    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"
-  end
+imagery_layer "gb_os_sv_2014_10" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  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"
+end
 
-  imagery_layer "gb_os_sv_2015-05" do
-    site new_resource.name
-    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"
-  end
+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"
+end
 
-  imagery_layer "gb_os_sv_2015_11" do
-    site new_resource.name
-    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"
-  end
+imagery_layer "gb_os_sv_2015_11" do
+  site "os.openstreetmap.org"
+  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"
 end
diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 97bc879c9..8fcb4ecbd 100644
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -20,9 +20,11 @@
 include_recipe "imagery"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
-  imagery_layer "gb-surrey-aerial" do
-    site new_resource.name
-    projection "EPSG:27700"
-    source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
-  end
+  # aliases
+end
+
+imagery_layer "gb_surrey_aerial" do
+  site "surrey.aerial.openstreetmap.org.uk"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
 end