Move kessie imagery to lockheed

cookbooks/imagery/recipes/au_agri.rb

@@ -33,7 +33,7 @@
   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

cookbooks/imagery/recipes/gb_ea.rb

@@ -29,7 +29,7 @@
   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 @@
   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"

cookbooks/imagery/recipes/gb_hampshire_aerial.rb

@@ -29,7 +29,7 @@
   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 @@
 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"

cookbooks/imagery/recipes/gb_surrey_aerial.rb

@@ -29,7 +29,7 @@
   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"

cookbooks/imagery/recipes/lu_lidar_hillshade.rb

@@ -24,23 +24,11 @@
   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 @@
 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'

cookbooks/imagery/recipes/lu_ngl_dtm.rb

@@ -24,21 +24,11 @@
   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'

cookbooks/imagery/recipes/na_sgswa_topo.rb

@@ -29,7 +29,7 @@
   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 @@
   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"

cookbooks/imagery/recipes/za_coct_aerial.rb

@@ -29,7 +29,7 @@
   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 @@
   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"

cookbooks/imagery/recipes/za_ngi_topo.rb

@@ -29,7 +29,7 @@
   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 @@
   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

roles/imagery.rb

@@ -43,5 +43,7 @@
   "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]",
 )

roles/kessie.rb

@@ -28,6 +28,5 @@
 
 run_list(
   "role[exonetric]",
-  "role[hp-dl180-g6]",
-  "role[imagery]"
+  "role[hp-dl180-g6]"
 )

roles/lockheed.rb

@@ -77,6 +77,5 @@
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
-  "recipe[imagery::za_ngi_aerial]",
-  "recipe[imagery::us_imagery]"
+  "role[imagery]"
 )