Revert "nominatim: improve IP query block expression"

[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 19e60f5d568ede22cfcef65e818094d08a889b87..e3133bf9f25cc607218176104e3f2af0595401d0 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
 #


@@ -26,19 +26,20 @@ end
 
 imagery_layer "ana_dtm_2017" do
   site "ana-dtm-2017.openstreetmap.lu"
 
 imagery_layer "ana_dtm_2017" do
   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"
+  action :delete

 end
 
 imagery_layer "ana_dtm_2017_hillshading" do
   site "ana-dtm-2017.openstreetmap.lu"
 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"
+  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"

   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