[GRASS-SVN] r57022 - grass/trunk/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: turek
Date: 2013-07-06 02:28:35 -0700 (Sat, 06 Jul 2013)
New Revision: 57022

Modified:
   grass/trunk/scripts/r.in.wms/wms_drv.py
Log:
r.in.wms: do not add bgcolor to request if it is not set

Modified: grass/trunk/scripts/r.in.wms/wms_drv.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_drv.py	2013-07-06 08:29:37 UTC (rev 57021)
+++ grass/trunk/scripts/r.in.wms/wms_drv.py	2013-07-06 09:28:35 UTC (rev 57022)
@@ -338,9 +338,13 @@
         self.srs_param = params['srs']
 
         proj = params['proj_name'] + "=" +  GetSRSParamVal(params['srs'])
-        self.url = params['url'] + ("SERVICE=WMS&REQUEST=GetMap&VERSION=%s&LAYERS=%s&WIDTH=%s&HEIGHT=%s&STYLES=%s&BGCOLOR=%s&TRANSPARENT=%s" % \
+        self.url = params['url'] + ("SERVICE=WMS&REQUEST=GetMap&VERSION=%s&LAYERS=%s&WIDTH=%s&HEIGHT=%s&STYLES=%s&TRANSPARENT=%s" % \
                   (params['wms_version'], params['layers'], tile_size['cols'], tile_size['rows'], params['styles'], \
-                   params['bgcolor'], params['transparent']))
+                   params['transparent']))
+
+        if params['bgcolor']:
+            self.url +=  "&BGCOLOR=" + params['bgcolor']
+
         self.url += "&" +proj+ "&" + "FORMAT=" + params['format']
 
         self.bbox = bbox