Pārlūkot izejas kodu

r.in.wms: use urlparams also in getcapabilities request

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56520 15284696-431f-4ddb-bdfa-cd5b030d7da7
Štěpán Turek 12 gadi atpakaļ
vecāks
revīzija
5782a4bfba
1 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  1. 6 1
      scripts/r.in.wms/wms_base.py

+ 6 - 1
scripts/r.in.wms/wms_base.py

@@ -193,7 +193,7 @@ class WMSBase:
     def _fetchCapabilities(self, options): 
         """!Download capabilities from WMS server
         """
-        cap_url = options['url']
+        cap_url = options['url'].strip()
 
         if "?" in cap_url:
             cap_url += "&"
@@ -206,7 +206,12 @@ class WMSBase:
             cap_url += "REQUEST=GetTileService"
         else:
             cap_url += "SERVICE=WMS&REQUEST=GetCapabilities&VERSION=" + options['wms_version'] 
+
+        if options['urlparams']:
+            cap_url += "&" + options['urlparams']
+            
         grass.debug('Fetching capabilities file.\n%s' % cap_url)
+
         try:
             cap = self._fetchDataFromServer(cap_url, options['username'], options['password'])
         except (IOError, HTTPException), e: