Move kessie imagery to lockheed

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index e2eaec353cf4c2767aea57d85f49ac718f4ebf86..931ecf3f1b31b005b7d7bba6a549ed4e66c42f7d 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -33,7 +33,7 @@ imagery_layer "au_ga_agri" do
   copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
   background_colour "0 0 0" # Black
   projection "EPSG:3857"
-  source "/data/imagery/au/agri/combine.vrt"
+  source "/store/imagery/au/agri/combine.vrt"
   max_zoom 17
   revision 1
 end

diff --git a/cookbooks/imagery/recipes/gb_ea.rb b/cookbooks/imagery/recipes/gb_ea.rb
index b1570c9de1b813364ff3c6f9dfd6968ef15aa601..14ae061e93bf4abfa49ffc41b39523131b5fec73 100644 (file)
--- a/cookbooks/imagery/recipes/gb_ea.rb
+++ b/cookbooks/imagery/recipes/gb_ea.rb
@@ -29,7 +29,7 @@ imagery_layer "gb_ea_night" do
   title "Environment Agency - Night Time Aerial"
   default_layer true
   projection "EPSG:27700"
-  source "/data/imagery/gb/ea/night/ea-night-test.vrt"
+  source "/store/imagery/gb/ea/night/ea-night-test.vrt"
   max_zoom 20
   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
@@ -39,7 +39,7 @@ imagery_layer "gb_ea_ortho_2015" do
   site "ea.openstreetmap.org.uk"
   title "Environment Agency - Ortho - 2015"
   projection "EPSG:27700"
-  source "/data/imagery/gb/ea/ortho/ea-ortho-2015-combined.vrt"
+  source "/store/imagery/gb/ea/ortho/ea-ortho-2015-combined.vrt"
   max_zoom 20
   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index d07b5f8d8de148afad5dc0333a6e0b9ba161bc69..c2a9d276af0112a06b4ca8122e0350c2334e63f2 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -29,7 +29,7 @@ imagery_layer "gb_hampshire_aerial_rgb" do
   root_layer true
   default_layer true
   title "Hampshire Aerial - Summer 2013"
-  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
+  source "/store/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   max_zoom 20
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
@@ -39,7 +39,7 @@ end
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
   title "Hampshire Aerial - Summer 2013 (False Colour IR)"
-  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
+  source "/store/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
   max_zoom 20
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 0a084db8a013f46b5fce9511ad1e7b6832692a7b..2345cc1e84694293a4666a898ef544aaad080404 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -57,7 +57,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -68,7 +68,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -79,7 +79,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -90,7 +90,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -101,7 +101,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -112,7 +112,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -123,7 +123,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -134,7 +134,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -145,7 +145,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -156,7 +156,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -167,7 +167,7 @@ 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"
+  source "/store/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 "os_sv_png"
@@ -178,7 +178,7 @@ imagery_layer "gb_os_sv_2015_11" do
   site "os.openstreetmap.org"
   title "November 2015"
   projection "EPSG:27700"
-  source "/data/imagery/gb/os-sv/ossv-2015-11-combined.vrt"
+  source "/store/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 "os_sv_png"
@@ -189,7 +189,7 @@ imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"
   title "April 2016"
   projection "EPSG:27700"
