Refactor GeoDataset #73
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
adamjstewart
commented
Aug 5, 2021
Comment on lines
+224
to
+231
| hits = self.index.intersection(query, objects=True) | ||
|
|
||
| try: | ||
| hit = next(hits) # TODO: this assumes there is only a single hit | ||
| except StopIteration: | ||
| raise IndexError( | ||
| f"query: {query} is not within bounds of the index: {self.bounds}" | ||
| ) |
There was a problem hiding this comment.
This change fixes #57 (comment)
Comment on lines
+187
to
+188
| if self.crs is None: | ||
| self.crs = src.crs |
There was a problem hiding this comment.
This change fixes #57 (comment)
crs is now optional. Instead of computing the most common CRS, I just took the first CRS we find, as it's much simpler.
Comment on lines
+207
to
+210
| if i == 0: | ||
| raise FileNotFoundError( | ||
| f"No {self.__class__.__name__} data was found in '{root}'" | ||
| ) |
There was a problem hiding this comment.
This change fixes #57 (comment)
calebrob6
approved these changes
Aug 5, 2021
| with WarpedVRT(src, crs=self.crs) as vrt: | ||
| minx, miny, maxx, maxy = vrt.bounds | ||
| except rasterio.errors.RasterioIOError: | ||
| # Skip files that rasterio is unable to read |
There was a problem hiding this comment.
Maybe we want to spit out a warning here?
There was a problem hiding this comment.
We could issue debug-level logging messages for these (#39), but these are far too common to warrant info-level warning messages. This will be hit for every .zip, .txt, .dbf, etc. file in the directory.
29 tasks
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.
This PR refactors GeoDataset by adding two additional base classes:
All existing GeoDataset implementations now subclass these new base classes.
The motivation behind this PR is to reduce the significant amount of code duplication that has already accumulated. Note that since this is a refactor, no changes to the API or tests have been made.