From d9dd4d6ac4085781b06e15ab7a77ddbe466efe8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:45:22 +0100 Subject: [PATCH 1/2] docs: Update switcher.json for v0.19.0 (#2042) Co-authored-by: Conengmo <33519926+Conengmo@users.noreply.github.com> --- docs/_static/switcher.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/_static/switcher.json b/docs/_static/switcher.json index 5fd5727976..4571c4fc90 100644 --- a/docs/_static/switcher.json +++ b/docs/_static/switcher.json @@ -4,10 +4,14 @@ "url": "https://python-visualization.github.io/folium/dev/" }, { - "name": "latest (0.18.0)", - "version": "0.18.0", + "name": "latest (0.19.0)", + "version": "0.19.0", "url": "https://python-visualization.github.io/folium/latest/" }, + { + "version": "0.18.0", + "url": "https://python-visualization.github.io/folium/v0.18.0/" + }, { "version": "0.17.0", "url": "https://python-visualization.github.io/folium/v0.17.0/" From e299ec2783954020852fe261c09ec260e7fbe58f Mon Sep 17 00:00:00 2001 From: Frank Anema <33519926+Conengmo@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:41:59 +0100 Subject: [PATCH 2/2] TileLayer: max_native_zoom cannot be null (#2044) * remove null values from options * revert * 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,