From baaf05ac90695417376411064e6093421095b9be Mon Sep 17 00:00:00 2001 From: "k.clasen" Date: Wed, 9 Dec 2020 21:02:17 +0100 Subject: [PATCH 1/2] Update GeoJson doc-string --- folium/features.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/folium/features.py b/folium/features.py index 8e9f0bdbc0..f660d10b83 100644 --- a/folium/features.py +++ b/folium/features.py @@ -324,6 +324,9 @@ class GeoJson(Layer): * If dict, then data will be converted to JSON and embedded in the JavaScript. * If str, then data will be passed to the JavaScript as-is. + * If `__geo_interface__` is available, the `__geo_interface__` + dictionary will be serialized to JSON and + reprojected if `to_crs` is available. style_function: function, default None Function mapping a GeoJson Feature to a style dict. highlight_function: function, default None From a7a4186993fb50b25f00e3d14a3a0605bd07a7da Mon Sep 17 00:00:00 2001 From: "k.clasen" Date: Wed, 9 Dec 2020 21:07:30 +0100 Subject: [PATCH 2/2] Remove trailing whitespaces --- folium/features.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/folium/features.py b/folium/features.py index f660d10b83..383ac21bef 100644 --- a/folium/features.py +++ b/folium/features.py @@ -324,8 +324,8 @@ class GeoJson(Layer): * If dict, then data will be converted to JSON and embedded in the JavaScript. * If str, then data will be passed to the JavaScript as-is. - * If `__geo_interface__` is available, the `__geo_interface__` - dictionary will be serialized to JSON and + * If `__geo_interface__` is available, the `__geo_interface__` + dictionary will be serialized to JSON and reprojected if `to_crs` is available. style_function: function, default None Function mapping a GeoJson Feature to a style dict.