Revert "Disable login with facebook"

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

diff --git a/cookbooks/imagery/recipes/gb_ea.rb b/cookbooks/imagery/recipes/gb_ea.rb
index 95ab8ff3f0a965106c17d7327dbfe6ec622b8249..b1570c9de1b813364ff3c6f9dfd6968ef15aa601 100644 (file)
--- a/cookbooks/imagery/recipes/gb_ea.rb
+++ b/cookbooks/imagery/recipes/gb_ea.rb
@@ -1,14 +1,14 @@
 #
 #

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

 # Recipe:: gb_ea
 #
 # Recipe:: gb_ea
 #

-# 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,


@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "imagery"
+

 imagery_site "ea.openstreetmap.org.uk" do
   title "OpenStreetMap - Environment Agency OpenData"
   bbox [[51.35, -2.2], [52.65, 0.10]]
 imagery_site "ea.openstreetmap.org.uk" do
   title "OpenStreetMap - Environment Agency OpenData"
   bbox [[51.35, -2.2], [52.65, 0.10]]


@@ -28,7 +30,7 @@ imagery_layer "gb_ea_night" do
   default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/ea/night/ea-night-test.vrt"
   default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/ea/night/ea-night-test.vrt"

-  max_zoom 19
+  max_zoom 20

   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
 end
   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
 end


@@ -36,10 +38,9 @@ end
 imagery_layer "gb_ea_ortho_2015" do
   site "ea.openstreetmap.org.uk"
   title "Environment Agency - Ortho - 2015"
 imagery_layer "gb_ea_ortho_2015" do
   site "ea.openstreetmap.org.uk"
   title "Environment Agency - Ortho - 2015"

-  default_layer true

   projection "EPSG:27700"
   source "/data/imagery/gb/ea/ortho/ea-ortho-2015-combined.vrt"
   projection "EPSG:27700"
   source "/data/imagery/gb/ea/ortho/ea-ortho-2015-combined.vrt"

-  max_zoom 19
+  max_zoom 20

   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
 end
   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
 end