WIP undo changes

Author: hansthen

folium/folium.py

@@ -7,7 +7,7 @@
 import webbrowser
 from typing import Any, List, Optional, Sequence, Union
 
-from branca.element import Figure
+from branca.element import Element, Figure
 
 from folium.elements import JSCSSMixin
 from folium.map import Evented, FitBounds, Layer
@@ -62,6 +62,23 @@
 ]
 
 
+class GlobalSwitches(Element):
+    _template = Template(
+        """
+        <script>
+            L_NO_TOUCH = {{ this.no_touch |tojson}};
+            L_DISABLE_3D = {{ this.disable_3d|tojson }};
+        </script>
+    """
+    )
+
+    def __init__(self, no_touch=False, disable_3d=False):
+        super().__init__()
+        self._name = "GlobalSwitches"
+        self.no_touch = no_touch
+        self.disable_3d = disable_3d
+
+
 class Map(JSCSSMixin, Evented):
     """Create a Map with Folium and Leaflet.js
 

folium/map.py

@@ -7,7 +7,7 @@
 from collections import OrderedDict
 from typing import TYPE_CHECKING, Optional, Sequence, Union, cast
 
-from branca.element import Element, Html, MacroElement
+from branca.element import Element, Figure, Html, MacroElement
 
 from folium.elements import ElementAddToElement, EventHandler
 from folium.template import Template
@@ -454,27 +454,25 @@ class Popup(MacroElement):
 
     _template = Template(
         """
-        {% macro script(this, kwargs) %}
-            var {{this.get_name()}} = L.popup({{ this.options|tojavascript }});
-
-            {% for name, element in this.html._children.items() %}
-                {% if this.lazy %}
-                    {{ this._parent.get_name() }}.once('click', function() {
-                        {{ this.get_name() }}.setContent($(`{{ element.render(**kwargs).replace('\\n',' ') }}`)[0]);
-                    });
-                {% else %}
-                    var {{ name }} = $(`{{ element.render(**kwargs).replace('\\n',' ') }}`)[0];
-                    {{ this.get_name() }}.setContent({{ name }});
-                {% endif %}
-            {% endfor %}
-
-            {{ this._parent.get_name() }}.bindPopup({{ this.get_name() }})
-            {% if this.show %}.openPopup(){% endif %};
-
-            {% for name, element in this.script._children.items() %}
-                {{element.render()}}
-            {% endfor %}
-        {% endmacro %}
+        var {{this.get_name()}} = L.popup({{ this.options|tojavascript }});
+
+        {% for name, element in this.html._children.items() %}
+            {% if this.lazy %}
+                {{ this._parent.get_name() }}.once('click', function() {
+                    {{ this.get_name() }}.setContent($(`{{ element.render(**kwargs).replace('\\n',' ') }}`)[0]);
+                });
+            {% else %}
+                var {{ name }} = $(`{{ element.render(**kwargs).replace('\\n',' ') }}`)[0];
+                {{ this.get_name() }}.setContent({{ name }});
+            {% endif %}
+        {% endfor %}
+
+        {{ this._parent.get_name() }}.bindPopup({{ this.get_name() }})
+        {% if this.show %}.openPopup(){% endif %};
+
+        {% for name, element in this.script._children.items() %}
+            {{element.render()}}
+        {% endfor %}
     """
     )  # noqa
 
@@ -515,6 +513,21 @@ def __init__(
             **kwargs,
         )
 
+    def render(self, **kwargs):
+        """Renders the HTML representation of the element."""
+        for name, child in self._children.items():
+            child.render(**kwargs)
+
+        figure = self.get_root()
+        assert isinstance(
+            figure, Figure
+        ), "You cannot render this Element if it is not in a Figure."
+
+        figure.script.add_child(
+            Element(self._template.render(this=self, kwargs=kwargs)),
+            name=self.get_name(),
+        )
+
 
 class Tooltip(MacroElement):
     """

folium/plugins/search.py

@@ -122,9 +122,10 @@ def __init__(
         self.placeholder = placeholder
         self.collapsed = collapsed
         self.options = remove_empty(**kwargs)
-        self.test_params()
 
-    def test_params(self):
+    def render(self, **kwargs):
+        super().render(**kwargs)
+
         if isinstance(self.layer, GeoJson):
             keys = tuple(self.layer.data["features"][0]["properties"].keys())
         elif isinstance(self.layer, TopoJson):