Skip to content

Fix icon when passing Marker to GeoJson #2086

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 4 commits into from
Feb 27, 2025
Merged

Fix icon when passing Marker to GeoJson #2086

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20bafc3
fix geojson marker icon
Conengmo Jan 24, 2025
4d06b52
mypy
Conengmo Jan 24, 2025
89d1a0b
ruff
Conengmo Jan 24, 2025
df180b3
After review comments
hansthen Feb 26, 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: 5 additions & 5 deletions folium/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,11 @@ def __init__(
self.options = remove_empty(
draggable=draggable or None, autoPan=draggable or None, **kwargs
)
# this attribute is not used by Marker, but by GeoJson
self.icon = None
if icon is not None:
self.add_child(icon)
self.icon = icon
if popup is not None:
self.add_child(popup if isinstance(popup, Popup) else Popup(str(popup)))
if tooltip is not None:
Expand All @@ -421,15 +424,12 @@ def _get_self_bounds(self) -> TypeBoundsReturn:
return cast(TypeBoundsReturn, [self.location, self.location])

def render(self):
from .features import CustomIcon, DivIcon

if self.location is None:
raise ValueError(
f"{self._name} location must be assigned when added directly to map."
)
for child in list(self._children.values()):
if isinstance(child, (Icon, CustomIcon, DivIcon)):
self.add_child(self.SetIcon(marker=self, icon=child))
if self.icon:
self.add_child(self.SetIcon(marker=self, icon=self.icon))
super().render()


Expand Down
Loading