-  source "/data/imagery/gb/os-sv/ossv-2016-04-combined.vrt"
+  source "/store/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"
@@ -202,7 +202,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2010-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2010-11"]
@@ -213,7 +213,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2011-05-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-05"]
@@ -224,7 +224,7 @@ 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"
+  source "/store/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"]
@@ -235,7 +235,7 @@ 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"
+  source "/store/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"]
@@ -246,7 +246,7 @@ 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"
+  source "/store/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"]
@@ -257,7 +257,7 @@ 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"
+  source "/store/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"]
@@ -268,7 +268,7 @@ 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"
+  source "/store/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"]
@@ -279,7 +279,7 @@ 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"
+  source "/store/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"]
@@ -290,7 +290,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2014-10-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-10"]
@@ -301,7 +301,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2015-05"]
@@ -312,7 +312,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2015-11"]
@@ -323,7 +323,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-04-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-04-2016-04"]
@@ -334,7 +334,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-11-2011-05"]
@@ -345,7 +345,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2011-11"]
@@ -356,7 +356,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2012-05"]
@@ -367,7 +367,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2012-11"]
@@ -378,7 +378,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2013-05"]
@@ -389,7 +389,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2013-11"]
@@ -400,7 +400,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-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-11-2014-04"]
@@ -411,7 +411,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-11-2014-10"]
@@ -422,7 +422,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-11-2015-05"]
@@ -433,7 +433,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-11-2015-11"]
@@ -444,7 +444,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2010-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2010-11-2016-04"]
@@ -455,7 +455,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2011-11"]
@@ -466,7 +466,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2012-05"]
@@ -477,7 +477,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2012-11"]
@@ -488,7 +488,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2013-05"]
@@ -499,7 +499,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2013-11"]
@@ -510,7 +510,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2014-04"]
@@ -521,7 +521,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2014-10"]
@@ -532,7 +532,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2015-05"]
@@ -543,7 +543,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2015-11"]
@@ -554,7 +554,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-05-2016-04"]
@@ -565,7 +565,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2012-05"]
@@ -576,7 +576,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2012-11"]
@@ -587,7 +587,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2013-05"]
@@ -598,7 +598,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2013-11"]
@@ -609,7 +609,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2014-04"]
@@ -620,7 +620,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2014-10"]
@@ -631,7 +631,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2015-05"]
@@ -642,7 +642,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2015-11"]
@@ -653,7 +653,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2011-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2011-11-2016-04"]
@@ -664,7 +664,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2012-11"]
@@ -675,7 +675,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2013-05"]
@@ -686,7 +686,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2013-11"]
@@ -697,7 +697,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2014-04"]
@@ -708,7 +708,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2014-10"]
@@ -719,7 +719,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2015-05"]
@@ -730,7 +730,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2015-11"]
@@ -741,7 +741,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-05-2016-04"]
@@ -752,7 +752,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2013-05"]
@@ -763,7 +763,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2013-11"]
@@ -774,7 +774,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2014-04"]
@@ -785,7 +785,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2014-10"]
@@ -796,7 +796,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2015-05"]
@@ -807,7 +807,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2015-11"]
@@ -818,7 +818,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2012-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2012-11-2016-04"]
@@ -829,7 +829,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2013-11"]
@@ -840,7 +840,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2014-04"]
@@ -851,7 +851,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2014-10"]
@@ -862,7 +862,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2015-05"]
@@ -873,7 +873,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2015-11"]
@@ -884,7 +884,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-05-2016-04"]
@@ -895,7 +895,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-11-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-11-2014-04"]
@@ -906,7 +906,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-11-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-11-2014-10"]
@@ -917,7 +917,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-11-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-11-2015-05"]
@@ -928,7 +928,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-11-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-11-2015-11"]
@@ -939,7 +939,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2013-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2013-11-2016-04"]
@@ -950,7 +950,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-04-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-04-2014-10"]
@@ -961,7 +961,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-04-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-04-2015-05"]
@@ -972,7 +972,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-04-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-04-2015-11"]
@@ -983,7 +983,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-04-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-04-2016-04"]
@@ -994,7 +994,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-10-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-10-2015-05"]
@@ -1005,7 +1005,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-10-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-10-2015-11"]
@@ -1016,7 +1016,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2014-10-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2014-10-2016-04"]
@@ -1027,7 +1027,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2015-05-2015-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2015-05-2015-11"]
@@ -1038,7 +1038,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2015-05-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2015-05-2016-04"]
@@ -1049,7 +1049,7 @@ 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"
+  source "/store/imagery/gb/os-sv/ossv-diff-2015-11-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
   extension "os_sv_diff_png"
   url_aliases ["/sv-diff-2015-11-2016-04"]
