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.

Sign up for GitHub

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

fix: get_geometry_from_various usage in get_data #16

Merged
merged 2 commits into from
Jul 7, 2021
Merged

fix: get_geometry_from_various usage in get_data #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d5e993
fix: get_geometry_from_various usage in get_data
sbrunato Jul 6, 2021
cc6d4aa
docs: docstring update
sbrunato Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions eodag_cube/api/product/_product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from rasterio.vrt import WarpedVRT

from eodag.api.product._product import EOProduct as EOProduct_core
from eodag.utils import get_geometry_from_various
from eodag.utils.exceptions import DownloadError, UnsupportedDatasetAddressScheme

logger = logging.getLogger("eodag_cube.api.product")
Expand Down Expand Up @@ -68,9 +69,18 @@ def get_data(self, crs, resolution, band, extent):
:type resolution: float
:param band: The band of the dataset to retrieve (e.g.: 'B01')
:type band: str
:param extent: The coordinates on which to zoom as a tuple
(min_x, min_y, max_x, max_y) in the given `crs`
:type extent: (float, float, float, float)
:param extent: The coordinates on which to zoom, matching the given CRS. Can be defined in different ways
(its bounds will be used):

* with a Shapely geometry object:
:class:`shapely.geometry.base.BaseGeometry`
* with a bounding box (dict with keys: "lonmin", "latmin", "lonmax", "latmax"):
``dict.fromkeys(["lonmin", "latmin", "lonmax", "latmax"])``
* with a bounding box as list of float:
``[lonmin, latmin, lonmax, latmax]``
* with a WKT str

:type extent: Union[str, dict, shapely.geometry.base.BaseGeometry]
:returns: The numeric matrix corresponding to the sub dataset or an empty
array if unable to get the data
:rtype: xarray.DataArray
Expand Down Expand Up @@ -102,15 +112,16 @@ def get_data(self, crs, resolution, band, extent):
if not path_of_downloaded_file:
return fail_value
dataset_address = self.driver.get_data_address(self, band)
min_x, min_y, max_x, max_y = extent
extent_bounds = get_geometry_from_various(geometry=extent).bounds
min_x, min_y, max_x, max_y = extent_bounds
height = int((max_y - min_y) / resolution)
width = int((max_x - min_x) / resolution)
out_shape = (height, width)
with rasterio.open(dataset_address) as src:
with WarpedVRT(src, crs=crs, resampling=Resampling.bilinear) as vrt:
array = vrt.read(
1,
window=vrt.window(*extent),
window=vrt.window(*extent_bounds),
out_shape=out_shape,
resampling=Resampling.bilinear,
)
Expand Down