Skip to content

GeoDjango spatial reference fixes #1265

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

Merged
merged 4 commits into from
Jan 4, 2023
Merged

GeoDjango spatial reference fixes #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46fd9b4
Make SpatialReference accept int
mjakob Nov 16, 2022
e7eaa7b
Make CoordTransform only accept SpatialReference
mjakob Nov 16, 2022
a7690a2
Narrow OGRGeometry.transform's accepted types
mjakob Nov 16, 2022
2d33d68
Narrow GEOSGeometryBase.transform's accepted types
mjakob Nov 16, 2022
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
3 changes: 2 additions & 1 deletion django-stubs/contrib/gis/gdal/geometries.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Any

from django.contrib.gis.gdal import CoordTransform, SpatialReference
from django.contrib.gis.gdal.base import GDALBase as GDALBase

class OGRGeometry(GDALBase):
Expand Down Expand Up @@ -63,7 +64,7 @@ class OGRGeometry(GDALBase):
def ewkt(self) -> Any: ...
def clone(self) -> Any: ...
def close_rings(self) -> None: ...
def transform(self, coord_trans: Any, clone: bool = ...) -> Any: ...
def transform(self, coord_trans: CoordTransform | SpatialReference | str | int, clone: bool = ...) -> Any: ...
def intersects(self, other: Any) -> Any: ...
def equals(self, other: Any) -> Any: ...
def disjoint(self, other: Any) -> Any: ...
Expand Down
4 changes: 2 additions & 2 deletions django-stubs/contrib/gis/gdal/srs.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SpatialReference(GDALBase):
destructor: Any
axis_order: Any
ptr: Any
def __init__(self, srs_input: str = ..., srs_type: str = ..., axis_order: Any | None = ...) -> None: ...
def __init__(self, srs_input: str | int = ..., srs_type: str = ..., axis_order: Any | None = ...) -> None: ...
def __getitem__(self, target: Any) -> Any: ...
def attr_value(self, target: Any, index: int = ...) -> Any: ...
def auth_name(self, target: Any) -> Any: ...
Expand Down Expand Up @@ -64,4 +64,4 @@ class SpatialReference(GDALBase):
class CoordTransform(GDALBase):
destructor: Any
ptr: Any
def __init__(self, source: Any, target: Any) -> None: ...
def __init__(self, source: SpatialReference, target: SpatialReference) -> None: ...
3 changes: 2 additions & 1 deletion django-stubs/contrib/gis/geos/geometry.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Any, TypeVar

from _typeshed import Self
from django.contrib.gis.gdal import CoordTransform, SpatialReference
from django.contrib.gis.geometry import hex_regex as hex_regex # noqa: F401
from django.contrib.gis.geometry import json_regex as json_regex
from django.contrib.gis.geometry import wkt_regex as wkt_regex
Expand Down Expand Up @@ -92,7 +93,7 @@ class GEOSGeometryBase(GEOSBase):
@property
def crs(self) -> Any: ...
ptr: Any
def transform(self, ct: Any, clone: bool = ...) -> Any: ...
def transform(self, ct: CoordTransform | SpatialReference | str | int, clone: bool = ...) -> Any: ...
@property
def boundary(self) -> Any: ...
def buffer(self, width: Any, quadsegs: int = ...) -> Any: ...
Expand Down