Merge remote-tracking branch 'upstream/main' into documentation-project

Author: Conengmo

.github/workflows/deploy-docs.yml

@@ -23,7 +23,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_code.yml

@@ -22,7 +22,6 @@ jobs:
           python=${{ matrix.python-version }}
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_code_notebooks.yml

@@ -17,7 +17,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_latest_branca.yml

@@ -17,7 +17,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_mypy.yml

@@ -17,7 +17,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_selenium.yml

@@ -17,7 +17,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

.github/workflows/test_style_notebooks.yml

@@ -17,7 +17,6 @@ jobs:
           python=3
           --file requirements.txt
           --file requirements-dev.txt
-        cache-environment: true
 
     - name: Install folium from source
       shell: bash -l {0}

folium/features.py

@@ -498,6 +498,8 @@ class GeoJson(Layer):
         embedding is only supported if you provide a file link or URL.
     zoom_on_click: bool, default False
         Set to True to enable zooming in on a geometry when clicking on it.
+    **kwargs
+        Keyword arguments are passed to the geoJson object as extra options.
 
     Examples
     --------
@@ -602,8 +604,11 @@ class GeoJson(Layer):
                 style: {{ this.get_name() }}_styler,
             {%- endif %}
             {%- if this.marker %}
-                pointToLayer: {{ this.get_name() }}_pointToLayer
+                pointToLayer: {{ this.get_name() }}_pointToLayer,
             {%- endif %}
+            {%- for key, value in this.options.items() %}
+                {{ key }}: {{ value|tojson }},
+            {%- endfor %}
         });
 
         function {{ this.get_name() }}_add (data) {
@@ -636,6 +641,7 @@ def __init__(
         popup: Optional["GeoJsonPopup"] = None,
         zoom_on_click: bool = False,
         marker: Union[Circle, CircleMarker, Marker, None] = None,
+        **kwargs: TypeJsonValue,
     ):
         super().__init__(name=name, overlay=overlay, control=control, show=show)
         self._name = "GeoJson"
@@ -653,6 +659,7 @@ def __init__(
                     "Only Marker, Circle, and CircleMarker are supported as GeoJson marker types."
                 )
         self.marker = marker
+        self.options = parse_options(**kwargs)
 
         self.data = self.process_data(data)
 

folium/plugins/tag_filter_button.py

@@ -7,9 +7,12 @@
 
 class TagFilterButton(JSCSSMixin, MacroElement):
     """
-    Creates a Tag Filter Button to filter markers based on criteria
+    Creates a Tag Filter Button to filter elements based on criteria
     (https://github.com/maydemirx/leaflet-tag-filter-button)
 
+    This plugin works for multiple element types like Marker, GeoJson
+    and vector layers like PolyLine.
+
     Parameters
     ----------
     data: list, of strings.

folium/vector_layers.py

@@ -99,6 +99,9 @@ def path_options(
     if gradient is not None:
         extra_options.update({"gradient": gradient})
 
+    if kwargs.get("tags"):
+        extra_options["tags"] = kwargs.pop("tags")
+
     default = {
         "stroke": kwargs.pop("stroke", True),
         "color": color,