Minor changes to support image/png; mode=24bit

git-svn-id: http://geowebcache.org/svn/trunk@463 e7b91dd5-889a-44ae-8e97-0abfc27e49b2
GeoWebCache · Dec 9, 2008 · 322eaec · 322eaec
1 parent b9045ab
commit 322eaec
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java b/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java
@@ -112,6 +112,20 @@ public class WMSLayer extends TileLayer {
 
     private static transient Log log;
 
+    /** 
+     * Note XStream uses reflection, this is only used for testing
+     * and loading from getCapabilities
+     * 
+     * @param layerName
+     * @param cacheFactory
+     * @param wmsURL
+     * @param wmsStyles
+     * @param wmsLayers
+     * @param mimeFormats
+     * @param grids
+     * @param metaWidthHeight
+     * @param vendorParams
+     */
     public WMSLayer(String layerName, CacheFactory cacheFactory,
             String[] wmsURL, String wmsStyles, String wmsLayers, 
             List<String> mimeFormats, Hashtable<SRS,Grid> grids, 

diff --git a/geowebcache/src/main/java/org/geowebcache/mime/ImageMime.java b/geowebcache/src/main/java/org/geowebcache/mime/ImageMime.java
@@ -41,7 +41,9 @@ public class ImageMime extends MimeType {
 
     public static final ImageMime png24 = 
         new ImageMime("image/png", "png24", "png", "image/png24", true);
-
+
+    public static final ImageMime png_24 = 
+        new ImageMime("image/png; mode=24bit", "png_24", "png", "image/png; mode=24bit", true);
 
     public ImageMime(String mimeType, String fileExtension, 
             String internalName, String format, boolean noop) {
@@ -54,7 +56,7 @@ public ImageMime(String mimeType, String fileExtension, String internalName, Str
 
         // Check for trouble
         if(mimeType.length() < 6 || ! mimeType.substring(0,6).equalsIgnoreCase("image/")) {
-            throw new MimeException("MIME type " + mimeType + " does not start with application/");
+            throw new MimeException("MIME type " + mimeType + " does not start with image/");
         }
     }
 
@@ -74,6 +76,8 @@ protected static ImageMime checkForFormat(String formatStr)
             return png8;
         } else if ( tmpStr.equalsIgnoreCase("png24")) {
             return png24;
+        } else if ( tmpStr.equalsIgnoreCase("png; mode=24bit")) {
+            return png_24;
         }
         return null;
     }
@@ -103,6 +107,8 @@ protected static ImageMime checkForExtension(String fileExtension)
             return png8;
         } else if (fileExtension.equalsIgnoreCase("png24")) {
             return png24;
+        } else if (fileExtension.equalsIgnoreCase("png_24")) {
+            return png_24;
         }
         return null;
     }

diff --git a/geowebcache/src/main/java/org/geowebcache/mime/MimeType.java b/geowebcache/src/main/java/org/geowebcache/mime/MimeType.java
@@ -86,12 +86,12 @@ public static MimeType createFromFormat(String formatStr) throws MimeException {
             throw new MimeException("formatStr was not set");
         }
 
-        if(formatStr.contains(";")) {
+        // TODO Making a special exception, generalize later
+        if(! formatStr.equals("image/png; mode=24bit") && formatStr.contains(";")) {
             if(log.isDebugEnabled()) {
                 log.debug("Slicing off "+ formatStr.split(";")[1]);
             }
             formatStr = formatStr.split(";")[0];
-
         }
 
         if (formatStr.length() > 6