Remove empty values from the options. (#2049)

* Remove empty values from the options.

* Fix tests

* Updated after review comments

* Update folium/plugins/semicircle.py

---------

Co-authored-by: Frank Anema <[email protected]>

Author: hansthen

Diff for: folium/features.py

@@ -31,6 +31,7 @@
     javascript_identifier_path_to_array_notation,
     none_max,
     none_min,
+    remove_empty,
     validate_locations,
 )
 from folium.vector_layers import Circle, CircleMarker, PolyLine, path_options
@@ -688,7 +689,7 @@ def __init__(
         self.popup_keep_highlighted = popup_keep_highlighted
 
         self.marker = marker
-        self.options = kwargs
+        self.options = remove_empty(**kwargs)
 
         self.data = self.process_data(data)
 
@@ -1715,7 +1716,7 @@ def __init__(
     ):
         super().__init__()
         self._name = "DivIcon"
-        self.options = dict(
+        self.options = remove_empty(
             html=html,
             icon_size=icon_size,
             icon_anchor=icon_anchor,
@@ -1894,7 +1895,7 @@ def __init__(
     ):
         super(Icon, self).__init__()
         self._name = "CustomIcon"
-        self.options = dict(
+        self.options = remove_empty(
             icon_url=image_to_url(icon_image),
             icon_size=icon_size,
             icon_anchor=icon_anchor,

Diff for: folium/folium.py

@@ -18,6 +18,7 @@
     TypeJsonValue,
     _parse_size,
     parse_font_size,
+    remove_empty,
     temp_html_filepath,
     validate_location,
 )
@@ -303,7 +304,7 @@ def __init__(
         else:
             self.zoom_control_position = False
 
-        self.options = dict(
+        self.options = remove_empty(
             max_bounds=max_bounds_array,
             zoom=zoom_start,
             zoom_control=False if self.zoom_control_position else zoom_control,

Diff for: folium/map.py

@@ -17,6 +17,7 @@
     TypeJsonValue,
     escape_backticks,
     parse_options,
+    remove_empty,
     validate_location,
 )
 
@@ -131,7 +132,7 @@ def __init__(
         super().__init__(name=name, overlay=overlay, control=control, show=show)
         self._name = "FeatureGroup"
         self.tile_name = name if name is not None else self.get_name()
-        self.options = kwargs
+        self.options = remove_empty(**kwargs)
 
 
 class LayerControl(MacroElement):
@@ -206,7 +207,7 @@ def __init__(
     ):
         super().__init__()
         self._name = "LayerControl"
-        self.options = dict(
+        self.options = remove_empty(
             position=position, collapsed=collapsed, autoZIndex=autoZIndex, **kwargs
         )
         self.draggable = draggable
@@ -312,7 +313,7 @@ def __init__(
                 f"color argument of Icon should be one of: {self.color_options}.",
                 stacklevel=2,
             )
-        self.options = dict(
+        self.options = remove_empty(
             marker_color=color,
             icon_color=icon_color,
             icon=icon,
@@ -379,7 +380,7 @@ def __init__(
         super().__init__()
         self._name = "Marker"
         self.location = validate_location(location) if location is not None else None
-        self.options = dict(
+        self.options = remove_empty(
             draggable=draggable or None, autoPan=draggable or None, **kwargs
         )
         if icon is not None:
@@ -481,7 +482,7 @@ def __init__(
 
         self.show = show
         self.lazy = lazy
-        self.options = dict(
+        self.options = remove_empty(
             max_width=max_width,
             autoClose=False if show or sticky else None,
             closeOnClick=False if sticky else None,
@@ -550,7 +551,7 @@ def __init__(
         self.text = str(text)
 
         kwargs.update({"sticky": sticky})
-        self.options = kwargs
+        self.options = remove_empty(**kwargs)
 
         if style:
             assert isinstance(
@@ -659,7 +660,7 @@ def __init__(
         self._name = "FitOverlays"
         self.method = "flyToBounds" if fly else "fitBounds"
         self.fit_on_map_load = fit_on_map_load
-        self.options = dict(padding=(padding, padding), max_zoom=max_zoom)
+        self.options = remove_empty(padding=(padding, padding), max_zoom=max_zoom)
 
 
 class CustomPane(MacroElement):

Diff for: folium/plugins/beautify_icon.py

@@ -2,6 +2,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class BeautifyIcon(JSCSSMixin, MacroElement):
@@ -99,7 +100,7 @@ def __init__(
         super().__init__()
         self._name = "BeautifyIcon"
 
-        self.options = dict(
+        self.options = remove_empty(
             icon=icon,
             icon_shape=icon_shape,
             border_width=border_width,

Diff for: folium/plugins/boat_marker.py

@@ -1,6 +1,7 @@
 from folium.elements import JSCSSMixin
 from folium.map import Marker
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class BoatMarker(JSCSSMixin, Marker):
@@ -65,4 +66,4 @@ def __init__(
         self.heading = heading
         self.wind_heading = wind_heading
         self.wind_speed = wind_speed
-        self.options = dict(**kwargs)
+        self.options = remove_empty(**kwargs)

Diff for: folium/plugins/fullscreen.py

@@ -2,6 +2,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class Fullscreen(JSCSSMixin, MacroElement):
@@ -59,7 +60,7 @@ def __init__(
     ):
         super().__init__()
         self._name = "Fullscreen"
-        self.options = dict(
+        self.options = remove_empty(
             position=position,
             title=title,
             title_cancel=title_cancel,

Diff for: folium/plugins/geocoder.py

@@ -4,6 +4,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class Geocoder(JSCSSMixin, MacroElement):
@@ -81,7 +82,7 @@ def __init__(
     ):
         super().__init__()
         self._name = "Geocoder"
-        self.options = dict(
+        self.options = remove_empty(
             collapsed=collapsed,
             position=position,
             default_mark_geocode=add_marker,

Diff for: folium/plugins/groupedlayercontrol.py

@@ -2,6 +2,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class GroupedLayerControl(JSCSSMixin, MacroElement):
@@ -68,7 +69,7 @@ class GroupedLayerControl(JSCSSMixin, MacroElement):
     def __init__(self, groups, exclusive_groups=True, **kwargs):
         super().__init__()
         self._name = "GroupedLayerControl"
-        self.options = dict(**kwargs)
+        self.options = remove_empty(**kwargs)
         if exclusive_groups:
             self.options["exclusiveGroups"] = list(groups.keys())
         self.layers_untoggle = set()

Diff for: folium/plugins/heat_map.py

@@ -9,6 +9,7 @@
     if_pandas_df_convert_to_numpy,
     none_max,
     none_min,
+    remove_empty,
     validate_location,
 )
 
@@ -89,7 +90,7 @@ def __init__(
                 "The largest intensity is calculated automatically.",
                 stacklevel=2,
             )
-        self.options = dict(
+        self.options = remove_empty(
             min_opacity=min_opacity,
             max_zoom=max_zoom,
             radius=radius,

Diff for: folium/plugins/locate_control.py

@@ -7,6 +7,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class LocateControl(JSCSSMixin, MacroElement):
@@ -73,4 +74,4 @@ def __init__(self, auto_start=False, **kwargs):
         super().__init__()
         self._name = "LocateControl"
         self.auto_start = auto_start
-        self.options = dict(**kwargs)
+        self.options = remove_empty(**kwargs)

Diff for: folium/plugins/marker_cluster.py

@@ -1,7 +1,7 @@
 from folium.elements import JSCSSMixin
 from folium.map import Layer, Marker
 from folium.template import Template
-from folium.utilities import validate_locations
+from folium.utilities import remove_empty, validate_locations
 
 
 class MarkerCluster(JSCSSMixin, Layer):
@@ -102,7 +102,7 @@ def __init__(
                     )
                 )
 
-        self.options = dict(**kwargs)
+        self.options = remove_empty(**kwargs)
         if icon_create_function is not None:
             assert isinstance(icon_create_function, str)
         self.icon_create_function = icon_create_function

Diff for: folium/plugins/measure_control.py

@@ -2,6 +2,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class MeasureControl(JSCSSMixin, MacroElement):
@@ -72,7 +73,7 @@ def __init__(
         super().__init__()
         self._name = "MeasureControl"
 
-        self.options = dict(
+        self.options = remove_empty(
             position=position,
             primary_length_unit=primary_length_unit,
             secondary_length_unit=secondary_length_unit,

Diff for: folium/plugins/minimap.py

@@ -3,6 +3,7 @@
 from folium.elements import JSCSSMixin
 from folium.raster_layers import TileLayer
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class MiniMap(JSCSSMixin, MacroElement):
@@ -114,7 +115,7 @@ def __init__(
         else:
             self.tile_layer = TileLayer(tile_layer)
 
-        self.options = dict(
+        self.options = remove_empty(
             position=position,
             width=width,
             height=height,

Diff for: folium/plugins/mouse_position.py

@@ -2,6 +2,7 @@
 
 from folium.elements import JSCSSMixin
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class MousePosition(JSCSSMixin, MacroElement):
@@ -87,7 +88,7 @@ def __init__(
         super().__init__()
         self._name = "MousePosition"
 
-        self.options = dict(
+        self.options = remove_empty(
             position=position,
             separator=separator,
             empty_string=empty_string,

Diff for: folium/plugins/pattern.py

@@ -3,7 +3,7 @@
 from folium.elements import JSCSSMixin
 from folium.folium import Map
 from folium.template import Template
-from folium.utilities import get_obj_in_upper_tree
+from folium.utilities import get_obj_in_upper_tree, remove_empty
 
 
 class StripePattern(JSCSSMixin, MacroElement):
@@ -59,7 +59,7 @@ def __init__(
     ):
         super().__init__()
         self._name = "StripePattern"
-        self.options = dict(
+        self.options = remove_empty(
             angle=angle,
             weight=weight,
             space_weight=space_weight,

Diff for: folium/plugins/polyline_text_path.py

@@ -1,6 +1,7 @@
 from folium.elements import JSCSSMixin
 from folium.features import MacroElement
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class PolyLineTextPath(JSCSSMixin, MacroElement):
@@ -67,7 +68,7 @@ def __init__(
         self._name = "PolyLineTextPath"
         self.polyline = polyline
         self.text = text
-        self.options = dict(
+        self.options = remove_empty(
             repeat=repeat,
             center=center,
             below=below,

Diff for: folium/plugins/realtime.py

@@ -4,7 +4,7 @@
 from folium.features import GeoJson
 from folium.map import FeatureGroup
 from folium.template import Template
-from folium.utilities import JsCode
+from folium.utilities import JsCode, remove_empty
 
 
 class Realtime(JSCSSMixin, FeatureGroup):
@@ -115,4 +115,4 @@ def __init__(
         kwargs["remove_missing"] = remove_missing
         kwargs["container"] = container
 
-        self.options = kwargs
+        self.options = remove_empty(**kwargs)

Diff for: folium/plugins/search.py

@@ -5,6 +5,7 @@
 from folium.features import FeatureGroup, GeoJson, TopoJson
 from folium.plugins import MarkerCluster
 from folium.template import Template
+from folium.utilities import remove_empty
 
 
 class Search(JSCSSMixin, MacroElement):
@@ -121,7 +122,7 @@ def __init__(
         self.position = position
         self.placeholder = placeholder
         self.collapsed = collapsed
-        self.options = dict(**kwargs)
+        self.options = remove_empty(**kwargs)
 
     def test_params(self, keys):
         if keys is not None and self.search_label is not None:

Diff for: folium/plugins/semicircle.py

@@ -1,6 +1,7 @@
 from folium.elements import JSCSSMixin
 from folium.map import Marker
 from folium.template import Template
+from folium.utilities import remove_empty
 from folium.vector_layers import path_options
 
 
@@ -80,6 +81,7 @@ def __init__(
                 stop_angle=stop_angle,
             )
         )
+        self.options = remove_empty(**self.options)
 
         if not (
             (direction is None and arc is None)