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

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

diff --git a/cookbooks/imagery/recipes/lu_ngl_dtm.rb b/cookbooks/imagery/recipes/lu_ngl_dtm.rb
index e161794c2bd49d6dccf8b338024417564671ca06..e3133bf9f25cc607218176104e3f2af0595401d0 100644 (file)
--- a/cookbooks/imagery/recipes/lu_ngl_dtm.rb
+++ b/cookbooks/imagery/recipes/lu_ngl_dtm.rb
@@ -19,11 +19,6 @@
 
 include_recipe "imagery"
 
-# Remove old incorrectly named site
-imagery_site "ana_dtm_2017.openstreetmap.lu" do
-  action :delete
-end
-
 imagery_site "ana-dtm-2017.openstreetmap.lu" do
   title "OpenStreetMap - ANA DTM 2017"
   bbox [[49.38, 5.64], [50.2, 6.64]]
@@ -31,19 +26,20 @@ end
 
 imagery_layer "ana_dtm_2017" do
   site "ana-dtm-2017.openstreetmap.lu"
-  projection "EPSG:3857"
-  source "/data/imagery/lu/LUREF_NGL/lu_color_relief-epsg3857-compress.tif"
-  max_zoom 21
-  title "DTM"
-  copyright '&copy; 2017 <a href="https://data.public.lu/fr/datasets/digital-terrain-model-high-dem-resolution/">Administration de la Navigation A&eacute;rienne Luxembourg</a>, CC0'
+  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/lu_hillshade_2017-epsg-3857-compress.tif"
+  source "/data/imagery/lu/LUREF_NGL/ANA_LUREF_NGL_DTM_hillshade_multi_epsg3857.tif"
   max_zoom 21
-  title "DTM Hillshading"
-  copyright '&copy; 2017 <a href="https://data.public.lu/fr/datasets/digital-terrain-model-high-dem-resolution/">Administration de la Navigation A&eacute;rienne Luxembourg</a>, CC0'
+  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'
 end