imagery: do not cache mapserver errors

[chef.git] / cookbooks / imagery / templates / default / mapserver.map.erb

diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb
index 29a83c27c7ab50b8a652cbb007f0ed083319c85e..fd30b07639eefbb4f8424b6434d1a5291bb9a286 100644 (file)
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -1,19 +1,50 @@
 # DO NOT EDIT - This file is being maintained by Chef
 MAP
 # DO NOT EDIT - This file is being maintained by Chef
 MAP

-  NAME "map-<%= @name %>"
+<% if @extension == "os_sv_png" -%>
+  OUTPUTFORMAT
+    NAME "os_sv_png"
+    DRIVER AGG/PNG
+    MIMETYPE "image/png"
+    IMAGEMODE RGB
+    EXTENSION "png"
+    FORMATOPTION "COMPRESSION=9"
+    FORMATOPTION "PALETTE_FORCE=on"
+    FORMATOPTION "PALETTE=/srv/imagery/common/ossv-palette.txt"
+  END
+<% end -%>
+<% if @extension == "os_sv_diff_png" -%>
+  OUTPUTFORMAT
+    NAME "os_sv_diff_png"
+    DRIVER AGG/PNG
+    MIMETYPE "image/png"
+    IMAGEMODE RGBA
+    EXTENSION "png"
+    FORMATOPTION "COMPRESSION=9"
+  END
+<% end -%>
+
+  NAME "map-<%= @layer %>"

   STATUS ON
   SIZE 256 256
   UNITS METERS
   STATUS ON
   SIZE 256 256
   UNITS METERS

+  <% if @background_colour -%>
+  IMAGECOLOR <%= @background_colour %>
+  <% end -%>

   IMAGETYPE <%= @extension %>
     PROJECTION
   IMAGETYPE <%= @extension %>
     PROJECTION

-    "init=<%= @projection %>"
+    "init=<%= @projection.downcase %>"

   END
 
   LAYER
   END
 
   LAYER

-    NAME "<%= @name %>"
+    NAME "<%= @layer %>"

     DATA "<%= @source %>"
     PROJECTION
     DATA "<%= @source %>"
     PROJECTION

-      "init=<%= @projection %>"
+    <% if @projection == "EPSG:27700" -%>
+      <%# Override EPSG:27700 to use accurate nadgrid %>
+      "+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +datum=OSGB36 +units=m +no_defs +nadgrids=/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb"
+    <% else -%>
+      "init=<%= @projection.downcase %>"
+    <% end -%>

     END
     STATUS       DEFAULT
     TYPE         RASTER
     END
     STATUS       DEFAULT
     TYPE         RASTER