Skip to content
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

Jump to bottom

XY refactor #11

Merged
merged 17 commits into from Feb 8, 2022
Merged

XY refactor #11

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9aa4204
Add XY disambiguation types
Kirill888 Feb 4, 2022
2aaa536
Add .shape to bounding box
Kirill888 Feb 4, 2022
8d1a665
Change GeoBox constructor to accept shape
Kirill888 Feb 4, 2022
caaa81c
Move type aliases to types
Kirill888 Feb 4, 2022
231d113
Extend ixy_, iyx_, res_ input type support
Kirill888 Feb 4, 2022
27183ef
Tighten gridspec interface
Kirill888 Feb 4, 2022
21b018f
Stop using ambiguous XY/YX tuples in GeoBox
Kirill888 Feb 4, 2022
46a6e68
Fixup some documentation string following review
Kirill888 Feb 8, 2022
05cb5e7
Normalizing variable names in geobox.py
Kirill888 Feb 8, 2022
ffb832a
Fix error in gridspec construction
Kirill888 Feb 8, 2022
76be541
Switch alignment and p2idx to use XY[] types
Kirill888 Feb 8, 2022
4f242f0
Add Shape2d class and constructor helpers
Kirill888 Feb 8, 2022
1a17224
Remove some more plain tuples from the interface
Kirill888 Feb 8, 2022
9d81815
Use wh_ instead of ixy_ in tests where appropriate
Kirill888 Feb 8, 2022
4691496
Add XY types to api docs
Kirill888 Feb 8, 2022
c342091
Fix warning in docs and enable strict build mode
Kirill888 Feb 8, 2022
5455163
Add migrations docs listing major deviations from datacube
Kirill888 Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions odc/geo/__init__.py
View file
Open in desktop
Expand Up @@ -10,6 +10,22 @@

from ._version import __version__

from .types import (
XY,
Index2d,
Resolution,
SomeShape,
SomeResolution,
SomeIndex2d,
xy_,
yx_,
res_,
resxy_,
resyx_,
ixy_,
iyx_,
)

from .crs import (
CRS,
CRSError,
Expand All @@ -26,6 +42,12 @@

__all__ = [
"__version__",
"XY",
"Index2d",
"Resolution",
"SomeShape",
"SomeResolution",
"SomeIndex2d",
"BoundingBox",
"CoordList",
"CRS",
Expand All @@ -34,4 +56,11 @@
"Geometry",
"MaybeCRS",
"SomeCRS",
"xy_",
"yx_",
"res_",
"resxy_",
"resyx_",
"ixy_",
"iyx_",
]
6 changes: 3 additions & 3 deletions odc/geo/_xr_interop.py
View file
Open in desktop
Expand Up @@ -280,9 +280,9 @@ def _locate_geo_info(src: XarrayObject) -> GeoState:
crs = _get_crs_from_attrs(src, sdims)

if transform is not None:
width = _xx.shape[0]
height = _yy.shape[0]
geobox = GeoBox(width, height, transform, crs)
nx = _xx.shape[0]
ny = _yy.shape[0]
geobox = GeoBox((ny, nx), transform, crs)

return GeoState(spatial_dims=sdims, transform=transform, crs=crs, geobox=geobox)

Expand Down