Skip to content

Managing WebMapService constructor parameters when available #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 12, 2025
Merged

Managing WebMapService constructor parameters when available #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7365592
Update __init__.py
Kurea May 15, 2024
aef38ba
Merge remote-tracking branch 'upstream/develop' into develop
molinav Jun 12, 2025
1cc971b
Apply basic linting corrections to Basemap.wmsimage additions
molinav Jun 12, 2025
4fab297
Fix incorrect v iterator variable
molinav Jun 12, 2025
eabea54
Update CHANGELOG
molinav Jun 12, 2025
074835c
Revert order of items in wms_keys
molinav Jun 12, 2025
bc243d9
Update Basemap.wmsimage docstring
molinav Jun 12, 2025
c1ee9ac
Merge remote-tracking branch 'upstream/develop' into develop
molinav Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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]:
Expand Down
7 changes: 6 additions & 1 deletion packages/basemap/src/mpl_toolkits/basemap/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
============== ====================================================

Expand Down Expand Up @@ -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))
Expand Down