Skip to content

Commit 47a3fba

Browse files
[geopandas] Update to 1.2.0 (#16632)
1 parent f5a0468 commit 47a3fba

7 files changed

Lines changed: 72 additions & 29 deletions

File tree

‎stubs/geopandas/METADATA.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "1.1.4"
1+
version = "1.2.0"
22
upstream-repository = "https://github.com/geopandas/geopandas"
33
# Requires a version of numpy with a `py.typed` file
44
dependencies = ["numpy>=1.20", "pandas-stubs", "types-shapely", "pyproj"]

‎stubs/geopandas/geopandas/_config.pyi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ class Options:
1616
def __getattr__(self, key: str) -> Any: ...
1717

1818
display_precision: Option
19-
use_pygeos: Option
2019
io_engine: Option
2120
options: Options

‎stubs/geopandas/geopandas/array.pyi‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,17 @@ class GeometryArray(ExtensionArray):
170170
def geom_equals_exact(self, other: _ArrayOrGeom, tolerance: float | ArrayLike) -> _Array1D[np.bool_]: ...
171171
def geom_equals_identical(self, other: _ArrayOrGeom) -> _Array1D[np.bool_]: ...
172172
def clip_by_rect(self, xmin: float, ymin: float, xmax: float, ymax: float) -> GeometryArray: ...
173-
def difference(self, other: _ArrayOrGeom) -> GeometryArray: ...
174-
def intersection(self, other: _ArrayOrGeom) -> GeometryArray: ...
175-
def symmetric_difference(self, other: _ArrayOrGeom) -> GeometryArray: ...
176-
def union(self, other: _ArrayOrGeom) -> GeometryArray: ...
173+
def difference(self, other: _ArrayOrGeom, grid_size: float | None = None) -> GeometryArray: ...
174+
def intersection(self, other: _ArrayOrGeom, grid_size: float | None = None) -> GeometryArray: ...
175+
def symmetric_difference(self, other: _ArrayOrGeom, grid_size: float | None = None) -> GeometryArray: ...
176+
def union(self, other: _ArrayOrGeom, grid_size: float | None = None) -> GeometryArray: ...
177177
def shortest_line(self, other: _ArrayOrGeom) -> GeometryArray: ...
178178
def snap(self, other: _ArrayOrGeom, tolerance: float | ArrayLike) -> GeometryArray: ...
179179
def shared_paths(self, other: _ArrayOrGeom) -> GeometryArray: ...
180180
def distance(self, other: _ArrayOrGeom) -> _Array1D[np.float64]: ...
181181
def hausdorff_distance(self, other: _ArrayOrGeom, **kwargs) -> _Array1D[np.float64]: ...
182182
def frechet_distance(self, other: _ArrayOrGeom, **kwargs) -> _Array1D[np.float64]: ...
183-
def buffer(self, distance: float | ArrayLike, resolution: int = 16, **kwargs) -> GeometryArray: ...
183+
def buffer(self, distance: float | ArrayLike, quad_segs: int | None = None, **kwargs) -> GeometryArray: ...
184184
def interpolate(self, distance: float | ArrayLike, normalized: bool = False) -> GeometryArray: ... # type: ignore[override]
185185
def simplify(self, tolerance: float | ArrayLike, preserve_topology: bool = True) -> GeometryArray: ...
186186
def simplify_coverage(self, tolerance: float | ArrayLike, simplify_boundary: bool = True) -> GeometryArray: ...
@@ -247,6 +247,8 @@ class GeometryArray(ExtensionArray):
247247
def shift(self, periods: int = 1, fill_value: Geometry | None = None) -> GeometryArray: ... # type: ignore[override]
248248
def argmin(self, skipna: bool = True) -> Never: ...
249249
def argmax(self, skipna: bool = True) -> Never: ...
250+
def all(self, *, skipna: bool = True) -> bool: ...
251+
def any(self, *, skipna: bool = True) -> bool: ...
250252
def __array__(self, dtype: DTypeLike | None = None, copy: bool | None = None) -> _Array1D[np.object_]: ...
251253
def __eq__(self, other: object) -> _Array1D[np.bool_]: ... # type: ignore[override]
252254
def __ne__(self, other: object) -> _Array1D[np.bool_]: ... # type: ignore[override]

‎stubs/geopandas/geopandas/base.pyi‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,14 @@ class GeoPandasBase:
165165
def frechet_distance(
166166
self, other: GeoSeries | Geometry, align: bool | None = None, densify: float | ArrayLike | None = None
167167
) -> pd.Series[float]: ...
168-
def difference(self, other: GeoSeries | Geometry, align: bool | None = None) -> GeoSeries: ...
169-
def symmetric_difference(self, other: GeoSeries | Geometry, align: bool | None = None) -> GeoSeries: ...
170-
def union(self, other: GeoSeries | Geometry, align: bool | None = None) -> GeoSeries: ...
171-
def intersection(self, other: GeoSeries | Geometry, align: bool | None = None) -> GeoSeries: ...
168+
def difference(self, other: GeoSeries | Geometry, align: bool | None = None, grid_size: float | None = None) -> GeoSeries: ...
169+
def symmetric_difference(
170+
self, other: GeoSeries | Geometry, align: bool | None = None, grid_size: float | None = None
171+
) -> GeoSeries: ...
172+
def union(self, other: GeoSeries | Geometry, align: bool | None = None, grid_size: float | None = None) -> GeoSeries: ...
173+
def intersection(
174+
self, other: GeoSeries | Geometry, align: bool | None = None, grid_size: float | None = None
175+
) -> GeoSeries: ...
172176
def clip_by_rect(self, xmin: float, ymin: float, xmax: float, ymax: float) -> GeoSeries: ...
173177
def shortest_line(self, other: GeoSeries | Geometry, align: bool | None = None) -> GeoSeries: ...
174178
def snap(self, other: GeoSeries | Geometry, tolerance: float | ArrayLike, align: bool | None = None) -> GeoSeries: ...
@@ -181,16 +185,32 @@ class GeoPandasBase:
181185
def sindex(self) -> SpatialIndex: ...
182186
@property
183187
def has_sindex(self) -> bool: ...
188+
189+
@overload
190+
def buffer(
191+
self,
192+
distance: float | ArrayLike,
193+
quad_segs: int | None = None,
194+
cap_style: Literal["round", "square", "flat"] = "round",
195+
join_style: Literal["round", "mitre", "bevel"] = "round",
196+
mitre_limit: float = 5.0,
197+
single_sided: bool = False,
198+
**kwargs,
199+
) -> GeoSeries: ...
200+
@overload
201+
@deprecated("The `resolution` argument to `buffer` is deprecated, use `quad_segs` instead.")
184202
def buffer(
185203
self,
186204
distance: float | ArrayLike,
187-
resolution: int = 16,
205+
*,
206+
resolution: int,
188207
cap_style: Literal["round", "square", "flat"] = "round",
189208
join_style: Literal["round", "mitre", "bevel"] = "round",
190209
mitre_limit: float = 5.0,
191210
single_sided: bool = False,
192211
**kwargs,
193212
) -> GeoSeries: ...
213+
194214
def simplify(self, tolerance: float | ArrayLike, preserve_topology: bool = True) -> GeoSeries: ...
195215
def simplify_coverage(self, tolerance: float | ArrayLike, *, simplify_boundary: bool = True) -> GeoSeries: ...
196216
def relate(self, other: GeoSeries | Geometry, align: bool | None = None) -> pd.Series[str]: ...
@@ -214,28 +234,22 @@ class GeoPandasBase:
214234
def hilbert_distance(
215235
self, total_bounds: tuple[float, float, float, float] | Iterable[float] | None = None, level: int = 16
216236
) -> pd.Series[int]: ...
217-
218-
@overload
219237
def sample_points(
220238
self,
221239
size: int | ArrayLike,
222240
method: str = "uniform",
223-
seed: None = None,
224241
rng: int | ArrayLike | SeedSequence | BitGenerator | RandomGenerator | None = None,
225242
**kwargs,
226243
) -> GeoSeries: ...
227-
@overload
228-
@deprecated("Parameter `seed` is deprecated. Use `rng` instead.")
229-
def sample_points(
244+
def make_grid(
230245
self,
231-
size: int | ArrayLike,
232-
method: str = "uniform",
233-
*,
234-
seed: int | ArrayLike | SeedSequence | BitGenerator | RandomGenerator,
235-
rng: int | ArrayLike | SeedSequence | BitGenerator | RandomGenerator | None = None,
236-
**kwargs,
246+
cell_size: float,
247+
grid_type: Literal["square", "hexagon"] = "square",
248+
feature_type: Literal["centers", "corners", "polygons"] = "polygons",
249+
offset: tuple[float, float] | None = None,
250+
intersect: bool = True,
251+
flat_topped: bool = False,
237252
) -> GeoSeries: ...
238-
239253
def build_area(self, node: bool = True) -> GeoSeries: ...
240254

241255
@overload

‎stubs/geopandas/geopandas/plotting.pyi‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import os
12
from _typeshed import Incomplete
23
from collections.abc import Collection, Hashable, Iterable, Mapping, Sequence
34
from typing import Literal, TypeAlias, overload
@@ -14,6 +15,9 @@ from .geodataframe import GeoDataFrame
1415
from .geoseries import GeoSeries
1516

1617
_ColorOrColors: TypeAlias = ColorType | Sequence[ColorType] | ArrayLike
18+
ColumnLike: TypeAlias = Hashable | pd.Series | pd.Index | pd.Categorical | NDArray[Incomplete] | Sequence[Incomplete] | None
19+
# Also accepts xyzservices.TileProvider and rasterio.io.MemoryFile
20+
_Tiles: TypeAlias = bool | str | os.PathLike[str] | Incomplete
1721

1822
def plot_series(
1923
s: GeoSeries,
@@ -23,6 +27,9 @@ def plot_series(
2327
figsize: tuple[float, float] | None = None,
2428
aspect: Literal["auto", "equal"] | float | None = "auto",
2529
autolim: bool = True,
30+
tiles: _Tiles = False,
31+
attr: str | None = None,
32+
add_labels: bool = True,
2633
*,
2734
# Extracted from `**style_kwds`
2835
vmin: float = ...,
@@ -35,7 +42,7 @@ def plot_series(
3542
# IMPORTANT: keep roughly in sync with `GeoplotAccessor` methods below
3643
def plot_dataframe(
3744
df: GeoDataFrame,
38-
column: Hashable | None = None,
45+
column: ColumnLike = None,
3946
cmap: str | Colormap | None = None,
4047
color: _ColorOrColors | None = None,
4148
ax: Axes | None = None,
@@ -54,6 +61,9 @@ def plot_dataframe(
5461
missing_kwds: dict[str, Incomplete] | None = None,
5562
aspect: Literal["auto", "equal"] | float | None = "auto",
5663
autolim: bool = True,
64+
tiles: _Tiles = False,
65+
attr: str | None = None,
66+
add_labels: bool = True,
5767
*,
5868
# Extracted from `**style_kwds`
5969
norm: Normalize | None = None,
@@ -197,7 +207,7 @@ class GeoplotAccessor(PlotAccessor):
197207
@overload
198208
def __call__(
199209
self,
200-
column: Hashable | pd.Series | pd.Index | NDArray | None = None,
210+
column: ColumnLike = None,
201211
cmap: str | Colormap | None = None,
202212
color: _ColorOrColors | None = None,
203213
ax: Axes | None = None,
@@ -229,7 +239,7 @@ class GeoplotAccessor(PlotAccessor):
229239

230240
def geo(
231241
self,
232-
column: Hashable | pd.Series | pd.Index | NDArray | None = None,
242+
column: ColumnLike = None,
233243
cmap: str | Colormap | None = None,
234244
color: _ColorOrColors | None = None,
235245
ax: Axes | None = None,
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from .clip import clip as clip
22
from .geocoding import geocode as geocode, reverse_geocode as reverse_geocode
3+
from .make_grid import make_grid as make_grid
34
from .overlay import overlay as overlay
45
from .sjoin import sjoin as sjoin, sjoin_nearest as sjoin_nearest
56
from .util import collect as collect
67

7-
__all__ = ["collect", "geocode", "overlay", "reverse_geocode", "sjoin", "sjoin_nearest", "clip"]
8+
__all__ = ["collect", "geocode", "make_grid", "overlay", "reverse_geocode", "sjoin", "sjoin_nearest", "clip"]
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
from typing import Literal
2+
3+
from shapely import MultiPolygon, Polygon
4+
5+
from ..geodataframe import GeoDataFrame
6+
from ..geoseries import GeoSeries
7+
8+
def make_grid(
9+
input_geometry: Polygon | MultiPolygon | GeoSeries | GeoDataFrame,
10+
/,
11+
cell_size: float,
12+
grid_type: Literal["square", "hexagon"] = "square",
13+
feature_type: Literal["centers", "corners", "polygons"] = "polygons",
14+
offset: tuple[float, float] | None = None,
15+
intersect: bool = True,
16+
flat_topped: bool = False,
17+
) -> GeoSeries: ...

0 commit comments

Comments
 (0)