X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3175024da99372ccd3fccd44f1160c5d43213b6e..8d0cd656e23b7cdbbf2c8b9093283e85ac305230:/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 5d6340180..e4d394d52 100644
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -26,8 +26,15 @@ cookbook_file "/srv/imagery/common/ossv-palette.txt" do
   mode "0644"
 end
 
+cookbook_file "/srv/imagery/common/osstvw_process" do
+  source "osstvw_process"
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
 imagery_site "os.openstreetmap.org" do
-  # aliases ["os.openstreetmap.org.uk"]
+  aliases ["os.openstreetmap.org.uk"]
 end
 
 imagery_layer "gb_os_sv_2010_04" do
@@ -36,10 +43,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"
-  url_aliases [ "/sv-2010-04" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2010-04"]
 end
 
 imagery_layer "gb_os_sv_2010_11" do
@@ -48,10 +53,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"
-  url_aliases [ "/sv-2010-11" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2010-11"]
 end
 
 imagery_layer "gb_os_sv_2011_05" do
@@ -60,10 +63,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"
-  url_aliases [ "/sv-2011-05" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2011-05"]
 end
 
 imagery_layer "gb_os_sv_2011_11" do
@@ -72,10 +73,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"
-  url_aliases [ "/sv-2011-11" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2011-11"]
 end
 
 imagery_layer "gb_os_sv_2012_05" do
@@ -84,10 +83,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"
-  url_aliases [ "/sv-2012-05" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2012-05"]
 end
 
 imagery_layer "gb_os_sv_2012_11" do
@@ -96,10 +93,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"
-  url_aliases [ "/sv-2012-11" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2012-11"]
 end
 
 imagery_layer "gb_os_sv_2013_05" do
@@ -108,10 +103,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"
-  url_aliases [ "/sv-2013-05" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2013-05"]
 end
 
 imagery_layer "gb_os_sv_2013_11" do
@@ -120,10 +113,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"
-  url_aliases [ "/sv-2013-11" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2013-11"]
 end
 
 imagery_layer "gb_os_sv_2014_04" do
@@ -132,10 +123,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"
-  url_aliases [ "/sv-2014-04" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2014-04"]
 end
 
 imagery_layer "gb_os_sv_2014_10" do
@@ -144,10 +133,8 @@ 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"
-  url_aliases [ "/sv-2014-10" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2014-10"]
 end
 
 imagery_layer "gb_os_sv_2015_05" do
@@ -156,10 +143,8 @@ imagery_layer "gb_os_sv_2015_05" do
   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"
-  url_aliases [ "/sv-2015-05" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2015-05"]
 end
 
 imagery_layer "gb_os_sv_2015_11" do
@@ -169,8 +154,17 @@ imagery_layer "gb_os_sv_2015_11" do
   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"
-  url_aliases [ "/sv-2015-11", "/sv" ]
+  extension "os_sv_png"
+  url_aliases ["/sv-2015-11"]
+end
+
+imagery_layer "gb_os_sv_2016_04" do
+  site "os.openstreetmap.org"
+  root_layer true
+  projection "EPSG:27700"
+  source "/data/imagery/gb/os-sv/ossv-2016-04-combined.vrt"
+  copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
+  background_colour "230 246 255" # OSSV Water Blue
+  extension "os_sv_png"
+  url_aliases ["/sv-2016-04", "/sv"] # Add "/sv" to current edition for backward compatibility
 end