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

Bugfix shape masking #6129

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

Bugfix shape masking #6129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebee977
Updates to allow varying shape crs
hsteptoe Aug 22, 2024
e32f911
Ruff fixes
hsteptoe Aug 22, 2024
76eae38
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 22, 2024
bcdca30
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Nov 22, 2024
9dab7c6
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Dec 6, 2024
ebaa1ee
Adding rasterio as optional dependency
hsteptoe Dec 6, 2024
103e3d7
Adding rasterio functionality
hsteptoe Dec 19, 2024
3c65dab
First working version with rasterio
hsteptoe Dec 20, 2024
25de18d
Add further shape geometry checks
hsteptoe Jan 3, 2025
10e4413
Update shapefile tests
hsteptoe Jan 3, 2025
cd5cf99
Reorganise test fixtures
hsteptoe Jan 3, 2025
edc25cc
Reorganise test fixtures
hsteptoe Jan 3, 2025
789c98d
Fix fixture fetching
hsteptoe Jan 3, 2025
27a9025
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Jan 3, 2025
dc090a5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 3, 2025
5b1054b
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Feb 7, 2025
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
Prev Previous commit
Next Next commit
Ruff fixes
  • Loading branch information
@hsteptoe
hsteptoe committed Aug 22, 2024
commit e32f911b1e08f94e8d2afc6f38a5806ccf2d0d81
4 changes: 2 additions & 2 deletions lib/iris/_shapefiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ def create_shapefile_mask(


def _transform_coord_system(
geometry: shapely.Geometry,
cube: iris.cube.Cube,
geometry: shapely.Geometry,
cube: iris.cube.Cube,
geometry_crs: cartopy.crs = None
) -> shapely.Geometry:
"""Project the shape onto another coordinate system.
Expand Down
1 change: 0 additions & 1 deletion lib/iris/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2166,7 +2166,6 @@ def mask_cube_from_shapefile(

Notes
-----

To mask a cube from a shapefile, both must first be on the same coordinate system.
Shapefiles are mostly on a lat/lon grid with a projection very similar to GeogCS
The shapefile is projected to the coord system of the cube using cartopy, then each cell
Expand Down
Loading