Skip to content

Fix bounds for multi-member and wrapped GeometryCollections #2281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jokrasno wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −12
Open

Fix bounds for multi-member and wrapped GeometryCollections #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions folium/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,19 +280,11 @@ def iter_coords(obj: Any) -> Iterator[tuple[float, ...]]:
if isinstance(obj, (tuple, list)):
coords = obj
elif "features" in obj:
coords = [
geom["geometry"]["coordinates"]
for geom in obj["features"]
if geom["geometry"]
]
coords = obj["features"]
elif "geometry" in obj:
coords = obj["geometry"]["coordinates"] if obj["geometry"] else []
elif (
"geometries" in obj
and obj["geometries"][0]
and "coordinates" in obj["geometries"][0]
):
coords = obj["geometries"][0]["coordinates"]
coords = [obj["geometry"]] if obj["geometry"] else []
elif "geometries" in obj:
coords = obj["geometries"]
else:
coords = obj.get("coordinates", obj)
for coord in coords:
Expand Down
35 changes: 35 additions & 0 deletions tests/test_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,41 @@ def test_geometry_collection_get_bounds():
assert folium.GeoJson(geojson_data).get_bounds() == [[0, -3], [4, 2]]


@pytest.mark.parametrize("container", ["geometry", "feature", "feature_collection"])
@pytest.mark.parametrize("collection", ["multiple", "nested", "empty"])
def test_geometry_collection_bounds_all_members(container, collection):
geometries = [
{"type": "Point", "coordinates": [2, 1]},
{"type": "LineString", "coordinates": [[-3, 4], [40, 30]]},
]
expected = [[1, -3], [30, 40]]
if collection == "nested":
geometries = [
{"type": "GeometryCollection", "geometries": []},
{"type": "GeometryCollection", "geometries": geometries},
]
elif collection == "empty":
geometries = []
expected = [[None, None], [None, None]]

data = {"type": "GeometryCollection", "geometries": geometries}
if container != "geometry":
data = {"type": "Feature", "properties": {}, "geometry": data}
if container == "feature_collection":
data = {
"type": "FeatureCollection",
"features": [
{"type": "Feature", "properties": {}, "geometry": None},
data,
],
}

m = folium.Map()
layer = folium.GeoJson(data).add_to(m)
assert layer.get_bounds() == expected
assert m.get_bounds() == expected


def test_choropleth_get_by_key():
geojson_data = {
"id": "0",
Expand Down