reproject: validate raster inputs in public APIs#1432
Merged
Conversation
reproject() and geoid_height_raster() previously checked only isinstance(raster, xr.DataArray) and then accessed raster.coords / raster.dims, so 1-D DataArrays and complex-dtype rasters failed inside helpers with cryptic IndexError / KeyError. merge() did not validate elements at all, so a non-DataArray entry surfaced as AttributeError on .data. Replace the inline isinstance guard in reproject() and add per- element validation in merge() with _validate_raster (ndim=(2, 3)). Add the same call at the top of geoid_height_raster. Update existing test_non_dataarray_raises to match the new error message. 5 new tests in TestValidateRasterInputs.
brendancol
added a commit
that referenced
this pull request
May 3, 2026
Records the 11 PRs filed this round: - hydro: HIGH flow_direction_mfd memory guard (PR #1424); MEDIUM bundles for _validate_raster on secondary args (#1426), scalar param validation (#1428), and cellsize validation (#1430). - reproject: MEDIUM bundles for _validate_raster (#1432), grid/bounds/ precision validation (#1434), and NaN/Inf rejection (#1436). - flood: mannings_n DataArray validation (#1438). - pathfinding: waypoint cap + _validate_raster (#1440). - polygonize: _validate_raster (#1442). - terrain: scratch memory guard + scalar validation (#1444).
Contributor
Author
|
@copilot resolve the merge conflicts in this pull request |
# Conflicts: # xrspatial/reproject/__init__.py # xrspatial/tests/test_reproject.py Co-authored-by: brendancol <433221+brendancol@users.noreply.github.com>
Contributor
Merge conflicts resolved in commit
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #1431.
Summary
reproject(): replace inlineisinstanceguard with_validate_raster(raster, ndim=(2, 3)).merge(): validate each element of the input list.geoid_height_raster(): add_validate_rasterat the top of the function.test_non_dataarray_raisesregex to match the new error message.Bad inputs (1-D DataArray, complex dtype, non-DataArray) previously crashed inside helpers with cryptic errors. They now raise
TypeError/ValueErrorfrom the public API.Test plan
pytest xrspatial/tests/test_reproject.py— 101 passed (96 existing + 5 new).