-
Notifications
You must be signed in to change notification settings - Fork 1
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
[CIF-165] Write layers directly #42
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,11 @@ | ||
import os | ||
from abc import abstractmethod | ||
from typing import Union, Tuple, List | ||
from typing import Union, Tuple | ||
from uuid import uuid4 | ||
from osgeo import gdal | ||
|
||
import ee | ||
import boto3 | ||
from dask.diagnostics import ProgressBar | ||
from ee import ImageCollection | ||
from geocube.api.core import make_geocube | ||
|
@@ -52,6 +56,37 @@ def groupby(self, zones, layer=None): | |
""" | ||
return LayerGroupBy(self.aggregate, zones, layer, self.masks) | ||
|
||
def write(self, bbox, output_path, tile_degrees=None): | ||
""" | ||
Write the layer to a path. Does not apply masks. | ||
|
||
:param bbox: (min x, min y, max x, max y) | ||
:param output_path: local or s3 path to output to | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
:param tile_degrees: optional param to tile the results into multiple files with a VRT. | ||
Degrees to tile by. `output_path` should be a folder path to store the tiles. | ||
:return: | ||
""" | ||
|
||
if tile_degrees is not None: | ||
tiles = create_fishnet_grid(*bbox, tile_degrees) | ||
|
||
if not os.path.exists(output_path): | ||
os.makedirs(output_path) | ||
|
||
file_names = [] | ||
for tile in tiles["geometry"]: | ||
data = self.aggregate.get_data(tile.bounds) | ||
|
||
file_name = f"{output_path}/{uuid4()}.tif" | ||
file_names.append(file_name) | ||
|
||
write_layer(file_name, data) | ||
|
||
gdal.BuildVRT(f"{output_path}.vrt", file_names) | ||
else: | ||
data = self.aggregate.get_data(bbox) | ||
write_layer(output_path, data) | ||
|
||
|
||
class LayerGroupBy: | ||
def __init__(self, aggregate, zones, layer=None, masks=[]): | ||
|
@@ -240,3 +275,21 @@ def get_image_collection( | |
|
||
return data | ||
|
||
|
||
def write_layer(path, data): | ||
if isinstance(data, xr.DataArray): | ||
# for rasters, need to write to locally first then copy to cloud storage | ||
if path.startswith("s3://"): | ||
tmp_path = f"{uuid4()}.tif" | ||
data.rio.to_raster(raster_path=tmp_path, driver="COG") | ||
|
||
s3 = boto3.client('s3') | ||
s3.upload_file(tmp_path, path.split('/')[2], '/'.join(path.split('/')[3:])) | ||
|
||
os.remove(tmp_path) | ||
else: | ||
data.rio.to_raster(raster_path=path, driver="COG") | ||
elif isinstance(data, gpd.GeoDataFrame): | ||
data.to_file(path, driver="GeoJSON") | ||
else: | ||
raise NotImplementedError("Can only write DataArray or GeoDataFrame") |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we use
MAX_TILE_SIZE
as the defaulttile_degrees
?