imagery: final melbourne mapserver compatibility fixes

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

diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb
index a0582354555511cea39a14b110e7e8915d7191cb..cda5e80d46abbf8b60515f47416663f9f3625792 100644 (file)
--- a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb
+++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "imagery::tiler"
+include_recipe "imagery"
 
 imagery_site "au-vic-melbourne-imagery.openstreetmap.org" do
   title "OpenStreetMap - City of Melbourne - Aerial Imagery"
@@ -25,36 +25,35 @@ imagery_site "au-vic-melbourne-imagery.openstreetmap.org" do
   # https://leafletjs.com/reference.html#latlngbounds format
   # [[south, west], [north, east]]
   bbox [[-37.850667, 144.896981], [-37.775451, 144.991351]]
-  uses_tiler true
 end
 
 imagery_layer "melbourne-2020" do
   site "au-vic-melbourne-imagery.openstreetmap.org"
-  uses_tiler true
-  title "AU City of Melbourne 2020"
-  source "file:///store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff"
+  title "City of Melbourne 2020"
+  source "/store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff"
   copyright "(c) 2020 City of Melbourne"
   max_zoom 23
-  extension "jpg"
+  extension "jpeg"
+  revision 2
   default_layer true
 end
 
 imagery_layer "melbourne-2019" do
   site "au-vic-melbourne-imagery.openstreetmap.org"
-  uses_tiler true
-  title "AU City of Melbourne 2019"
-  source "file:///store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff"
+  title "City of Melbourne 2019"
+  source "/store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff"
   copyright "(c) 2019 City of Melbourne"
   max_zoom 21
-  extension "jpg"
+  extension "jpeg"
+  revision 2
 end
 
 imagery_layer "melbourne-2018" do
   site "au-vic-melbourne-imagery.openstreetmap.org"
-  uses_tiler true
-  title "AU City of Melbourne 2018"
-  source "file:///store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff"
+  title "City of Melbourne 2018"
+  source "/store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff"
   copyright "(c) 2018 City of Melbourne"
   max_zoom 21
-  extension "jpg"
+  extension "jpeg"
+  revision 2
 end