@@ -1060,7 +1060,7 @@ 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"
+  source "/store/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"
@@ -1070,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-04/os-openmap-local-2017-04.vrt"
+  source "/store/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"
@@ -1080,7 +1080,7 @@ 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"
+  source "/store/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"
@@ -1090,7 +1090,7 @@ 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"
+  source "/store/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"
@@ -1100,7 +1100,7 @@ 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"
+  source "/store/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"
@@ -1110,7 +1110,7 @@ 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"
+  source "/store/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"
@@ -1120,7 +1120,7 @@ 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"
+  source "/store/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
@@ -1131,7 +1131,7 @@ 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"
+  source "/store/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"
@@ -1141,7 +1141,7 @@ 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"
+  source "/store/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"
@@ -1151,7 +1151,7 @@ imagery_layer "gb_os_om_local_2021_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2021"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2021-10/os-openmap-local-2021-10.vrt"
+  source "/store/imagery/gb/openmap-local/2021-10/os-openmap-local-2021-10.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"
@@ -1161,7 +1161,7 @@ imagery_layer "gb_os_om_local_2022_04" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - April 2022"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2022-04/os-openmap-local-2022-04.vrt"
+  source "/store/imagery/gb/openmap-local/2022-04/os-openmap-local-2022-04.vrt"
   copyright "Contains OS data © Crown copyright and database right 2022"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1171,7 +1171,7 @@ imagery_layer "gb_os_om_local_2022_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2022"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2022-10/os-openmap-local-2022-10.vrt"
+  source "/store/imagery/gb/openmap-local/2022-10/os-openmap-local-2022-10.vrt"
   copyright "Contains OS data © Crown copyright and database right 2022"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1181,7 +1181,7 @@ imagery_layer "gb_os_om_local_2023_04" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - April 2023"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2023-04/os-openmap-local-2023-04.vrt"
+  source "/store/imagery/gb/openmap-local/2023-04/os-openmap-local-2023-04.vrt"
   copyright "Contains OS data © Crown copyright and database right 2023"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1191,7 +1191,7 @@ imagery_layer "gb_os_om_local_2023_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2023"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2023-10/os-openmap-local-2023-10.vrt"
+  source "/store/imagery/gb/openmap-local/2023-10/os-openmap-local-2023-10.vrt"
   copyright "Contains OS data © Crown copyright and database right 2023"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1201,7 +1201,7 @@ imagery_layer "gb_os_om_local_2024_04" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - April 2024"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2024-04/os-openmap-local-2024-04.vrt"
+  source "/store/imagery/gb/openmap-local/2024-04/os-openmap-local-2024-04.vrt"
   copyright "Contains OS data © Crown copyright and database right 2024"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
@@ -1211,7 +1211,7 @@ imagery_layer "gb_os_om_local_2024_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2024"
   projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2024-10/os-openmap-local-2024-10.vrt"
+  source "/store/imagery/gb/openmap-local/2024-10/os-openmap-local-2024-10.vrt"
   copyright "Contains OS data © Crown copyright and database right 2024"
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index c3c871231d3ab6b74f2a50cfa39642d6240ab831..d5fbc387dc7f2a2f45c7b6cf2c9a09b3beab1615 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -29,7 +29,7 @@ imagery_layer "gb_surrey_aerial" do
   root_layer true
   default_layer true
   projection "EPSG:27700"
-  source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
+  source "/store/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
   max_zoom 21
   title "Surrey Air Survey - 2008/2009"
   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"

diff --git a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
index a6a277bc34ef853f20861494b03a042fd33817e8..8cd526b5d6acbe460536a46321dfd2a4827dea2d 100644 (file)
--- a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
+++ b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
@@ -24,23 +24,11 @@ imagery_site "lidar-hillshade-2019.openstreetmap.lu" do
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 
-# Delete borken layers like this
-
-imagery_layer "classy_mappers_delight_lidar_hillshade_2019" do
-  site "lidar-hillshade-2019.openstreetmap.lu"
-  action :delete
-end
-
-imagery_layer "mappers_delight_lidar_dem_2019" do
-  site "lidar-hillshade-2019.openstreetmap.lu"
-  action :delete
-end
-
 imagery_layer "mappers_delight_lidar_hillshade_2019_reprojected" do
   site "lidar-hillshade-2019.openstreetmap.lu"
   default_layer true
   projection "EPSG:3857"
-  source "/data/imagery/lu/lidar-hillshade/lu_hillshade_2019-3857.tif"
+  source "/store/imagery/lu/lidar-hillshade/lu_hillshade_2019-3857.tif"
   max_zoom 20
   title "OpenStreetMap.lu Mapper's Delight 2019 Lidar Hillshading"
   copyright 'Lidar data 2019 <a href="https://data.public.lu/fr/datasets/lidar-2019-releve-3d-du-territoire-luxembourgeois">Administration du Cadastre et de la Topographie Luxembourg</a>, DEM and hillshading <a href="https://twitter.com/grischard">Guillaume Rischard</a>, CC0'
