Fix some cookstyle warnings

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

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 3474c4cdaec265d84da7cd877d6e6635e8e44db5..e2eaec353cf4c2767aea57d85f49ac718f4ebf86 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: imagery
-# Recipe:: au-agri
+# Cookbook:: imagery
+# Recipe:: au_agri

 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,13 +20,20 @@
 include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
 include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do

-  # aliases ["agri.openstreetmap.org.au"]
+  title "OpenStreetMap - The Australian Geographic Reference Image"
+  aliases ["agri.osm.org"]
+  bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
+end

 
 

-  imagery_layer "au_ga_agri" do
-    site new_resource.name
-    text "AGRI: The Australian Geographic Reference Image"
-    copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
-    projection "EPSG:3857"
-    source "/data/imagery/au/agri/combine.vrt"
-  end
+imagery_layer "au_ga_agri" do
+  site "agri.openstreetmap.org"
+  root_layer true
+  default_layer true
+  title "AGRI: The Australian Geographic Reference Image"
+  copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
+  background_colour "0 0 0" # Black
+  projection "EPSG:3857"
+  source "/data/imagery/au/agri/combine.vrt"
+  max_zoom 17
+  revision 1

 end
 end