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

[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 d6734a4202cdac5aeaaf0ceca842a60015ed8cd4..c2a9d276af0112a06b4ca8122e0350c2334e63f2 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -1,14 +1,14 @@
 #
 #

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

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


@@ -20,15 +20,17 @@
 include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
 include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do

-  # aliases
-  git_repository "https://github.com/Firefishy/osm-imagery-hampshire-aerial-site.git"
+  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
 end
 
 imagery_layer "gb_hampshire_aerial_rgb" do
   site "hampshire.aerial.openstreetmap.org.uk"
   root_layer true

-  text "Hampshire Aerial - Summer 2013"
-  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
+  default_layer true
+  title "Hampshire Aerial - Summer 2013"
+  source "/store/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"]
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-rgb"]


@@ -36,8 +38,9 @@ end
 
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
 
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"

-  text "Hampshire Aerial - Summer 2013 (False Colour IR)"
-  source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
+  title "Hampshire Aerial - Summer 2013 (False Colour IR)"
+  source "/store/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"]
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-fcir"]