@@ -49,7 +37,7 @@ end
 imagery_layer "mappers_delight_lidar_hillshade_2019_withunclassified" do
   site "lidar-hillshade-2019.openstreetmap.lu"
   projection "EPSG:3857"
-  source "/data/imagery/lu/lidar-hillshade/classy-hillshade.tif"
+  source "/store/imagery/lu/lidar-hillshade/classy-hillshade.tif"
   max_zoom 20
   title "OpenStreetMap.lu Mapper's Delight 2019 Lidar Hillshading with unclassified points"
   copyright 'Lidar data 2019 <a href="https://data.public.lu/fr/datasets/lidar-2019-releve-3d-du-territoire-luxembourgeois">Administration du Cadastre et de la Topographie Luxembourg</a>, DEM and hillshading <a href="https://twitter.com/grischard">Guillaume Rischard</a>, CC0'

diff --git a/cookbooks/imagery/recipes/lu_ngl_dtm.rb b/cookbooks/imagery/recipes/lu_ngl_dtm.rb
index e3133bf9f25cc607218176104e3f2af0595401d0..0fa2172b9fbbc4cfcaef61a7d221013236a5317f 100644 (file)
--- a/cookbooks/imagery/recipes/lu_ngl_dtm.rb
+++ b/cookbooks/imagery/recipes/lu_ngl_dtm.rb
@@ -24,21 +24,11 @@ imagery_site "ana-dtm-2017.openstreetmap.lu" do
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 
-imagery_layer "ana_dtm_2017" do
-  site "ana-dtm-2017.openstreetmap.lu"
-  action :delete
-end
-
-imagery_layer "ana_dtm_2017_hillshading" do
-  site "ana-dtm-2017.openstreetmap.lu"
-  action :delete
-end
-
 imagery_layer "ana_dtm_2017_hillshading_multi" do
   site "ana-dtm-2017.openstreetmap.lu"
   default_layer true
   projection "EPSG:3857"
-  source "/data/imagery/lu/LUREF_NGL/ANA_LUREF_NGL_DTM_hillshade_multi_epsg3857.tif"
+  source "/store/imagery/lu/LUREF_NGL/ANA_LUREF_NGL_DTM_hillshade_multi_epsg3857.tif"
   max_zoom 21
   title "DTM Hillshading (multidirectional)"
   copyright 'DEM 2017 <a href="https://data.public.lu/fr/datasets/digital-terrain-model-high-dem-resolution/">Administration de la Navigation A&eacute;rienne Luxembourg</a>, hillshading <a href="https://twitter.com/dmoraisferreira">David Morais Ferreira</a> &amp; <a href="https://twitter.com/grischard">Guillaume Rischard</a> CC0'

diff --git a/cookbooks/imagery/recipes/na_sgswa_topo.rb b/cookbooks/imagery/recipes/na_sgswa_topo.rb
index 7426805beae34384775edfb8ba366519d81895be..686e10dda92d58c4061ca585e8811c837b5b0774 100644 (file)
--- a/cookbooks/imagery/recipes/na_sgswa_topo.rb
+++ b/cookbooks/imagery/recipes/na_sgswa_topo.rb
@@ -29,7 +29,7 @@ imagery_layer "na_sgswa_topo_50k" do
   site "namibia-topo.openstreetmap.org.za"
   title "Namibia Topo 50k"
   projection "EPSG:4326"
-  source "/data/imagery/na/topo-50k/namibia-50k-topo-v2.vrt"
+  source "/store/imagery/na/topo-50k/namibia-50k-topo-v2.vrt"
   copyright "State Copyright &copy 1958 - 1991; Surveyor-General, Windhoek, SWA; CDSM: Chief Directorate Surveys & Mapping, Mowbray, RSA"
   default_layer true
   background_colour "0 0 0"
@@ -41,7 +41,7 @@ imagery_layer "na_aerial" do
   site "namibia-topo.openstreetmap.org.za"
   title "Namibia Aerial Demo"
   projection "namibia_aerial"
