From f157f3f08cf8ae773ef5509602c05f7d5f0f2e4e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 2 May 2025 12:18:37 +0100 Subject: [PATCH] imagery: actually add mapserver jpeg_png definition and bump na_sgswa_topo version --- cookbooks/imagery/recipes/na_sgswa_topo.rb | 2 +- cookbooks/imagery/templates/default/mapserver.map.erb | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cookbooks/imagery/recipes/na_sgswa_topo.rb b/cookbooks/imagery/recipes/na_sgswa_topo.rb index 2a067c0d3..e113e7c59 100644 --- a/cookbooks/imagery/recipes/na_sgswa_topo.rb +++ b/cookbooks/imagery/recipes/na_sgswa_topo.rb @@ -34,8 +34,8 @@ imagery_layer "na_sgswa_topo_50k" do default_layer true # background_colour "0 0 0" extension "jpeg_png" - max_zoom 16 + revision 2 end imagery_layer "na_aerial" do diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb index 728723fcc..8403f5cb5 100644 --- a/cookbooks/imagery/templates/default/mapserver.map.erb +++ b/cookbooks/imagery/templates/default/mapserver.map.erb @@ -34,7 +34,16 @@ MAP FORMATOPTION "PALETTE=/srv/imagery/common/os-openmap-local-palette.txt" END <% end -%> - +<% if @extension == "jpeg_png" -%> + OUTPUTFORMAT + NAME "jpeg_png" + MIMETYPE "image/vnd.jpeg-png" + DRIVER AGG/MIXED + IMAGEMODE RGBA + FORMATOPTION "TRANSPARENT_FORMAT=png" + FORMATOPTION "OPAQUE_FORMAT=jpeg" + END +<% end -%> NAME "map-<%= @layer %>" STATUS ON SIZE 256 256 -- 2.39.5