imagery: increase randomise delay on mapserver restart

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

diff --git a/cookbooks/imagery/recipes/na_sgswa_topo.rb b/cookbooks/imagery/recipes/na_sgswa_topo.rb
index 7b4ac37498ba191faceb8412cd0f5c3e7de15bbc..686e10dda92d58c4061ca585e8811c837b5b0774 100644 (file)
--- a/cookbooks/imagery/recipes/na_sgswa_topo.rb
+++ b/cookbooks/imagery/recipes/na_sgswa_topo.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: imagery
+# Cookbook:: imagery
 # Recipe:: za_ngi_topo
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,11 +29,21 @@ imagery_layer "na_sgswa_topo_50k" do
   site "namibia-topo.openstreetmap.org.za"
   title "Namibia Topo 50k"
   projection "EPSG:4326"
-  source "/data/imagery/na/topo-50k/namibia-50k-topo.vrt"
-  copyright 'State Copyright &copy 1958 - 1991; Surveyor-General, Windhoek, SWA; CDSM: Chief Directorate Surveys & Mapping, Mowbray, RSA'
+  source "/store/imagery/na/topo-50k/namibia-50k-topo-v2.vrt"
+  copyright "State Copyright &copy 1958 - 1991; Surveyor-General, Windhoek, SWA; CDSM: Chief Directorate Surveys & Mapping, Mowbray, RSA"
   default_layer true
   background_colour "0 0 0"
   extension "jpeg"
-  default_layer true
   max_zoom 16
 end
+
+imagery_layer "na_aerial" do
+  site "namibia-topo.openstreetmap.org.za"
+  title "Namibia Aerial Demo"
+  projection "namibia_aerial"
+  source "/store/imagery/na/aerial/aerial.vrt"
+  copyright "State Copyright"
+  background_colour "0 0 0"
+  extension "jpeg"
+  max_zoom 21
+end