fix: assert expected columns are present even on empty output

GIScience · Aug 1, 2024 · d3e77be · d3e77be
1 parent 92e0e9c
commit d3e77be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ohsome/response.py b/ohsome/response.py
@@ -87,7 +87,15 @@ def _as_geodataframe(
         """
 
         if len(self.data["features"]) == 0:
-            return gpd.GeoDataFrame(crs="epsg:4326", columns=["@osmId", "geometry"])
+            return gpd.GeoDataFrame(
+                crs="epsg:4326",
+                columns=["@osmId", "geometry"]
+                + (
+                    list(explode_tags) + ["@other_tags"]
+                    if explode_tags is not None
+                    else []
+                ),
+            )
 
         try:
             if explode_tags is not None:

diff --git a/ohsome/test/test_response.py b/ohsome/test/test_response.py
@@ -409,7 +409,7 @@ def test_empty_geodataframe(base_client):
 
     assert isinstance(result, gpd.GeoDataFrame)
     assert result.empty
-    assert result.columns == ["@osmId", "geometry", "@other_tags"]
+    assert result.columns.to_list() == ["@osmId", "geometry", "@other_tags"]
 
 
 @pytest.mark.vcr