Merge remote-tracking branch 'github/pull/715'

[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 921cbe2d2ae63081ffd4507913cb3ff5ca136b28..931ecf3f1b31b005b7d7bba6a549ed4e66c42f7d 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: imagery
+# Cookbook:: imagery

 # Recipe:: au_agri
 #
 # 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,


@@ -21,17 +21,19 @@ include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
   title "OpenStreetMap - The Australian Geographic Reference Image"
 
 imagery_site "agri.openstreetmap.org" do
   title "OpenStreetMap - The Australian Geographic Reference Image"

-  # aliases [ "agri.openstreetmap.org.au" ]
+  aliases ["agri.osm.org"]

   bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
 end
 
 imagery_layer "au_ga_agri" do
   site "agri.openstreetmap.org"
   root_layer true
   bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
 end
 
 imagery_layer "au_ga_agri" do
   site "agri.openstreetmap.org"
   root_layer true

-  text "AGRI: The Australian Geographic Reference Image"
+  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"
   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"
+  source "/store/imagery/au/agri/combine.vrt"
+  max_zoom 17

   revision 1
 end
   revision 1
 end