Merge pull request #603 from Kurea/develop

Managing WebMapService constructor parameters when available

Author: molinav

CHANGELOG.md

@@ -15,8 +15,10 @@ https://semver.org/spec/v2.0.0.html
 ### Added
 - Python 3.13 support (PR [#619], solves issue [#608]).
 - NumPy 2.0 support (PR [#614] by @cvanelteren, solves issue [#604]).
-- Automated wheels for x86_64 and arm64 (PR [#620] by @cvanelteren,
-  solves issue [#608]).
+- Automated MacOS wheels for x86_64 and arm64 (PR [#620] by
+  @cvanelteren, solves issue [#608]).
+- Support in `Basemap.wmsimage` to redirect `WebMapService` constructor
+  parameters when available (PR [#603] by @Kurea, solves issue [#602]).
 
 ### Changed
 - **BREAKING CHANGE**: Set Python minimum supported version to 3.9.
@@ -1181,6 +1183,10 @@ https://github.com/matplotlib/basemap/pull/614
 https://github.com/matplotlib/basemap/issues/608
 [#604]:
 https://github.com/matplotlib/basemap/issues/604
+[#603]:
+https://github.com/matplotlib/basemap/pull/603
+[#602]:
+https://github.com/matplotlib/basemap/issues/602
 [#599]:
 https://github.com/matplotlib/basemap/issues/599
 [#598]:

packages/basemap/src/mpl_toolkits/basemap/__init__.py

@@ -4413,6 +4413,7 @@ def wmsimage(self,server,\
         verbose          if True, print WMS server info (default
                          False).
         \**kwargs        extra keyword arguments passed on to
+                         OWSLib.wms.WebMapService and
                          OWSLib.wms.WebMapService.getmap.
         ==============   ====================================================
 
@@ -4452,7 +4453,11 @@ def wmsimage(self,server,\
         if ypixels is None:
             ypixels = int(self.aspect*xpixels)
         if verbose: print(server)
-        wms = WebMapService(server)
+        wms_keys = ["version", "xml", "username", "password",
+                    "parse_remote_metadata", "timeout", "headers", "auth"]
+        wms_options = {k: kwargs[k] for k in wms_keys if k in kwargs}
+        kwargs = {k: kwargs[k] for k in kwargs if k not in wms_keys}
+        wms = WebMapService(server, **wms_options)
         if verbose:
             print('id: %s, version: %s' %
             (wms.identification.type,wms.identification.version))