Fix php requires and reapply nominatim role to dulcy

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

diff --git a/cookbooks/imagery/recipes/za_coct_aerial.rb b/cookbooks/imagery/recipes/za_coct_aerial.rb
index 0291dd1a74bf120f844c87dc2529706db778b1c6..48ca76de7ef4e27eec401c7ee4ce01cd709f724d 100644 (file)
--- a/cookbooks/imagery/recipes/za_coct_aerial.rb
+++ b/cookbooks/imagery/recipes/za_coct_aerial.rb
@@ -22,24 +22,17 @@ include_recipe "imagery"
 imagery_site "coct.aerial.openstreetmap.org.za" do
   title "OpenStreetMap - City of Cape Town Aerial"
   aliases ["coct.aerial.osm.org.za"]
 imagery_site "coct.aerial.openstreetmap.org.za" do
   title "OpenStreetMap - City of Cape Town Aerial"
   aliases ["coct.aerial.osm.org.za"]

-  bbox [[-35.12, 16.23], [-22.1, 33.18]]
+  bbox [[-34.365, 18.290], [-33.465, 19.015]]

 end
 
 imagery_layer "za_coct_aerial_2015" do
   projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
   title "City of Cape Town Aerial - 2015 (OSM USE ONLY)"
 end
 
 imagery_layer "za_coct_aerial_2015" do
   projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
   title "City of Cape Town Aerial - 2015 (OSM USE ONLY)"

-  source "/data/imagery/za/coct/2015-tif-epsg-3857.vrt"
+  source "/data/imagery/za/coct/2015-epsg-3857.tif"

   copyright 'Copyright &copy; 2015 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
   copyright 'Copyright &copy; 2015 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'

+  background_colour "0 0 0"
+  extension "jpeg"

   default_layer true
   max_zoom 21
 end
   default_layer true
   max_zoom 21
 end

-
-imagery_layer "za_coct_aerial_2013" do
-  projection "EPSG:3857"
-  site "coct.aerial.openstreetmap.org.za"
-  title "City of Cape Town Aerial - 2013 (OSM USE ONLY)"
-  source "/data/imagery/za/coct/2013-tif-epsg-3857.vrt"
-  copyright 'Copyright &copy; 2013 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
-  max_zoom 21
-end