-  source "/data/imagery/na/aerial/aerial.vrt"
+  source "/store/imagery/na/aerial/aerial.vrt"
   copyright "State Copyright"
   background_colour "0 0 0"
   extension "jpeg"

diff --git a/cookbooks/imagery/recipes/za_coct_aerial.rb b/cookbooks/imagery/recipes/za_coct_aerial.rb
index 70463798f2bda0cdaf321b8fd18d65fae8228538..6a6a5b4cef04f9b19f9fff9373d669ce499f7c20 100644 (file)
--- a/cookbooks/imagery/recipes/za_coct_aerial.rb
+++ b/cookbooks/imagery/recipes/za_coct_aerial.rb
@@ -29,7 +29,7 @@ imagery_layer "za_coct_aerial_2015" do
   projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
   title "City of Cape Town Aerial - 2015 (OSM USE ONLY)"
-  source "/data/imagery/za/coct/2015-epsg-3857.tif"
+  source "/store/imagery/za/coct/2015-epsg-3857.tif"
   copyright 'Copyright &copy; 2015 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
   background_colour "0 0 0"
   extension "jpeg"
@@ -41,7 +41,7 @@ imagery_layer "za_coct_aerial_2013" do
   projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
   title "City of Cape Town Aerial - 2013 (OSM USE ONLY)"
-  source "/data/imagery/za/coct/2013-epsg-3857.tif"
+  source "/store/imagery/za/coct/2013-epsg-3857.tif"
   copyright 'Copyright &copy; 2013 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
   background_colour "0 0 0"
   extension "jpeg"

diff --git a/cookbooks/imagery/recipes/za_ngi_topo.rb b/cookbooks/imagery/recipes/za_ngi_topo.rb
index 46d0a8bc0c398e583fddc70dae723b414a1f097b..a1fd92c619c7e55d97bc816571124c9dbab3c9a6 100644 (file)
--- a/cookbooks/imagery/recipes/za_ngi_topo.rb
+++ b/cookbooks/imagery/recipes/za_ngi_topo.rb
@@ -29,7 +29,7 @@ imagery_layer "za_ngi_topo_250k" do
   site "topo.openstreetmap.org.za"
   title "NGI Topo 250k"
   projection "EPSG:3857"
-  source "/data/imagery/za/ngi-topo-250k/ngi-topo-250k-combined.vrt"
+  source "/store/imagery/za/ngi-topo-250k/ngi-topo-250k-combined.vrt"
   copyright 'State Copyright &copy; 1996&ndash;2010 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
   default_layer true
 end
@@ -38,6 +38,6 @@ imagery_layer "za_ngi_topo_50k" do
   site "topo.openstreetmap.org.za"
   title "NGI Topo 50k"
   projection "EPSG:3857"
-  source "/data/imagery/za/ngi-topo-50k/ngi-topo-50k-combined.vrt"
+  source "/store/imagery/za/ngi-topo-50k/ngi-topo-50k-combined.vrt"
   copyright 'State Copyright &copy; 1996&ndash;2013 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
 end

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 78437a60887c44aee95b45b52aa99d9b4cf8d519..867082757d51b0e18bc81f2a24dc9912f8ef1a16 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -43,5 +43,7 @@ run_list(
   "recipe[imagery::za_coct_aerial]",
   "recipe[imagery::na_sgswa_topo]",
   "recipe[imagery::lu_ngl_dtm]",
-  "recipe[imagery::lu_lidar_hillshade]"
+  "recipe[imagery::lu_lidar_hillshade]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]",
 )

diff --git a/roles/kessie.rb b/roles/kessie.rb
index 3505bc18a2edf7c999fae979dafdc3f7c23cd524..6e47d5dbb2ea78e0c9401816e4e984272cbfa10e 100644 (file)
--- a/roles/kessie.rb
+++ b/roles/kessie.rb
@@ -28,6 +28,5 @@ default_attributes(
 
 run_list(
   "role[exonetric]",
-  "role[hp-dl180-g6]",
-  "role[imagery]"
+  "role[hp-dl180-g6]"
 )

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index f4ace47e07668c5398a71b58ff639493bd765581..a2307bfeb83b4f878a66b99d039855c169903dab 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -77,6 +77,5 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
-  "recipe[imagery::za_ngi_aerial]",
-  "recipe[imagery::us_imagery]"
+  "role[imagery]"
 )