Set load average limit for re-renders to number of CPU threads

[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 439231cbebc6c07a7c3a8f7fd4e13b0976598b0f..b9af18645ff1fd4a7ef8f8b977926d519e36cb21 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -1,15 +1,14 @@
-# coding: utf-8
 #
-# Cookbook Name:: imagery
+# Cookbook:: imagery
 # Recipe:: gb_os_sv
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,6 +26,13 @@ cookbook_file "/srv/imagery/common/ossv-palette.txt" do
   mode "0644"
 end
 
+cookbook_file "/srv/imagery/common/os-openmap-local-palette.txt" do
+  source "os-openmap-local-palette.txt"
+  owner "root"
+  group "root"
+  mode "0644"
+end
+
 cookbook_file "/srv/imagery/common/osstvw_process" do
   source "osstvw_process"
   owner "root"
@@ -43,12 +49,13 @@ end
 
 imagery_site "os.openstreetmap.org" do
   title "OpenStreetMap - Ordnance Survey OpenData - Street View"
-  aliases ["os.openstreetmap.org.uk"]
+  aliases ["os.osm.org", "os.openstreetmap.org.uk"]
   bbox [[49.85, -10.5], [58.75, 1.9]]
 end
 
 imagery_layer "gb_os_sv_2010_04" do
   site "os.openstreetmap.org"
+  title "April 2010"
   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?
@@ -59,6 +66,7 @@ end
 
 imagery_layer "gb_os_sv_2010_11" do
   site "os.openstreetmap.org"
+  title "November 2010"
   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?
@@ -69,6 +77,7 @@ end
 
 imagery_layer "gb_os_sv_2011_05" do
   site "os.openstreetmap.org"
+  title "May 2011"
   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?
@@ -79,6 +88,7 @@ end
 
 imagery_layer "gb_os_sv_2011_11" do
   site "os.openstreetmap.org"
+  title "November 2011"
   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?
@@ -89,6 +99,7 @@ end
 
 imagery_layer "gb_os_sv_2012_05" do
   site "os.openstreetmap.org"
+  title "May 2012"
   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"
@@ -99,6 +110,7 @@ end
 
 imagery_layer "gb_os_sv_2012_11" do
   site "os.openstreetmap.org"
+  title "November 2012"
   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"
@@ -109,6 +121,7 @@ end
 
 imagery_layer "gb_os_sv_2013_05" do
   site "os.openstreetmap.org"
+  title "May 2013"
   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"
@@ -119,6 +132,7 @@ end
 
 imagery_layer "gb_os_sv_2013_11" do
   site "os.openstreetmap.org"
+  title "November 2013"
   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"
@@ -129,6 +143,7 @@ end
 
 imagery_layer "gb_os_sv_2014_04" do
   site "os.openstreetmap.org"
+  title "April 2014"
   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"
@@ -139,6 +154,7 @@ end
 
 imagery_layer "gb_os_sv_2014_10" do
   site "os.openstreetmap.org"
+  title "October 2014"
   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"
@@ -149,6 +165,7 @@ end
 
 imagery_layer "gb_os_sv_2015_05" do
   site "os.openstreetmap.org"
+  title "May 2015"
   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"
@@ -159,7 +176,7 @@ end
 
 imagery_layer "gb_os_sv_2015_11" do
   site "os.openstreetmap.org"
-  root_layer true
+  title "November 2015"
   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"
@@ -170,7 +187,7 @@ end
 
 imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"
-  root_layer true
+  title "April 2016"
   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"
@@ -179,9 +196,11 @@ imagery_layer "gb_os_sv_2016_04" do
   url_aliases ["/sv-2016-04", "/sv"] # Add "/sv" to current edition for backward compatibility
 end
 
-# Diff layers
+# ======= Diff layers =======
+
 imagery_layer "gb_os_sv_diff_2010_04_2010_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to November 2010"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2010-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010"
@@ -192,6 +211,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2011_05" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to May 2011"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -200,10 +220,9 @@ imagery_layer "gb_os_sv_diff_2010_04_2011_05" do
   overlay true
 end
 
-=begin
-
 imagery_layer "gb_os_sv_diff_2010_04_2011_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to November 2011"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -214,6 +233,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2012_05" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to May 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -224,6 +244,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2012_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to November 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -234,6 +255,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -244,6 +266,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -254,6 +277,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -264,6 +288,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -274,6 +299,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -284,6 +310,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -294,6 +321,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_04_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes April 2010 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -304,6 +332,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2011_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to May 2011"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -314,6 +343,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2011_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to November 2011"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -324,6 +354,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2012_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to May 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -334,6 +365,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2012_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to November 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -344,6 +376,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -354,6 +387,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -364,6 +398,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -374,6 +409,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -384,6 +420,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -394,6 +431,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -404,6 +442,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2010_11_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2010 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -414,6 +453,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2011_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to November 2011"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -424,6 +464,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2012_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to May 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -434,6 +475,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2012_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to November 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -444,6 +486,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -454,6 +497,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -464,6 +508,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -474,6 +519,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -484,6 +530,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -494,6 +541,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -504,6 +552,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_05_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2011 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -514,6 +563,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2012_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to May 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -524,6 +574,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2012_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to November 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -534,6 +585,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -544,6 +596,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -554,6 +607,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -564,6 +618,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
@@ -574,6 +629,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -584,6 +640,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -594,6 +651,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2011_11_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2011 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2011-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -604,6 +662,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2012_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to November 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
@@ -614,6 +673,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -624,6 +684,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -634,6 +695,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -644,6 +706,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -654,6 +717,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -664,6 +728,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -674,6 +739,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_05_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2012 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -684,6 +750,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2013_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to May 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -694,6 +761,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -704,6 +772,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -714,6 +783,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -724,6 +794,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -734,6 +805,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -744,6 +816,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2012_11_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2012 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2012-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -754,6 +827,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2013_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to November 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
@@ -764,6 +838,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -774,6 +849,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -784,6 +860,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -794,6 +871,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -804,6 +882,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_05_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2013 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -814,6 +893,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_11_2014_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2013 to April 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -824,6 +904,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_11_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes November 2013 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -834,6 +915,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_11_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes November 2013 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -844,6 +926,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_11_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes November 2013 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -854,6 +937,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2013_11_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2013 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2013-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -864,6 +948,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_04_2014_10" do
   site "os.openstreetmap.org"
+  title "Changes April 2014 to October 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-04-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
@@ -874,6 +959,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_04_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes April 2014 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-04-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -884,6 +970,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_04_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes April 2014 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-04-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -894,6 +981,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_04_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes April 2014 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-04-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -904,6 +992,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_10_2015_05" do
   site "os.openstreetmap.org"
+  title "Changes October 2014 to May 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-10-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -914,6 +1003,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_10_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes October 2014 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-10-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -924,6 +1014,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2014_10_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes October 2014 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2014-10-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -934,6 +1025,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2015_05_2015_11" do
   site "os.openstreetmap.org"
+  title "Changes May 2015 to November 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2015-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
@@ -944,6 +1036,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2015_05_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes May 2015 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2015-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -954,6 +1047,7 @@ end
 
 imagery_layer "gb_os_sv_diff_2015_11_2016_04" do
   site "os.openstreetmap.org"
+  title "Changes November 2015 to April 2016"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-diff-2015-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
@@ -962,4 +1056,75 @@ imagery_layer "gb_os_sv_diff_2015_11_2016_04" do
   overlay true
 end
 
-=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/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"
+end
+
+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-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"
+end
+
+imagery_layer "gb_os_om_local_2017_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2017"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2017-10/os-openmap-local-2017-10.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"
+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