Skip to content

Commit b70fe5b

Browse files
add new parameters to geodataframe
1 parent 31446a6 commit b70fe5b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

overturemaps/core.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919

2020
# Allows for optional import of additional dependencies
2121
try:
22-
import geopandas as gpd
2322
from geopandas import GeoDataFrame
2423

2524
HAS_GEOPANDAS = True
2625
except ImportError:
2726
HAS_GEOPANDAS = False
28-
GeoDataFrame = None
2927

3028

3129
def _get_files_from_stac(theme: str, overture_type: str, bbox: tuple, release: str) -> Optional[List[str]]:
@@ -121,9 +119,11 @@ def record_batch_reader(
121119

122120
def geodataframe(
123121
overture_type: str,
124-
bbox: (float, float, float, float) = None,
122+
bbox: tuple[float, float, float, float] = None,
123+
release: str = None,
125124
connect_timeout: int = None,
126125
request_timeout: int = None,
126+
stac: bool = False
127127
) -> GeoDataFrame:
128128
"""
129129
Loads geoparquet for specified type into a geopandas dataframe
@@ -146,10 +146,12 @@ def geodataframe(
146146
reader = record_batch_reader(
147147
overture_type,
148148
bbox=bbox,
149+
release=release,
149150
connect_timeout=connect_timeout,
150-
request_timeout=request_timeout
151+
request_timeout=request_timeout,
152+
stac=stac
151153
)
152-
return gpd.GeoDataFrame.from_arrow(reader)
154+
return GeoDataFrame.from_arrow(reader)
153155

154156

155157
def geoarrow_schema_adapter(schema: pa.Schema) -> pa.Schema:

0 commit comments

Comments
 (0)