Check DimCoord poins and bounds before setting #2630
Merged
Conversation
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
Member
|
👍 |
pelson
approved these changes
Oct 17, 2017
Member
|
Practically, this all looks good + solid to me. I don't see any need to test the new behaviour -- it is just clearly a fix. |
Contributor
Author
|
No, scalar values were always allowed. It's just that previously the new array was being passed through _sanitise_array(), which ensured it was at least 1D (for points) or 2D (for bounds), before being checked. |
Member
|
Ok, I believe it ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Setting DimCoord points/bounds to an array that doesn't meet the requirements raises an exception, but the points/bounds array is still set on the coordinate. This PR stops that happening by doing the requirements checks before modifying the coord with the new array.
I've modified the functions
_new_points_requirements()and_new_bounds_requirements()so that they check the slightly more lenient requirements of the array which is passed in, rather than those of the actual array assigned, i.e, the points value passed can be a scalar, and the bounds value can be 1D if there is only a single point.