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

[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 5d34c193b90a51b4aab5e7a0cff91be9169f4c2b..0fa2172b9fbbc4cfcaef61a7d221013236a5317f 100644 (file)
--- a/cookbooks/imagery/recipes/lu_ngl_dtm.rb
+++ b/cookbooks/imagery/recipes/lu_ngl_dtm.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook:: imagery
 #
 # Cookbook:: imagery

-# Recipe:: gb_surrey_aerial
+# Recipe:: lu_ngl_dtm

 #
 # Copyright:: 2016, OpenStreetMap Foundation
 #
 #
 # Copyright:: 2016, OpenStreetMap Foundation
 #


@@ -19,30 +19,17 @@
 
 include_recipe "imagery"
 
 
 include_recipe "imagery"
 

-ssl_certificate "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]]
 end
 
 imagery_site "ana-dtm-2017.openstreetmap.lu" do
   title "OpenStreetMap - ANA DTM 2017"
   bbox [[49.38, 5.64], [50.2, 6.64]]
 end
 

-imagery_layer "ana_dtm_2017" do
+imagery_layer "ana_dtm_2017_hillshading_multi" do

   site "ana-dtm-2017.openstreetmap.lu"
   default_layer true
   projection "EPSG:3857"
   site "ana-dtm-2017.openstreetmap.lu"
   default_layer true
   projection "EPSG:3857"

-  source "/data/imagery/lu/LUREF_NGL/ANA_LUREF_NGL_DTM-epsg-3857-compress.tif"
-  max_zoom 21
-  title "DTM"
-  copyright "Copyright"
-end
-
-imagery_layer "ana_dtm_2017_hillshading" do
-  site "ana-dtm-2017.openstreetmap.lu"
-  projection "EPSG:2169"
-  source "/data/imagery/lu/LUREF_NGL/lu_hillshade_2017.tif"
+  source "/store/imagery/lu/LUREF_NGL/ANA_LUREF_NGL_DTM_hillshade_multi_epsg3857.tif"

   max_zoom 21
   max_zoom 21

-  title "DTM Hillshading"
-  copyright "Copyright"
+  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
 end