Scarp Update - #1325
Open
dwolfsch wants to merge 1 commit into
Open
Conversation
Azimuth corrected Config file changed Atrribute names changed documentation added
fso42
self-requested a review
August 12, 2026 12:23
fso42
requested changes
Aug 13, 2026
fso42
left a comment
fso42
left a comment
Contributor
There was a problem hiding this comment.
Please check your example files AND propagate the change that you did in regards to the new attribute names also to the pytests:
- they fail as they still got the old names
- your example inputs POINTS now contains 2 files, which fails as only one is accepted
- the default ellipsoid file still has the old attributes
-> so please tidy this up
|
|
||
| except KeyError as e: | ||
| raise ValueError(f"Required attribute '{e.args[0]}' not found in shapefile. Make sure 'zseed', 'dipdir', and 'dipangle' fields exist.") | ||
| raise ValueError(f"Required attribute '{e.args[0]}' not found in shapefile. Make sure 'zseed', 'dipdir_azi', and 'dipangle' fields exist.") |
Contributor
There was a problem hiding this comment.
This (and the one below) will never be reached, right? As Shp2Array sets eg. dipDir_azi to None. So the attribute is there! I guess you want to test for None?
| ellipsoidsRotAngle = list(map(float, SHPdata['rotAngle'])) | ||
| except KeyError as e: | ||
| raise ValueError(f"Required attribute '{e.args[0]}' not found in shapefile. Ensure the fields 'maxdepth', 'semimajor', 'semiminor', 'rotangle', 'dipdir', 'dipangle', and 'offset' exist.") | ||
| raise ValueError(f"Required attribute '{e.args[0]}' not found in shapefile. Ensure the fields 'maxdepth', 'semimajor', 'semiminor', 'rotangle', 'dipdir_azi', 'dipangle', and 'offset' exist.") |
| ellipsoids : str | ||
| Comma-separated string defining ellipsoids with parameters: | ||
| (x_center, y_center, max_depth, semi_major, semi_minor, tilt, dir, offset) | ||
| (maxdepth, semimajor, semiminor, dipAngle, dipdir_azi, offset, rotangle) |
Contributor
There was a problem hiding this comment.
What about x_center and y_center?
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
2 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.
Azimuth corrected
Config file changed
Atrribute names changed
documentation added
PR Checklist
Please confirm before requesting review:
pytestlocally without failsConfirm before the final merge/rebase into master