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

[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 6ca240fa35ed6fa5aa022dc1314cf70df76310be..8cd526b5d6acbe460536a46321dfd2a4827dea2d 100644 (file)
--- a/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
+++ b/cookbooks/imagery/recipes/lu_lidar_hillshade.rb
@@ -24,36 +24,21 @@ imagery_site "lidar-hillshade-2019.openstreetmap.lu" do
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 

-imagery_layer "lidar_hillshade_2019" do
+imagery_layer "mappers_delight_lidar_hillshade_2019_reprojected" do

   site "lidar-hillshade-2019.openstreetmap.lu"
   default_layer true
   projection "EPSG:3857"
   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'
+  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'

 end
 
 end
 

-imagery_layer "vdl_light6" do
-  action :delete
-  site "lidar-hillshade-2019.openstreetmap.lu"
-end
-
-imagery_layer "vdl-light6" do
-  action :delete
-  site "lidar-hillshade-2019.openstreetmap.lu"
-end
-
-imagery_layer "vdl_light6-deflate" do
-  action :delete
-  site "lidar-hillshade-2019.openstreetmap.lu"
-end
-
-imagery_layer "vdl_light6_deflate" do
+imagery_layer "mappers_delight_lidar_hillshade_2019_withunclassified" do

   site "lidar-hillshade-2019.openstreetmap.lu"
   projection "EPSG:3857"
   site "lidar-hillshade-2019.openstreetmap.lu"
   projection "EPSG:3857"

-  source "/data/imagery/lu/lidar-hillshade/lidar-test-vdl-light6-3857-deflate.tiff"
-  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'
+  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'

 end
 end