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.

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

Resampling - Part 1 #403

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
1154f5f
Initial resampling experiments
forman Dec 30, 2020
b557b62
Testing accuracy
forman Dec 30, 2020
c11bbd8
Added output chunks parameter
forman Dec 30, 2020
8fc0a5d
pyproj tests
forman Jan 2, 2021
d7bb2ad
more tests
forman Jan 2, 2021
536858d
introduced crs and is_rectified property
forman Jan 2, 2021
76a4766
More generic resample_ndimage()
forman Jan 2, 2021
3b0b497
CRS_WGS84 is now CRS84
forman Jan 2, 2021
6e2a9db
Implementing transformations from CRS to image and back
forman Jan 2, 2021
103ca37
Back to EPSG:4326
forman Jan 3, 2021
a948e6c
introduced new is_j_axis_up prop
forman Jan 3, 2021
d9ae737
x_max is now > 180 if crossing anti-meridian
forman Jan 3, 2021
cab16ef
xy_res is now a tuple
forman Jan 3, 2021
a593e55
improved finding crs in find_dataset_crs()
forman Jan 3, 2021
371fa2c
Update
forman Jan 4, 2021
e505915
pp -> pyproj
forman Jan 4, 2021
149717e
inlined functions
forman Jan 4, 2021
8a5818c
rectify_dataset() should create images with j axis down by default
forman Jan 4, 2021
e15718c
pp -> pyproj
forman Jan 4, 2021
08f31bb
Merge branch 'forman-391-resampling_research' into forman-391-rectify…
forman Jan 4, 2021
ea690ea
rectify_dataset() does create images with j axis down by default
forman Jan 4, 2021
d061a05
Fixed tests
forman Jan 4, 2021
35bebc2
refactorings to common properties between GeoCoding and ImageGeom
forman Jan 4, 2021
71abc54
Starting reprojection
forman Jan 5, 2021
4cbec53
Impl.
forman Jan 5, 2021
bc24616
Trying to harmonize ImageGeom + GeoCoding = GridMapping
forman Jan 6, 2021
db28505
New package
forman Jan 7, 2021
d1238c8
Added tests
forman Jan 7, 2021
beda160
New package gridmapping now with tests
forman Jan 12, 2021
4199863
update
forman Jan 13, 2021
a593b08
new tests
forman Jan 13, 2021
27f1fb0
fix
forman Jan 13, 2021
e685b26
Fixed tile handler format
forman Jan 18, 2021
43e91f3
Now using GridMapping instead of ImageGeom and GeoCoding
forman Jan 18, 2021
114df5e
Get rid of GDAL entirely
forman Jan 18, 2021
ba341f4
Removed modules imgeom and geocoding
forman Jan 18, 2021
c8da58c
update
forman Jan 18, 2021
58c5d9e
refactorings and new tests
forman Jan 19, 2021
445fda0
refactorings and new tests
forman Jan 20, 2021
6fa34e3
added times
forman Jan 20, 2021
2303d0a
refactorings and new tests
forman Jan 20, 2021
3b04344
made ij_bboxes be real "bounding" boxes
forman Jan 21, 2021
8d297c6
no print
forman Jan 21, 2021
be6bf53
no print
forman Jan 21, 2021
1449586
fixed assertions
forman Jan 21, 2021
8991cf9
Exclude bounds variables
forman Jan 21, 2021
dc5552d
added copyright
forman Jan 21, 2021
f33ca8c
affine_transform_dataset() seems to work as expected now!
forman Jan 21, 2021
bf00159
Renamed ij_transform_to/ij_transform_from --> ij_transform_from/ij_tr…
forman Jan 22, 2021
ac3ec12
Using new resampling function
forman Jan 27, 2021
1c79158
fix
forman Feb 1, 2021
722d4bc
started 0.7
forman Feb 1, 2021
110202b
CRS_URI_TO_ID --> CRS_ID_TO_URI
forman Feb 1, 2021
7476960
update fsspec/s3fs versions
forman Feb 1, 2021
9883b0d
Merge branch 'master' into forman-391-gridmapping
forman Feb 3, 2021
3273e20
Fixed NBs
forman Feb 3, 2021
9d3f77a
Update
forman Feb 3, 2021
adb2ef9
Update
forman Feb 3, 2021
21d00e9
Merge branch 'master' into forman-391-gridmapping
forman Feb 3, 2021
b0ffc47
Update
forman Feb 3, 2021
14a37cb
pin libgdal
forman Feb 3, 2021
db5b074
Another try to solve GDAL
forman Feb 3, 2021
9f0f143
Another try to resolve dependencies
forman Feb 3, 2021
02bb7fb
Line wrapping / PEP8
forman Feb 8, 2021
1f12266
Readability
forman Feb 8, 2021
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
23 changes: 22 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
## Changes in 0.6.2 (in development)
## Changes in 0.7.0 (in development)

* Numerous breaking changes have been applied to this version
in order to address generic resampling (#391) and support other
CRS than WGS-84 (#112):
* The following components have been removed entirely
- module `xcube.core.imgeom` with class `ImageGeom`
- module `xcube.core.geocoding` with class `GeoCoding`
- module `xcube.core.reproject` and all its functions
* The following components have been added
- module `xcube.core.gridmapping` with new class `GridMapping`
is a CF compliant replacement for classes `ImageGeom` and `GeoCoding`
* The following components have changed in an incompatible way:
- Function`xcube.core.rectify.rectify_dataset()` now uses
`source_gm: GridMapping` and `target_gm: GridMapping` instead of
`geo_coding: GeoCoding` and `output_geom: ImageGeom`.
- Function`xcube.core.gen.iproc.InputProcessor.process()` now uses
`source_gm: GridMapping` and `target_gm: GridMapping` instead of
`geo_coding: GeoCoding` and `output_geom: ImageGeom`.
* xcube no longer depends on GDAL (at least not directly).

* Removed example notebooks that used hard-coded local file paths. (#400)

* Fixed unit tests broken by accident. (#396)

Expand Down
11 changes: 7 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,24 @@ dependencies:
- click >=7.0
- cmocean >=2.0
- dask >=1.2
- dask-image
- fiona >=1.8
- gdal >=3.0,<3.1
- fsspec >=0.8.5
- geopandas >=0.8
- gdal >=3 # We don't require GDAL, but rasterio and fiona do
- jdcal >=1.4.1
- jsonschema >=3.2.0
- jsonschema >=3.2
- matplotlib-base >=3.0
- netcdf4 >=1.5.0
- numba >=0.43
- numpy >=1.16
- pandas >=1.1
- pillow >=6.0
- pyjwt >=1.7
- pyproj >=3.0
- pyyaml >=5.1
- rasterio >=1.0
- s3fs >=0.5.1
- rasterio >=1.1
- s3fs >=0.5.2
- scipy >=1.2
- setuptools >=41.0
- shapely >=1.6
Expand Down
Loading