jgrss/features delayed #250
Merged
Conversation
This file contains 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
Closed
jgrss
commented
Mar 28, 2023
| ) as src: | ||
| src_clip = gw.clip(src, l8_224078_20200518_polygons) | ||
| self.assertEqual(src_clip.crs, src.crs) | ||
|
|
||
| def test_clip_data(self): |
jgrss
commented
Mar 28, 2023
| @@ -903,8 +950,48 @@ def apply(self, filename, user_func, n_jobs=1, **kwargs): | |||
|
|
|||
| cluster.stop() | |||
|
|
|||
| def clip_by_polygon( | |||
jgrss
commented
Mar 28, 2023
src/geowombat/core/geoxarray.py
Outdated
| mask_data=mask_data, | ||
| expand_by=expand_by, | ||
| ) | ||
|
|
||
| def clip(self, df, query=None, mask_data=False): |
jgrss
commented
Mar 28, 2023
| @@ -851,7 +903,14 @@ def extract( | |||
|
|
|||
| return df | |||
|
|
|||
| def clip(self, data, df, query=None, mask_data=False, expand_by=0): | |||
| def clip_by_polygon( | |||
jgrss
commented
Mar 28, 2023
|
|
||
| return data | ||
|
|
||
| def clip( |
not sure if this is where you want it
mmann1123
approved these changes
Mar 29, 2023
| @@ -59,6 +59,7 @@ docs = numpydoc | |||
| tests = testfixtures | |||
There was a problem hiding this comment.
In the read the docs we have an "all" option is it worth putting that back in?
| @@ -903,8 +950,48 @@ def apply(self, filename, user_func, n_jobs=1, **kwargs): | |||
|
|
|||
| cluster.stop() | |||
|
|
|||
| def clip_by_polygon( | |||
| self, | |||
| df: T.Union[str, _Path, gpd.GeoDataFrame], | |||
There was a problem hiding this comment.
Just for my own edification, what is T.Union for here? are you setting the required data types as string path or geodataframe? Then it handles error is there's datatype issues?
src/geowombat/core/geoxarray.py
Outdated
|
|
||
| return clip(self._obj, df, query=query, mask_data=mask_data) | ||
| return clip_by_polygon(self._obj, df, query=query, mask_data=mask_data) |
There was a problem hiding this comment.
Looks like despite warning its still running, so why not include expand_by=expand_by,?
mmann1123
reviewed
Mar 29, 2023
doc/source/tutorial-edit.rst
Outdated
| @@ -164,3 +164,27 @@ The GeoWombat :func:`replace` function mimics :func:`pandas.DataFrame.replace`. | |||
| .. note:: | |||
|
|
|||
| The :func:`replace` function is typically used with thematic data. | |||
|
|
|||
| Clipping to bounds | |||
There was a problem hiding this comment.
Not sure if this is where you want this.
Thanks! I'm not sure but I'll look into it as soon as I can. |
Merged
jgrss
added a commit
that referenced
this pull request
Apr 1, 2023
* fix: jgrss/features delayed (#250) * add flake8 * add black * add pre-commit * flake * flake * format * format * format * test * format * format * format * updating minor errors * adding pygis to examples * add clipping by polygons not sure if this is where you want it * move clip example * add missing arg * format docs * formatting * format --------- Co-authored-by: mmann1123 <mmann1123@gmail.com> * fix: CI tests failing with co-registration (#254) * add raise * wrong name * update CI workflow * pin max pyproj version * format * revert test * docs: Add CONTRIBUTING (#253) * block isort * block isort * add vscode ext notes * updating instructions (not complete) * in progress * add video test embed * change video image * play icon * video play button * play button * cleanup * cleanup --------- Co-authored-by: Michael Mann <mmann1123@gmail.com> * docs: Doc theme (#256) * remove jax * change html theme * remove clutter * update docs theme * bump python * remove sys * pin pydata-sphinx-theme * pin sphinx libs * make dict * freeze code block * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * format * pass tests * fix: Test coverage (#255) * format * format * format --------- Co-authored-by: mmann1123 <mmann1123@gmail.com>
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.
What is this PR changing?
This PR address #249 and fixes the
clip()method, deprecatesclip()in favor ofclip_by_polygon(), adds a test for clipping, and ensures clip masking is delayed.