[GRASS-SVN] r51383 - grass-addons/grass7/raster/r.in.wms2
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Apr 11 18:20:02 EDT 2012
Author: turek
Date: 2012-04-11 15:20:01 -0700 (Wed, 11 Apr 2012)
New Revision: 51383
Modified:
grass-addons/grass7/raster/r.in.wms2/r.in.wms2.py
grass-addons/grass7/raster/r.in.wms2/wms_base.py
Log:
r.in.wms2, wms_base: flag -t changed to flag -o, currently transparent is on by default. Changes made for continuity with r.in.wms
Modified: grass-addons/grass7/raster/r.in.wms2/r.in.wms2.py
===================================================================
--- grass-addons/grass7/raster/r.in.wms2/r.in.wms2.py 2012-04-11 19:17:31 UTC (rev 51382)
+++ grass-addons/grass7/raster/r.in.wms2/r.in.wms2.py 2012-04-11 22:20:01 UTC (rev 51383)
@@ -118,8 +118,8 @@
#%end
#%flag
-#% key: t
-#% description: Transparent background
+#% key: o
+#% description: Don't request transparent data
#% guisection: Map style
#%end
Modified: grass-addons/grass7/raster/r.in.wms2/wms_base.py
===================================================================
--- grass-addons/grass7/raster/r.in.wms2/wms_base.py 2012-04-11 19:17:31 UTC (rev 51382)
+++ grass-addons/grass7/raster/r.in.wms2/wms_base.py 2012-04-11 22:20:01 UTC (rev 51383)
@@ -65,10 +65,10 @@
# inicialization of module parameters (options, flags)
self.flags = flags
- if self.flags['t']:
- self.transparent = 'TRUE'
+ if self.flags['o']:
+ self.transparent = 'FALSE'
else:
- self.transparent = 'FALSE'
+ self.transparent = 'TRUE'
self.o_mapserver_url = options['mapserver'].strip() + "?"
self.o_layers = options['layers'].strip()
@@ -99,12 +99,12 @@
self.mime_format = "image/png"
elif self.o_format == "jpeg":
self.mime_format = "image/jpeg"
- if flags['t']:
+ if flags['o']:
grass.warning(_("JPEG format does not support transparency"))
elif self.o_format == "gif":
self.mime_format = "image/gif"
else:
- grass.fatal(_("Unsupported image format %s") % self.o_format)
+ self.mime_format = self.o_format
self.o_srs = int(options['srs'])
if self.o_srs <= 0:
More information about the grass-commit
mailing list