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

[chef.git] / cookbooks / imagery / recipes / lu_lidar_hillshade.rb

diff --git a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
index aa169020c7347adc1fcc571e7ea2c25d2da86cad..54cad6c53f72a94324a797d6483d4ba7a2d13796 100644 (file)
--- a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
+++ b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
@@ -24,26 +24,28 @@ imagery_site "lidar-hillshade-2019.openstreetmap.lu" do
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 
-imagery_layer "lidar_hillshade_2019" do
+# Delete borken layers like this
+
+imagery_layer "mappers_delight_lidar_hillshade_2019" do
   site "lidar-hillshade-2019.openstreetmap.lu"
-  default_layer true
-  projection "EPSG:3857"
-  source "/data/imagery/lu/lidar-hillshade/lu-lidar-2019-epsg3857.tif"
-  max_zoom 21
-  title "Lidar Hillshading"
-  copyright '&copy; 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>, CC0'
+  action :delete
 end
 
-imagery_layer "vdl_light6" do
-  action :delete
+imagery_layer "mappers_delight_lidar_dem_2019" do
   site "lidar-hillshade-2019.openstreetmap.lu"
+  projection "EPSG:3857"
+  source "/data/imagery/lu/lidar-hillshade/dem-3857.tif"
+  max_zoom 22
+  title "OpenStreetMap.lu Mapper's Delight 2019 Lidar DEM"
+  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 <a href="https://twitter.com/grischard">Guillaume Rischard</a>, CC0'
 end
 
-imagery_layer "vdl_light6_deflate" do
+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/lidar-test-vdl-light6-3857-deflate.tif"
+  source "/data/imagery/lu/lidar-hillshade/lu_hillshade_2019-3857.tif"
   max_zoom 22
-  title "Lidar Hillshading Light6 test VdL"
-  copyright '&copy; 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>, CC0'
-end
+  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'
+end
\ No newline at end of file