From fc944d076325e31156991269292b94c4e485043d Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:47:50 +0100
Subject: [PATCH 1/3] remove null values from options

---
 folium/template.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/folium/template.py b/folium/template.py
index 4dcd01f0b5..451650dbac 100644
--- a/folium/template.py
+++ b/folium/template.py
@@ -15,6 +15,8 @@ def tojavascript(obj: Union[str, JsCode, dict, list, Element]) -> str:
     elif isinstance(obj, dict):
         out = ["{\n"]
         for key, value in obj.items():
+            if value is None:
+                continue
             out.append(f'  "{camelize(key)}": ')
             out.append(tojavascript(value))
             out.append(",\n")

From d5856ddae5eaac0232c5c4b50d9c99123175d0c6 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:59:22 +0100
Subject: [PATCH 2/3] revert

---
 folium/template.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/folium/template.py b/folium/template.py
index 451650dbac..4dcd01f0b5 100644
--- a/folium/template.py
+++ b/folium/template.py
@@ -15,8 +15,6 @@ def tojavascript(obj: Union[str, JsCode, dict, list, Element]) -> str:
     elif isinstance(obj, dict):
         out = ["{\n"]
         for key, value in obj.items():
-            if value is None:
-                continue
             out.append(f'  "{camelize(key)}": ')
             out.append(tojavascript(value))
             out.append(",\n")

From e04bd39e94d7cb41a703985085d60cbcfe31aed1 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:59:36 +0100
Subject: [PATCH 3/3] max_native_zoom int value

---
 folium/raster_layers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/folium/raster_layers.py b/folium/raster_layers.py
index b4eec8ab92..6bfed69e4d 100644
--- a/folium/raster_layers.py
+++ b/folium/raster_layers.py
@@ -122,7 +122,6 @@ def __init__(
             attr = attr if attr else tiles.html_attribution  # type: ignore
             min_zoom = min_zoom or tiles.get("min_zoom")
             max_zoom = max_zoom or tiles.get("max_zoom")
-            max_native_zoom = max_native_zoom or tiles.get("max_zoom")
             subdomains = tiles.get("subdomains", subdomains)
             if name is None:
                 name = tiles.name.replace(".", "").lower()
@@ -143,7 +142,7 @@ def __init__(
         self.options = dict(
             min_zoom=min_zoom or 0,
             max_zoom=max_zoom or 18,
-            max_native_zoom=max_native_zoom,
+            max_native_zoom=max_native_zoom or max_zoom or 18,
             no_wrap=no_wrap,
             attribution=attr,
             subdomains=subdomains,