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

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

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 65451dc08fbfbb563dd6066578ae0fbe337937a1..c3c871231d3ab6b74f2a50cfa39642d6240ab831 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -1,14 +1,14 @@
 #
 #

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

 # Recipe:: gb_surrey_aerial
 #
 # Recipe:: gb_surrey_aerial
 #

-# 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,16 +21,17 @@ include_recipe "imagery"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Surrey Air Survey - 2009"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Surrey Air Survey - 2009"

-  aliases ["a.surrey.aerial.openstreetmap.org.uk", "b.surrey.aerial.openstreetmap.org.uk", "c.surrey.aerial.openstreetmap.org.uk"]

   bbox [[51.06686, -0.85762], [51.47753, 0.06592]]
 end
 
 imagery_layer "gb_surrey_aerial" do
   site "surrey.aerial.openstreetmap.org.uk"
   root_layer true
   bbox [[51.06686, -0.85762], [51.47753, 0.06592]]
 end
 
 imagery_layer "gb_surrey_aerial" do
   site "surrey.aerial.openstreetmap.org.uk"
   root_layer true

+  default_layer true

   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"

-  text "Surrey Air Survey - 2008/2009"
+  max_zoom 21
+  title "Surrey Air Survey - 2008/2009"

   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
 end
   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
 end