-
Notifications
You must be signed in to change notification settings - Fork 300
Shapefile masking #5470
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
Merged
Merged
Shapefile masking #5470
Changes from 24 commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
3b15cd2
Working draft of shapefile masking
acchamber 2ef0d15
Version of shapefile masking with tests and ready for preliminary review
acchamber 6d36d05
Updated tests with proper paths and skip_tests decorator
acchamber befb1e5
Merge branch 'main' into shapefile_masking
acchamber 6c2ef62
Merge branch 'main' into shapefile_masking
acchamber 7b28fcd
Merge branch 'main' into shapefile_masking
acchamber 6decedf
fixed some paths and removed broken code
acchamber d3b91d1
Merge branch 'SciTools:main' into shapefile_masking
acchamber d168f24
Added more tests and split into integration and unit tests. Testing w…
acchamber 4947ffb
Merge branch 'shapefile_masking' of https://github.com/acchamber/iris…
acchamber 1d05f63
responces to comments on utils.py for shapefile masking
acchamber ca363cc
tests actually pass now
acchamber 23f3640
Moved tests to correct locations and strted changes on _shapefiles.py
acchamber 57af617
some changes to _shapefiles to match review
acchamber 5ba0ebc
added setUp cases to tests
acchamber cce3f9b
moved test names to lower_case and added acknoledgment
acchamber 3ec7cc3
removed seperate guess_bounds function
acchamber 7baab21
updated structure to properly call coord names/coords when optimal
acchamber c0aa728
sphnix improvements to docstring
acchamber 44fe0cd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 28fcd44
commited dask map_blocks approach and some test improvements
acchamber 87cc28e
replaced bounds rebasing via modulus with vectorized version
acchamber 92d869f
Dask chunk control and some docstrings
acchamber 4b38611
Merge branch 'shapefile_masking' of https://github.com/acchamber/iris…
acchamber befceeb
reverted behaviour of modulus function to ASCEND and switcher argumen…
acchamber e391e43
edied tests to work with flipped argument order
acchamber 8b0e869
Improved optimisation by reading shapely docs properly and just using…
acchamber 194aabf
Docstring updates and a 4d integration test
acchamber 9521c2e
Merge branch 'main' into shapefile_masking
trexfeathers e89634b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 162bd45
Update lib/iris/_shapefiles.py
acchamber 07ab745
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e8a23b7
improving readability from martin
acchamber ea5be9c
Merge branch 'shapefile_masking' of https://github.com/acchamber/iris…
acchamber 64278ca
removed dask.delayed call
acchamber a46d7c9
Update lib/iris/_shapefiles.py
acchamber eca46c0
Update lib/iris/_shapefiles.py
acchamber 061b76b
Update lib/iris/util.py
acchamber cc6016b
Added warning for possible mismatch of mask/cube coords
acchamber 5e7d799
test for new warning
acchamber 440f049
added test
acchamber 3c13e1b
Update lib/iris/_shapefiles.py
acchamber 1e1d711
Added licenses
acchamber 22e2cf7
Merge branch 'shapefile_masking' of https://github.com/acchamber/iris…
acchamber 9cb96b9
fixed doctest failures in example
acchamber deb5ff9
Improved test coverage
acchamber 6eaa36b
fixed doctest
acchamber 3b7384f
doctest again
acchamber a0aec74
Docstring tidy up.
trexfeathers e13e757
Merge pull request #1 from trexfeathers/docstring_tidy
acchamber b76dabd
fixed prime meridian bug
acchamber ca380ed
Update lib/iris/_shapefiles.py
acchamber 0518a40
Merge branch 'main' into shapefile_masking
acchamber 404474f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] b924795
Added first draft of user guide page
acchamber 4ab753a
Add What's New entry.
trexfeathers 84a8212
Merge pull request #2 from trexfeathers/shapefile_whatsnew
acchamber bf3c720
Merge branch 'SciTools:main' into shapefile_masking
acchamber File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,231 @@ | ||
| # Copyright Iris contributors | ||
| # | ||
| # This file is part of Iris and is released under the LGPL license. | ||
| # See COPYING and COPYING.LESSER in the root of the repository for full | ||
| # licensing details. | ||
trexfeathers marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| # Much of this code is originally based off the ASCEND library, developed in | ||
| # the Met Office by Chris Kent, Emilie Vanvyve, David Bentley, Joana Mendes | ||
| # many thanks to them. Converted to iris by Alex Chamberlain-Clay | ||
|
|
||
|
|
||
| from itertools import product | ||
| import warnings | ||
|
|
||
| import dask.array | ||
| import numpy as np | ||
| import shapely | ||
| import shapely.errors | ||
| import shapely.geometry as sgeom | ||
| import shapely.ops | ||
|
|
||
| from iris.exceptions import IrisDefaultingWarning | ||
|
|
||
|
|
||
| def create_shapefile_mask( | ||
| geometry, | ||
| cube, | ||
| minimum_weight=0.0, | ||
| ): | ||
| """Makes a mask for a cube from the shapefile | ||
|
|
||
| Get the mask of the intersection between the | ||
| given shapely geometry and cube. | ||
|
|
||
| Parameters | ||
| ----------- | ||
| geometry : A :class:`shapely.Geometry` object | ||
|
|
||
| cube : A :class:`iris.cube.Cube` | ||
trexfeathers marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| with 1d x and y coordinates | ||
| minimum_weight : A float between 0 and 1 determining what % of a cell | ||
| a shape must cover for the cell to remain unmasked. | ||
| eg: 0.1 means that at least 10% of the shape overlaps the cell | ||
| to be unmasked | ||
|
|
||
| Returns: | ||
| A :class:`np.array` of the shape of the x & y coordinates of the cube, with points to mask equal to True | ||
|
|
||
| """ | ||
|
|
||
| from iris.cube import Cube, CubeList | ||
|
|
||
| try: | ||
| msg = TypeError("Geometry is not a valid Shapely object") | ||
| if geometry.is_valid is False: | ||
| raise msg | ||
| except Exception: | ||
| raise msg | ||
| if not isinstance(cube, Cube): | ||
| if isinstance(cube, CubeList): | ||
| msg = "Received CubeList object rather than Cube - \ | ||
| to mask a CubeList iterate over each Cube" | ||
| raise TypeError(msg) | ||
| else: | ||
| msg = "Received non-Cube object where a Cube is expected" | ||
| raise TypeError(msg) | ||
| if minimum_weight > 0.0 and isinstance( | ||
| geometry, | ||
| ( | ||
| sgeom.Point, | ||
| sgeom.LineString, | ||
| sgeom.LinearRing, | ||
| sgeom.MultiPoint, | ||
| sgeom.MultiLineString, | ||
| ), | ||
| ): | ||
| minimum_weight = 0.0 | ||
| warnings.warn( | ||
| """Shape is of invalid type for minimum weight masking, | ||
| must use a Polygon rather than Line shape.\n | ||
| Masking based off intersection instead. """, | ||
| IrisDefaultingWarning, | ||
acchamber marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ) | ||
|
|
||
| # prepare shape | ||
| trans_geo = _transform_coord_system(geometry, cube) | ||
|
|
||
| # prepare 2D cube | ||
| for coord in cube.dim_coords: | ||
trexfeathers marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if not coord.has_bounds(): | ||
| coord.guess_bounds() | ||
| y_name, x_name = _cube_primary_xy_coord_names(cube) | ||
trexfeathers marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| cube_2d = cube.slices([y_name, x_name]).next() | ||
|
|
||
| y_coord, x_coord = [cube_2d.coord(n) for n in (y_name, x_name)] | ||
| x_bounds = _get_mod_rebased_coord_bounds(x_coord) | ||
| y_bounds = _get_mod_rebased_coord_bounds(y_coord) | ||
| # prepare array for dark | ||
| bounds_array = np.asarray(list(product(x_bounds, y_bounds))) | ||
| # if bounds_array is large enough set chunksize to speed up masking | ||
| if bounds_array.shape[0] > 250000: # roughly equal to 500x500 2d | ||
| chunksize = [int(np.ceil(bounds_array.shape[0] / 10)), -1, -1] | ||
| else: | ||
| chunksize = "auto" | ||
| da_bounds_array = dask.array.from_array(bounds_array, chunks=chunksize) | ||
| dask_template = dask.array.map_blocks( | ||
| map_blocks_func, | ||
| da_bounds_array, | ||
| trans_geo, | ||
| minimum_weight, | ||
| drop_axis=[1, 2], | ||
| dtype=bool, | ||
| meta=np.array(False), | ||
| ) | ||
| mask_template = np.reshape(dask_template.compute(), cube_2d.shape[::-1]).T | ||
|
|
||
| return mask_template | ||
|
|
||
|
|
||
| def map_blocks_func(bounds_array, shapefile, minimum_weight): | ||
| dask_template = np.empty(bounds_array.shape[0], dtype=bool) | ||
| for count, idx in enumerate(bounds_array): | ||
| # get the bounds of the grid cell | ||
| x0, x1 = idx[0] | ||
| y0, y1 = idx[1] | ||
| # create a new polygon of the grid cell and check intersection | ||
| cell_box = sgeom.box(x0, y0, x1, y1) | ||
| intersect_bool = shapefile.intersects(cell_box) | ||
| # mask all points without a intersection | ||
| if intersect_bool is False: | ||
| dask_template[count] = True | ||
| # if weights method used, mask intersections below required weight | ||
| elif intersect_bool is True and minimum_weight > 0.0: | ||
| intersect_area = shapefile.intersection(cell_box).area | ||
| if (intersect_area / cell_box.area) <= minimum_weight: | ||
| dask_template[count] = True | ||
| else: | ||
| dask_template[count] = False | ||
| else: | ||
| dask_template[count] = False | ||
|
|
||
| return dask_template | ||
|
|
||
|
|
||
| def _transform_coord_system(geometry, cube, geometry_system=None): | ||
| """Project the shape onto another coordinate system. | ||
|
|
||
| Arguments: | ||
| target: The target :class:`iris.coord_systems.CoordSystem` | ||
| or a :class:`iris.cube.Cube` object defining the coordinate | ||
| system to which the shape should be transformed | ||
|
|
||
| Returns: | ||
| A transformed shape (copy) | ||
| """ | ||
| y_name, x_name = _cube_primary_xy_coord_names(cube) | ||
| import iris.analysis.cartography | ||
|
|
||
| DEFAULT_CS = iris.coord_systems.GeogCS( | ||
| iris.analysis.cartography.DEFAULT_SPHERICAL_EARTH_RADIUS | ||
| ) | ||
| target_system = cube.coord_system() | ||
| if not target_system: | ||
| warnings.warn( | ||
| "Cube has no coord_system; using default GeogCS lat/lon", | ||
| IrisDefaultingWarning, | ||
acchamber marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ) | ||
| target_system = DEFAULT_CS | ||
| if geometry_system is None: | ||
| geometry_system = DEFAULT_CS | ||
| target_proj = target_system.as_cartopy_projection() | ||
| source_proj = geometry_system.as_cartopy_projection() | ||
|
|
||
| trans_geometry = target_proj.project_geometry(geometry, source_proj) | ||
| # A default coord system in iris can be either -180 to 180 or 0 to 360 | ||
| if target_system == DEFAULT_CS and cube.coord(x_name).points[-1] > 180: | ||
| trans_geometry = shapely.transform(trans_geometry, _trans_func) | ||
trexfeathers marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| return trans_geometry | ||
|
|
||
|
|
||
| def _trans_func(geometry): | ||
| """pocket function for transforming the x coord of a geometry from -180 to 180 to 0-360""" | ||
| for point in geometry: | ||
| if point[0] < 0: | ||
| point[0] = 360 - np.abs(point[0]) | ||
| return geometry | ||
trexfeathers marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
|
|
||
| def _cube_primary_xy_coord_names(cube): | ||
| """Return the primary latitude and longitude coordinate standard names, or | ||
| long names, from a cube. | ||
|
|
||
| Arguments: | ||
| cube (:class:`iris.cube.Cube`): An Iris cube | ||
|
|
||
| Returns: | ||
| The names of the primary latitude and longitude coordinates | ||
| """ | ||
| latc = ( | ||
| cube.coords(axis="y", dim_coords=True)[0] | ||
| if cube.coords(axis="y", dim_coords=True) | ||
| else -1 | ||
| ) | ||
| lonc = ( | ||
| cube.coords(axis="x", dim_coords=True)[0] | ||
| if cube.coords(axis="x", dim_coords=True) | ||
| else -1 | ||
| ) | ||
|
|
||
| if -1 in (latc, lonc): | ||
| msg = "Error retrieving 1d xy coordinates in cube: {!r}" | ||
| raise ValueError(msg.format(cube)) | ||
|
|
||
| latitude = latc.name() | ||
| longitude = lonc.name() | ||
| return latitude, longitude | ||
|
|
||
|
|
||
| def _get_mod_rebased_coord_bounds(coord): | ||
| """takes in a coord and returns the bounds of that coord | ||
| rebased to the modulus""" | ||
| modulus = coord.units.modulus | ||
| # Force realisation (rather than core_bounds) - more efficient for the | ||
| # repeated indexing happening downstream. | ||
| result = np.array(coord.bounds) | ||
| if modulus: | ||
| result[result > 0.0] = result[result > 0.0] % modulus | ||
| result[result < 0.0] = (np.abs(result[result < 0.0]) % modulus) * -1 | ||
| result[np.isclose(result, modulus, 1e-10)] = 0.0 | ||
| return result | ||
85 changes: 85 additions & 0 deletions
85
lib/iris/tests/integration/test_mask_cube_from_shapefile.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import math | ||
|
|
||
| import cartopy.io.shapereader as shpreader | ||
| import numpy as np | ||
|
|
||
| import iris | ||
| import iris.tests as tests | ||
| from iris.util import mask_cube_from_shapefile | ||
|
|
||
|
|
||
| @tests.skip_data | ||
| class TestCubeMasking(tests.IrisTest): | ||
| """integration tests of mask_cube_from_shapefile | ||
| using different projections in iris_test_data - | ||
| values are the KGO calculated using ASCEND | ||
| """ | ||
|
|
||
| def setUp(self): | ||
| ne_countries = shpreader.natural_earth( | ||
| resolution="10m", category="cultural", name="admin_0_countries" | ||
| ) | ||
| self.reader = shpreader.Reader(ne_countries) | ||
|
|
||
| def test_global_proj_russia(self): | ||
| path = tests.get_data_path( | ||
| ["NetCDF", "global", "xyt", "SMALL_hires_wind_u_for_ipcc4.nc"] | ||
| ) | ||
| test_global = iris.load_cube(path) | ||
| ne_russia = [ | ||
| country.geometry | ||
| for country in self.reader.records() | ||
| if "Russia" in country.attributes["NAME_LONG"] | ||
| ][0] | ||
| masked_test = mask_cube_from_shapefile(ne_russia, test_global) | ||
| print(np.sum(masked_test.data)) | ||
| assert math.isclose( | ||
| np.sum(masked_test.data), 76845.37, rel_tol=0.001 | ||
| ), "Global data with Russia mask failed test" | ||
|
|
||
| def test_rotated_pole_proj_germany(self): | ||
| path = tests.get_data_path( | ||
| ["NetCDF", "rotated", "xy", "rotPole_landAreaFraction.nc"] | ||
| ) | ||
| test_rotated = iris.load_cube(path) | ||
| ne_germany = [ | ||
| country.geometry | ||
| for country in self.reader.records() | ||
| if "Germany" in country.attributes["NAME_LONG"] | ||
| ][0] | ||
| masked_test = mask_cube_from_shapefile(ne_germany, test_rotated) | ||
| assert math.isclose( | ||
| np.sum(masked_test.data), 179.46872, rel_tol=0.001 | ||
| ), "rotated europe data with German mask failed test" | ||
|
|
||
| def test_transverse_mercator_proj_uk(self): | ||
| path = tests.get_data_path( | ||
| ["NetCDF", "transverse_mercator", "tmean_1910_1910.nc"] | ||
| ) | ||
| test_transverse = iris.load_cube(path) | ||
| ne_uk = [ | ||
| country.geometry | ||
| for country in self.reader.records() | ||
| if "United Kingdom" in country.attributes["NAME_LONG"] | ||
| ][0] | ||
| masked_test = mask_cube_from_shapefile(ne_uk, test_transverse) | ||
| assert math.isclose( | ||
| np.sum(masked_test.data), 90740.25, rel_tol=0.001 | ||
| ), "transverse mercator UK data with UK mask failed test" | ||
|
|
||
| def test_rotated_pole_proj_germany_weighted_area(self): | ||
| path = tests.get_data_path( | ||
| ["NetCDF", "rotated", "xy", "rotPole_landAreaFraction.nc"] | ||
| ) | ||
| test_rotated = iris.load_cube(path) | ||
| ne_germany = [ | ||
| country.geometry | ||
| for country in self.reader.records() | ||
| if "Germany" in country.attributes["NAME_LONG"] | ||
| ][0] | ||
| masked_test = mask_cube_from_shapefile( | ||
| ne_germany, test_rotated, minimum_weight=0.9 | ||
| ) | ||
| assert math.isclose( | ||
| np.sum(masked_test.data), 125.60199, rel_tol=0.001 | ||
| ), "rotated europe data with 0.9 weight germany mask failed test" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.