Replace run_command and output_of_command with shell_out!

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

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 8209c0d2804a675f940f510cdf51079eff0bab4a..ae1fdf4b872146edebe0061e36cdc834774fe59a 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: imagery
-# Recipe:: gb-hampshire-aerial
+# Recipe:: gb_hampshire_aerial
 #
 # Copyright 2016, OpenStreetMap Foundation
 #
@@ -20,19 +20,28 @@
 include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
-  imagery_layer "gb_hampshire_aerial-rgb" do
-    site new_resource.name
-    text "Hampshire Aerial - Summer 2013"
-    source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
-    projection "EPSG:27700"
-    copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
-  end
+  title "OpenStreetMap - Hampshire Hub Aerial"
+  bbox [[50.68993, -1.97823], [51.39492, -0.70724]]
+end
+
+imagery_layer "gb_hampshire_aerial_rgb" do
+  site "hampshire.aerial.openstreetmap.org.uk"
+  root_layer true
+  default_layer true
+  title "Hampshire Aerial - Summer 2013"
+  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
+  max_zoom 20
+  projection "EPSG:27700"
+  copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
+  url_aliases ["/hampshire-rgb"]
+end
 
-  imagery_layer "gb_hampshire_aerial_fcir" do
-    site new_resource.name
-    text "Hampshire Aerial - Summer 2013 (FCIR)"
-    source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
-    projection "EPSG:27700"
-    copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
-  end
+imagery_layer "gb_hampshire_aerial_fcir" do
+  site "hampshire.aerial.openstreetmap.org.uk"
+  title "Hampshire Aerial - Summer 2013 (False Colour IR)"
+  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
+  max_zoom 20
+  projection "EPSG:27700"
+  copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
+  url_aliases ["/hampshire-fcir"]
 end