Skip to content

WmsTileLayer: allow cql_filter parameter #1673

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
Conengmo merged 3 commits into from
Nov 29, 2022
Merged

WmsTileLayer: allow cql_filter parameter #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
171e5b4
WmsTileLayer: allow cql_filter parameter
Conengmo Nov 29, 2022
b9dba8d
add test
Conengmo Nov 29, 2022
57e91db
avoid function argument
Conengmo Nov 29, 2022
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
4 changes: 4 additions & 0 deletions folium/raster_layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ def __init__(
super().__init__(name=name, overlay=overlay, control=control, show=show)
self.url = url
kwargs["format"] = fmt
cql_filter = kwargs.pop("cql_filter", None)
self.options = parse_options(
layers=layers,
styles=styles,
Expand All @@ -222,6 +223,9 @@ def __init__(
attribution=attr,
**kwargs
)
if cql_filter:
# special parameter that shouldn't be camelized
self.options["cql_filter"] = cql_filter
Comment on lines +226 to +228
Copy link
Copy Markdown
Member

@ocefpaf ocefpaf Nov 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we pop it from the kw args to avoid adding an extra arg entry? Not sure if this is best but maybe something like:

cql_filter = kwargs.pop("cql_filter", None)
if cql_filter:
    # special parameter that shouldn't be camelized
    self.options["cql_filter"] = cql_filter



class ImageOverlay(Layer):
Expand Down
7 changes: 6 additions & 1 deletion tests/test_raster_layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,14 @@ def test_wms():
layers="nexrad-n0r-900913",
attr="Weather data © 2012 IEM Nexrad",
transparent=True,
cql_filter="something",
)
w.add_to(m)
m._repr_html_()
html = m.get_root().render()

# verify this special case wasn't converted to lowerCamelCase
assert '"cql_filter": "something",' in html
assert "cqlFilter" not in html

bounds = m.get_bounds()
assert bounds == [[None, None], [None, None]], bounds
Expand Down