imagery: fix osstvw_make_diffs find typo

[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 c0680d433bcb22bf05ae55e439196c4b6820d39b..40234e1639e62f43a0c28ca0b152e2eb8f0c18cc 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -26,8 +26,23 @@ 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
+
+cookbook_file "/srv/imagery/common/osstvw_make_diffs" do
+  source "osstvw_make_diffs"
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
 imagery_site "os.openstreetmap.org" do
-  aliases [ "os.openstreetmap.org.uk" ]
+  aliases ["os.openstreetmap.org.uk"]
+  git_repository "https://github.com/Firefishy/osm-imagery-os-site.git"
 end
 
 imagery_layer "gb_os_sv_2010_04" do
@@ -37,7 +52,7 @@ imagery_layer "gb_os_sv_2010_04" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2010-04" ]
+  url_aliases ["/sv-2010-04"]
 end
 
 imagery_layer "gb_os_sv_2010_11" do
@@ -47,7 +62,7 @@ imagery_layer "gb_os_sv_2010_11" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2010-11" ]
+  url_aliases ["/sv-2010-11"]
 end
 
 imagery_layer "gb_os_sv_2011_05" do
@@ -57,7 +72,7 @@ imagery_layer "gb_os_sv_2011_05" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2011-05" ]
+  url_aliases ["/sv-2011-05"]
 end
 
 imagery_layer "gb_os_sv_2011_11" do
@@ -67,7 +82,7 @@ imagery_layer "gb_os_sv_2011_11" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2011-11" ]
+  url_aliases ["/sv-2011-11"]
 end
 
 imagery_layer "gb_os_sv_2012_05" do
@@ -77,7 +92,7 @@ imagery_layer "gb_os_sv_2012_05" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2012-05" ]
+  url_aliases ["/sv-2012-05"]
 end
 
 imagery_layer "gb_os_sv_2012_11" do
@@ -87,7 +102,7 @@ imagery_layer "gb_os_sv_2012_11" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2012-11" ]
+  url_aliases ["/sv-2012-11"]
 end
 
 imagery_layer "gb_os_sv_2013_05" do
@@ -97,7 +112,7 @@ imagery_layer "gb_os_sv_2013_05" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2013-05" ]
+  url_aliases ["/sv-2013-05"]
 end
 
 imagery_layer "gb_os_sv_2013_11" do
@@ -107,7 +122,7 @@ imagery_layer "gb_os_sv_2013_11" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2013-11" ]
+  url_aliases ["/sv-2013-11"]
 end
 
 imagery_layer "gb_os_sv_2014_04" do
@@ -117,7 +132,7 @@ imagery_layer "gb_os_sv_2014_04" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2014-04" ]
+  url_aliases ["/sv-2014-04"]
 end
 
 imagery_layer "gb_os_sv_2014_10" do
@@ -127,7 +142,7 @@ imagery_layer "gb_os_sv_2014_10" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2014-10" ]
+  url_aliases ["/sv-2014-10"]
 end
 
 imagery_layer "gb_os_sv_2015_05" do
@@ -137,7 +152,7 @@ imagery_layer "gb_os_sv_2015_05" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2015-05" ]
+  url_aliases ["/sv-2015-05"]
 end
 
 imagery_layer "gb_os_sv_2015_11" do
@@ -148,5 +163,16 @@ imagery_layer "gb_os_sv_2015_11" do
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   background_colour "230 246 255" # OSSV Water Blue
   extension "os_sv_png"
-  url_aliases [ "/sv-2015-11", "/sv" ]
+  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