Remove roles for fuchur, glaedr, gorwen, idris and lockheed

[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 718c0f85c346c6d97e94ddb7c6c00bf161e66d69..7426805beae34384775edfb8ba366519d81895be 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.
@@ -22,13 +22,28 @@ include_recipe "imagery"
 imagery_site "namibia-topo.openstreetmap.org.za" do
   title "OpenStreetMap - Namibia / South West Africa - Topographic Series"
   aliases ["namibia-topo.osm.org.za"]
-  bbox [[-35.12, 16.23], [-22.1, 33.18]]
+  bbox [[-29.0003741, 11.7330477], [-16.9508650, 25.4983245]]
 end
 
 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 "/data/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"
+  max_zoom 16
+end
+
+imagery_layer "na_aerial" do
+  site "namibia-topo.openstreetmap.org.za"
+  title "Namibia Aerial Demo"
+  projection "namibia_aerial"
+  source "/data/imagery/na/aerial/aerial.vrt"
+  copyright "State Copyright"
+  background_colour "0 0 0"
+  extension "jpeg"
+  max_zoom 21
 end