Skip to content
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

Optimizing raster.icrop #660

Merged
merged 6 commits into from
Apr 1, 2025
Merged

Optimizing raster.icrop #660

merged 6 commits into from
Apr 1, 2025

Conversation

vschaffn
Copy link
Contributor

@vschaffn vschaffn commented Mar 4, 2025

Resolves #659

Description

  • Changes order of icrop bounding box to match with Rasterio.BoundingBox.
  • Adds a parameter distance_unit: Literal["georeferenced", "pixel"] = "georeferenced" in georeferencing._crop to match with the use of icrop.

Tests

  • Updates crop tests.

Doc

  • Updates crop section in raster_class.md.

@adebardo
Copy link
Contributor

Are we sure that the DEM is not completely load before crop ?

Copy link
Member

@rhugonnet rhugonnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks!

@vschaffn
Copy link
Contributor Author

@rhugonnet @adebardo thanks for your feedback !
I have corrected the Raster.icrop method :

  • If the raster is not loaded, I use _load_rio with a window to just load the cropped raster
  • If the raster is already loaded I kept the same way to do
  • I replaced the transform translation by Raster.translate

I also fixed a sign error in _translate, and added some more tests

The loading check can't be set up in the tests because the raster is always loaded after icrop

@rhugonnet
Copy link
Member

Thanks!

I'm not sure I understand the logic of the part of the PR regarding removing the dependency to crop()? To me that's a huge benefit. It allows to have a fully consistent behaviour, with lots of tests already written in crop(), without having to duplicate the same code (what is done here in the end, by reading with rio.Windows).
And it doesn't affect performance: converting 4 indices to 4 coordinates is instantaneous.

@vschaffn
Copy link
Contributor Author

@adebardo @rhugonnet @adehecq I have changed the implementation of the icrop as discussed on 28/03/2025. Does this work for you? 😃

@rhugonnet
Copy link
Member

Perfect for me! Great idea to make it work through a distance_unit argument for consistency with other functions 😉

@adebardo
Copy link
Contributor

adebardo commented Apr 1, 2025

Thanks for the work @vschaffn ! :) and @rhugonnet for the review :) I merge

@adebardo adebardo merged commit d9957d4 into GlacioHack:main Apr 1, 2025
16 checks passed
@vschaffn vschaffn deleted the 659-icrop branch April 1, 2025 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix raster.icrop
3 participants