Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[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 fd30b07639eefbb4f8424b6434d1a5291bb9a286..1f918d0f8f8023a75a5e163b1a1dc4cff5476c3a 100644 (file)
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -7,7 +7,7 @@ MAP
     MIMETYPE "image/png"
     IMAGEMODE RGB
     EXTENSION "png"
     MIMETYPE "image/png"
     IMAGEMODE RGB
     EXTENSION "png"

-    FORMATOPTION "COMPRESSION=9"
+    FORMATOPTION "COMPRESSION=6"

     FORMATOPTION "PALETTE_FORCE=on"
     FORMATOPTION "PALETTE=/srv/imagery/common/ossv-palette.txt"
   END
     FORMATOPTION "PALETTE_FORCE=on"
     FORMATOPTION "PALETTE=/srv/imagery/common/ossv-palette.txt"
   END


@@ -19,7 +19,19 @@ MAP
     MIMETYPE "image/png"
     IMAGEMODE RGBA
     EXTENSION "png"
     MIMETYPE "image/png"
     IMAGEMODE RGBA
     EXTENSION "png"

-    FORMATOPTION "COMPRESSION=9"
+    FORMATOPTION "COMPRESSION=6"
+  END
+<% end -%>
+<% if @extension == "os_om_local_png" -%>
+  OUTPUTFORMAT
+    NAME "os_om_local_png"
+    DRIVER AGG/PNG
+    MIMETYPE "image/png"
+    IMAGEMODE RGB
+    EXTENSION "png"
+    FORMATOPTION "COMPRESSION=6"
+    FORMATOPTION "PALETTE_FORCE=on"
+    FORMATOPTION "PALETTE=/srv/imagery/common/os-openmap-local-palette.txt"

   END
 <% end -%>
 
   END
 <% end -%>
 


@@ -32,7 +44,14 @@ MAP
   <% end -%>
   IMAGETYPE <%= @extension %>
     PROJECTION
   <% end -%>
   IMAGETYPE <%= @extension %>
     PROJECTION

-    "init=<%= @projection.downcase %>"
+    <% 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"
+    <% elsif @projection == "namibia_aerial" -%>
+      "+proj=tmerc +lat_0=0 +lon_0=17 +k=1 +x_0=600000 +y_0=10000000 +ellps=WGS84 +units=m +no_defs"
+    <% else -%>
+      "init=<%= @projection.downcase %>"
+    <% end -%>

   END
 
   LAYER
   END
 
   LAYER


@@ -42,13 +61,15 @@ MAP
     <% 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"
     <% 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"

+    <% elsif @projection == "namibia_aerial" -%>
+      "+proj=tmerc +lat_0=0 +lon_0=17 +k=1 +x_0=600000 +y_0=10000000 +ellps=WGS84 +units=m +no_defs"

     <% else -%>
       "init=<%= @projection.downcase %>"
     <% end -%>
     END
     STATUS       DEFAULT
     TYPE         RASTER
     <% else -%>
       "init=<%= @projection.downcase %>"
     <% end -%>
     END
     STATUS       DEFAULT
     TYPE         RASTER

-    PROCESSING "RESAMPLE=AVERAGE"
-    PROCESSING "CLOSE_CONNECTION=DEFER"
+    PROCESSING   "RESAMPLE=AVERAGE"
+    PROCESSING   "CLOSE_CONNECTION=DEFER"

   END # layer
 END
   END # layer
 END