Skip to content

Make DivIcon and CustomIcon work with the new Marker approach#2119

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
ocefpaf merged 2 commits into from
Apr 22, 2025
Merged

Make DivIcon and CustomIcon work with the new Marker approach #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6852dfe
make DivIcon and CustomIcon work with the new Marker approach
Conengmo Mar 21, 2025
a53a7b7
Fixed typing
hansthen Apr 13, 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
2 changes: 0 additions & 2 deletions folium/features.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1718,7 +1718,6 @@ class DivIcon(MacroElement):
"""
{% macro script(this, kwargs) %}
var {{ this.get_name() }} = L.divIcon({{ this.options|tojavascript }});
{{this._parent.get_name()}}.setIcon({{this.get_name()}});
{% endmacro %}
"""
) # noqa
Expand DownExpand Up@@ -1895,7 +1894,6 @@ class CustomIcon(Icon):
"""
{% macro script(this, kwargs) %}
var {{ this.get_name() }} = L.icon({{ this.options|tojavascript }});
{{ this._parent.get_name() }}.setIcon({{ this.get_name() }});
{% endmacro %}
"""
) # noqa
Expand Down
4 changes: 3 additions & 1 deletion folium/map.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -382,7 +382,9 @@ class SetIcon(MacroElement):
"""
)

def __init__(self, marker: "Marker", icon: "Icon"):
def __init__(
self, marker: "Marker", icon: Union[Icon, "CustomIcon", "DivIcon"]
):
super().__init__()
self._name = "SetIcon"
self.marker = marker
Expand Down