Add leading ? to SECTION line in shorewall rules

[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 24889789751e6a971d29d4fcebc4af3a676e2922..b32f7f6e6e44a2a45cde3caec5199faab6be6f07 100644 (file)
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -1,19 +1,40 @@
 # 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 -%>
+
+  NAME "map-<%= @layer %>"
   STATUS ON
   SIZE 256 256
   UNITS METERS
+  <% if @background_colour -%>
+  IMAGECOLOR <%= @background_colour %>
+  <% end -%>
   IMAGETYPE <%= @extension %>
     PROJECTION
     "init=<%= @projection.downcase %>"
   END
 
   LAYER
-    NAME "<%= @name %>"
+    NAME "<%= @layer %>"
     DATA "<%= @source %>"
     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