X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4237ed0cf20c0db1beb664d88be242130c854da8..fd98b3c103f6e6153e42cc3860f2ed61f1f4c5db:/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 c6fa2b8c9..35a04b1b5 100644
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -43,12 +43,13 @@ end
 
 imagery_site "os.openstreetmap.org" do
   title "OpenStreetMap - Ordnance Survey OpenData - Street View"
-  aliases ["os.openstreetmap.org.uk"]
+  aliases ["os.openstreetmap.org", "a.os.openstreetmap.org", "b.os.openstreetmap.org", "c.os.openstreetmap.org", "os.openstreetmap.org.uk", "a.os.openstreetmap.org.uk", "b.os.openstreetmap.org.uk", "c.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 +60,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 +71,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 +82,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 +93,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 +104,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 +115,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 +126,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 +137,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 +148,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 +159,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 +170,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 +181,8 @@ end
 
 imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"
-  root_layer true
+  title "April 2016"
+  default_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"
@@ -188,6 +200,7 @@ imagery_layer "gb_os_sv_diff_2010_04_2010_11" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2010-11"]
   overlay true
+  revision 2
 end
 
 imagery_layer "gb_os_sv_diff_2010_04_2011_05" do
@@ -198,69 +211,74 @@ imagery_layer "gb_os_sv_diff_2010_04_2011_05" do
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2011-05"]
   overlay true
+  revision 2
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2011_11" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2011-11"]
+  overlay true
+  revision 2
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2012_05" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2012-05"]
+  overlay true
+  revision 2
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2012_11" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2012-11"]
+  overlay true
+  revision 1
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2013_05" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2013-05"]
+  overlay true
+  revision 1
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2013_11" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2013-11"]
+  overlay true
+  revision 1
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2014_04" do
+  site "os.openstreetmap.org"
+  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"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2014-04"]
+  overlay true
 end
 
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2011_11" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2011-11"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2012_05" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2012-05"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2012_11" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2012-11"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2013_05" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2013-05"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2013_11" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2013-11"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2014_04" do
-#   site "os.openstreetmap.org"
-#   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"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2014-04"]
-#   overlay true
-# end
-#
 # imagery_layer "gb_os_sv_diff_2010_04_2014_10" do
 #   site "os.openstreetmap.org"
 #   projection "EPSG:27700"