wxGUI AddWSDialog RenderWMSMgr: fix render WMS jpeg source format (#640)

OSGeo · May 18, 2020 · a3e3624 · a3e3624
1 parent 2496652
commit a3e3624
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/gui/wxpython/core/ws.py b/gui/wxpython/core/ws.py
@@ -170,14 +170,21 @@ def OnRenderDone(self, event):
         self.mapMerger.AddRasterBands(self.tempMap, {1: 1, 2: 2, 3: 3})
         del self.mapMerger
 
+        add_alpha_channel = True
+        mask_fill_value = 0
+        if self.fetching_cmd[1]['format'] == 'jpeg':
+            mask_fill_value = 255 # white color, g.pnmcomp doesn't apply mask (alpha channel)
+            add_alpha_channel = False
+
         self.maskMerger = GDALRasterMerger(
             targetFile=self.layer.maskfile,
             region=self.renderedRegion,
             bandsNum=1,
             gdalDriver='PNM',
-            fillValue=0)
-        #{4 : 1} alpha channel (4) to first and only channel (1) in mask
-        self.maskMerger.AddRasterBands(self.tempMap, {4: 1})
+            fillValue=mask_fill_value)
+        if add_alpha_channel:
+            #{4 : 1} alpha channel (4) to first and only channel (1) in mask
+            self.maskMerger.AddRasterBands(self.tempMap, {4: 1})
         del self.maskMerger
 
         self.fetched_data_cmd = self.fetching_cmd