Skip to content
2 changes: 1 addition & 1 deletion folium/elements.py
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd prefer to rename these methods, since they really do something different than branca.Element.render. See the discussion I started on the signature redefinition.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I do not understand all the typing issues fully, but in general it looks good. I don't mind going ahead with this as is to fix the immediate issues. We can discuss my proposal to rename render from MacroElement and its children at a later moment. Whatever you think is best for now.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class JSCSSMixin(Element):
default_js: List[Tuple[str, str]] = []
default_css: List[Tuple[str, str]] = []

def render(self, **kwargs) -> None:
def render(self, **kwargs):
figure = self.get_root()
assert isinstance(
figure, Figure
Expand Down
12 changes: 6 additions & 6 deletions folium/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def __init__(
self.top = _parse_size(top)
self.position = position

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
super().render(**kwargs)

Expand Down Expand Up @@ -284,7 +284,7 @@ def __init__(
self.top = _parse_size(top)
self.position = position

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
self._parent.html.add_child(
Element(
Expand Down Expand Up @@ -820,7 +820,7 @@ def _get_self_bounds(self) -> List[List[Optional[float]]]:
"""
return get_bounds(self.data, lonlat=True)

def render(self, **kwargs) -> None:
def render(self, **kwargs):
self.parent_map = get_obj_in_upper_tree(self, Map)
# Need at least one feature, otherwise style mapping fails
if (self.style or self.highlight) and self.data["features"]:
Expand Down Expand Up @@ -1041,7 +1041,7 @@ def recursive_get(data, keys):
self.style_function(feature)
) # noqa

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
self.style_data()
super().render(**kwargs)
Expand Down Expand Up @@ -1160,7 +1160,7 @@ def warn_for_geometry_collections(self) -> None:
UserWarning,
)

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
figure = self.get_root()
if isinstance(self._parent, GeoJson):
Expand Down Expand Up @@ -1657,7 +1657,7 @@ def _get_by_key(cls, obj: Union[dict, list], key: str) -> Union[float, str, None
else:
return value

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Render the GeoJson/TopoJson and color scale objects."""
if self.color_scale:
# ColorMap needs Map as its parent
Expand Down
2 changes: 1 addition & 1 deletion folium/folium.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def _repr_png_(self) -> Optional[bytes]:
return None
return self._to_png()

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
figure = self.get_root()
assert isinstance(
Expand Down
6 changes: 3 additions & 3 deletions folium/map.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def reset(self) -> None:
self.base_layers = OrderedDict()
self.overlays = OrderedDict()

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
self.reset()
for item in self._parent._children.values():
Expand Down Expand Up @@ -404,7 +404,7 @@ def _get_self_bounds(self) -> List[List[float]]:
assert self.location is not None
return [self.location, self.location]

def render(self) -> None:
def render(self):
if self.location is None:
raise ValueError(
f"{self._name} location must be assigned when added directly to map."
Expand Down Expand Up @@ -492,7 +492,7 @@ def __init__(
**kwargs,
)

def render(self, **kwargs) -> None:
def render(self, **kwargs):
"""Renders the HTML representation of the element."""
for name, child in self._children.items():
child.render(**kwargs)
Expand Down
2 changes: 1 addition & 1 deletion folium/raster_layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def __init__(

self.url = image_to_url(image, origin=origin, colormap=colormap)

def render(self, **kwargs) -> None:
def render(self, **kwargs):
super().render()

figure = self.get_root()
Expand Down