Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java	(revision 29732)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java	(revision 29733)
@@ -14,4 +14,14 @@
 import javax.swing.filechooser.FileFilter;
 
+import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.coverage.grid.GridCoverageFactory;
+import org.geotools.coverage.grid.io.AbstractGridFormat;
+import org.geotools.gce.geotiff.GeoTiffFormat;
+import org.geotools.gce.geotiff.GeoTiffWriteParams;
+import org.geotools.gce.geotiff.GeoTiffWriter;
+import org.geotools.geometry.Envelope2D;
+import org.geotools.referencing.CRS;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.parameter.ParameterValueGroup;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -19,5 +29,5 @@
 public class MenuActionSaveRasterAs extends JosmAction {
 
-    public static String name = marktr("Save image as PNG");
+    public static String name = marktr("Save image as...");
     
     private static final long serialVersionUID = 1L;
@@ -33,16 +43,29 @@
             return file.getName().toLowerCase().endsWith(".png");
         }
-
         @Override
         public String getDescription() {
             return tr("PNG files (*.png)");
         }
-        
     }
-    
+
+    public class FiltreTiff extends FileFilter {
+        @Override
+        public boolean accept(File file) {
+            if (file.isDirectory()) { 
+                return true;
+            } 
+            return file.getName().toLowerCase().endsWith(".tif");
+        }
+        @Override
+        public String getDescription() {
+            return tr("GeoTiff files (*.tif)");
+        }
+    }
+
+    FiltreTiff filtreTiff = new FiltreTiff();
     FiltrePng filtrePng = new FiltrePng();
 
     public MenuActionSaveRasterAs(WMSLayer wmsLayer) {
-        super(tr(name), "save", tr("Export as PNG format (only raster images)"), null, false);
+        super(tr(name), "save", tr("Export image (only raster images)"), null, false);
         this.wmsLayer = wmsLayer;
     }
@@ -51,22 +74,59 @@
         File file;
         JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(filtrePng);
+        fc.addChoosableFileFilter(filtreTiff);
+        fc.addChoosableFileFilter(filtrePng);
+        fc.setFileFilter(filtreTiff);
         int returnVal = fc.showSaveDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             file = fc.getSelectedFile();
-            if (!file.getName().endsWith(".png"))
-                file = new File(file.getParent(), file.getName()+".png");
             BufferedImage bi = wmsLayer.getImage(0).image; 
-            try {
-                ImageIO.write(bi, "png", file);
+            if (fc.getFileFilter().equals(filtrePng))
+            {
+                if (!file.getName().endsWith(".png"))
+                    file = new File(file.getParent(), file.getName()+".png");
+                try {
+                    ImageIO.write(bi, "png", file);
 /*
-                FileOutputStream flux = new FileOutputStream(file);
-                BufferedOutputStream fluxBuf = new BufferedOutputStream(flux);
-                JPEGImageEncoder codec = JPEGCodec.createJPEGEncoder(fluxBuf, JPEGCodec.getDefaultJPEGEncodeParam(bi));
-                codec.encode(bi);
-                fluxBuf.close();
+                    FileOutputStream flux = new FileOutputStream(file);
+                    BufferedOutputStream fluxBuf = new BufferedOutputStream(flux);
+                    JPEGImageEncoder codec = JPEGCodec.createJPEGEncoder(fluxBuf, JPEGCodec.getDefaultJPEGEncodeParam(bi));
+                    codec.encode(bi);
+                    fluxBuf.close();
 */
-            } catch (IOException e) {
-                e.printStackTrace();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            else if (fc.getFileFilter().equals(filtreTiff))
+            {
+                boolean alpha = bi.getColorModel().hasAlpha();
+                System.out.println("image with alpha channel : " + alpha);
+                try {
+                    double x = wmsLayer.getImage(0).min.east();
+                    double y = wmsLayer.getImage(0).min.north();
+                    Envelope2D bbox = new Envelope2D(CRS.decode("EPSG:27561"), 
+                            x, y, 
+                            wmsLayer.getImage(0).max.east()-x, wmsLayer.getImage(0).max.north()-y);
+                    GridCoverageFactory factory = new GridCoverageFactory();
+                    GridCoverage2D coverage = factory.create("tiff", bi, bbox);
+                    final File output = new File(file.getParent(), file.getName()+".tif");
+                    GeoTiffWriter gtwriter = new GeoTiffWriter(output);
+                    GeoTiffWriteParams wp = new GeoTiffWriteParams();
+                    wp.setCompressionMode(GeoTiffWriteParams.MODE_EXPLICIT);
+                    wp.setCompressionType("LZW");
+                    wp.setCompressionQuality(0.75F);
+                    final GeoTiffFormat format = new GeoTiffFormat();
+                    final ParameterValueGroup params = format.getWriteParameters();
+                    params.parameter(
+                                    AbstractGridFormat.GEOTOOLS_WRITE_PARAMS.getName().toString())
+                                    .setValue(wp);
+
+                    gtwriter.write(coverage, (GeneralParameterValue[]) params.values().toArray(new GeneralParameterValue[1]));
+                    gtwriter.dispose();
+                    coverage.dispose(true); 
+                } catch (Exception e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                } 
             }
         }