After review comments

Author: hansthen

folium/folium.py

@@ -210,10 +210,9 @@ class Map(JSCSSMixin, Evented):
                 }
             </style>
 
-
             <script>
-                L_NO_TOUCH = {{ this.no_touch |tojson}};
-                L_DISABLE_3D = {{ this.disable_3d|tojson }};
+                L_NO_TOUCH = {{ this.global_switches.no_touch |tojson}};
+                L_DISABLE_3D = {{ this.global_switches.disable_3d|tojson }};
             </script>
 
         {% endmacro %}
@@ -328,8 +327,7 @@ def __init__(
         else:
             self.zoom_control_position = False
 
-        self.no_touch = no_touch
-        self.disable_3d = disable_3d
+        self.global_switches = GlobalSwitches(no_touch, disable_3d)
 
         self.options = remove_empty(
             max_bounds=max_bounds_array,

tests/test_folium.py

@@ -98,8 +98,8 @@ def test_init(self):
         assert self.m.width == (900, "px")
         assert self.m.left == (0, "%")
         assert self.m.top == (0, "%")
-        assert self.m.no_touch is False
-        assert self.m.disable_3d is False
+        assert self.m.global_switches.no_touch is False
+        assert self.m.global_switches.disable_3d is False
         assert self.m.font_size == "1.5rem"
         assert self.m.to_dict() == {
             "name": "Map",
@@ -465,29 +465,29 @@ def test_global_switches(self):
         out = m._parent.render()
         out_str = "".join(out.split())
         assert '"preferCanvas":true' in out_str
-        assert not m.no_touch
-        assert not m.disable_3d
+        assert not m.global_switches.no_touch
+        assert not m.global_switches.disable_3d
 
         m = folium.Map(no_touch=True)
         out = m._parent.render()
         out_str = "".join(out.split())
         assert '"preferCanvas":false' in out_str
-        assert m.no_touch
-        assert not m.disable_3d
+        assert m.global_switches.no_touch
+        assert not m.global_switches.disable_3d
 
         m = folium.Map(disable_3d=True)
         out = m._parent.render()
         out_str = "".join(out.split())
         assert '"preferCanvas":false' in out_str
-        assert not m.no_touch
-        assert m.disable_3d
+        assert not m.global_switches.no_touch
+        assert m.global_switches.disable_3d
 
         m = folium.Map(prefer_canvas=True, no_touch=True, disable_3d=True)
         out = m._parent.render()
         out_str = "".join(out.split())
         assert '"preferCanvas":true' in out_str
-        assert m.no_touch
-        assert m.disable_3d
+        assert m.global_switches.no_touch
+        assert m.global_switches.disable_3d
 
     def test_json_request(self):
         """Test requests for remote GeoJSON files."""

tests/test_map.py

@@ -109,8 +109,7 @@ def test_popup_unicode():
 def test_popup_sticky():
     m = Map()
     popup = Popup("Some text.", sticky=True).add_to(m)
-    script = popup._template.module.__dict__.get("script", None)
-    rendered = script(this=popup, kwargs={})
+    rendered = popup._template.render(this=popup, kwargs={})
     expected = """
     var {popup_name} = L.popup({{
         "maxWidth": "100%",
@@ -132,8 +131,7 @@ def test_popup_sticky():
 def test_popup_show():
     m = Map()
     popup = Popup("Some text.", show=True).add_to(m)
-    script = popup._template.module.__dict__.get("script", None)
-    rendered = script(this=popup, kwargs={})
+    rendered = popup._template.render(this=popup, kwargs={})
     expected = """
     var {popup_name} = L.popup({{
         "maxWidth": "100%","autoClose": false,
@@ -153,8 +151,7 @@ def test_popup_show():
 def test_popup_backticks():
     m = Map()
     popup = Popup("back`tick`tick").add_to(m)
-    script = popup._template.module.__dict__.get("script", None)
-    rendered = script(this=popup, kwargs={})
+    rendered = popup._template.render(this=popup, kwargs={})
     expected = """
     var {popup_name} = L.popup({{
         "maxWidth": "100%",
@@ -173,8 +170,7 @@ def test_popup_backticks():
 def test_popup_backticks_already_escaped():
     m = Map()
     popup = Popup("back\\`tick").add_to(m)
-    script = popup._template.module.__dict__.get("script", None)
-    rendered = script(this=popup, kwargs={})
+    rendered = popup._template.render(this=popup, kwargs={})
     expected = """
     var {popup_name} = L.popup({{
         "maxWidth": "100%",