Merge remote-tracking branch 'github/pull/426'

[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 9ea0d405e7073805626aae3a5b6f920c5247a1f9..4fb37469ad22ae5dd4e8c0b71bf4f7d899505fe7 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -1056,24 +1056,11 @@ imagery_layer "gb_os_sv_diff_2015_11_2016_04" do
   overlay true
 end
 
-imagery_layer "gb_os_om_local_2020_04" do
-  site "os.openstreetmap.org"
-  title "OS OpenMap Local - April 2020"
-  projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2020-04/os-openmap-local-2020-04-combined-sea-average-zstd22.vrt"
-  copyright "Contains OS data © Crown copyright and database right 2020"
-  revision 2
-  background_colour "213 244 248" # OS OpenMap Local Water Blue
-  extension "os_om_local_png"
-  url_aliases ["/om-local-2020-04", "/om-local"]
-  default_layer true
-end
-
 imagery_layer "gb_os_om_local_2016_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2016"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2017-10/os-openmap-local-2016-10.vrt"
+  source "/data/imagery/gb/openmap-local/2016-10/os-openmap-local-2016-10.vrt"
   copyright "Contains OS data © Crown copyright and database right 2016"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1083,7 +1070,7 @@ imagery_layer "gb_os_om_local_2017_04" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - April 2017"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2017-10/os-openmap-local-2017-04.vrt"
+  source "/data/imagery/gb/openmap-local/2017-04/os-openmap-local-2017-04.vrt"
   copyright "Contains OS data © Crown copyright and database right 2017"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1098,3 +1085,66 @@ imagery_layer "gb_os_om_local_2017_10" do
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
 end
+
+imagery_layer "gb_os_om_local_2018_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2018"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2018-04/os-openmap-local-2018-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2018"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2018_05" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - May 2018"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2018-05/os-openmap-local-2018-05.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2018"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2019_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2019"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2019-04/os-openmap-local-2019-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2019"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2020_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2020"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2020-04/os-openmap-local-2020-04-combined-sea-average-zstd22.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2020"
+  revision 2
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2020_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2020"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2020-10/os-openmap-local-2020-10.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2020"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2021_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2021"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2021-04/os-openmap-local-2021-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2021"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+  url_aliases ["/om-local-2021-04", "/om-local"]
+  default_layer true
+end