From 2ab271d6facf032969f65a792552cb06aaa9db9b Mon Sep 17 00:00:00 2001 From: Sakharov Date: Thu, 5 Dec 2024 17:39:17 +0500 Subject: [PATCH] Small fixes --- aeronet_raster/aeronet_raster/__version__.py | 2 +- aeronet_raster/aeronet_raster/band/band.py | 6 +----- aeronet_raster/aeronet_raster/band/bandsample.py | 8 -------- aeronet_raster/aeronet_raster/collectionprocessor.py | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/aeronet_raster/aeronet_raster/__version__.py b/aeronet_raster/aeronet_raster/__version__.py index 96487b8..e3a3656 100644 --- a/aeronet_raster/aeronet_raster/__version__.py +++ b/aeronet_raster/aeronet_raster/__version__.py @@ -1,3 +1,3 @@ -VERSION = (0, 2, 5) +VERSION = (0, 2, 6) __version__ = '.'.join(map(str, VERSION)) diff --git a/aeronet_raster/aeronet_raster/band/band.py b/aeronet_raster/aeronet_raster/band/band.py index 6cf765f..a3b6078 100644 --- a/aeronet_raster/aeronet_raster/band/band.py +++ b/aeronet_raster/aeronet_raster/band/band.py @@ -303,15 +303,11 @@ def reproject(self, dst_crs: str, dst_res: tuple = None, else: dst_crs = dst_crs if isinstance(dst_crs, CRS) else CRS.from_user_input(dst_crs) - # Old rasterio compatibility: a separate check for validity - if not dst_crs.is_valid: - raise rasterio.errors.CRSError('Invalid CRS {} given'.format(dst_crs)) - # get temporary filepath if such is not provided tmp_file = False if fp is not None else True if fp is None: fp = '{tmp}/reprojected_{crs}/{directory}/{name}.tif'.format( - tmp=TMP_DIR, crs=dst_crs, directory=random_name(), name=self.name) + tmp=TMP_DIR, crs=str(dst_crs).replace(':', ''), directory=random_name(), name=self.name) os.makedirs(os.path.dirname(fp), exist_ok=True) # calculate params of new reprojected Band diff --git a/aeronet_raster/aeronet_raster/band/bandsample.py b/aeronet_raster/aeronet_raster/band/bandsample.py index cda7fcb..ead69bf 100644 --- a/aeronet_raster/aeronet_raster/band/bandsample.py +++ b/aeronet_raster/aeronet_raster/band/bandsample.py @@ -39,10 +39,6 @@ def __init__(self, name: str, raster: np.ndarray, crs: Union[str, CRS], self._transform = Affine(*transform) if not isinstance(transform, Affine) else transform self._crs = CRS.from_user_input(crs) if not isinstance(crs, CRS) else crs - # Old rasterio compatibility: a separate check for validity - if not self._crs.is_valid: - raise rasterio.errors.CRSError('Invalid CRS {} given'.format(crs)) - def __eq__(self, other) -> bool: res = np.allclose(self.numpy(), other.numpy()) res = res and (self.crs == other.crs) @@ -208,10 +204,6 @@ def reproject(self, dst_crs: Union[str, CRS], interpolation: str = 'nearest') -> else: dst_crs = dst_crs if isinstance(dst_crs, CRS) else CRS.from_user_input(dst_crs) - # Old rasterio compatibility: a separate check for validity - if not dst_crs.is_valid: - raise rasterio.errors.CRSError('Invalid CRS {} given'.format(dst_crs)) - dst_transform, dst_width, dst_height = calculate_default_transform( self.crs, dst_crs, self.width, self.height, *self.bounds) diff --git a/aeronet_raster/aeronet_raster/collectionprocessor.py b/aeronet_raster/aeronet_raster/collectionprocessor.py index 9e12acf..c787cfb 100644 --- a/aeronet_raster/aeronet_raster/collectionprocessor.py +++ b/aeronet_raster/aeronet_raster/collectionprocessor.py @@ -389,7 +389,7 @@ def __init__(self, input_channels: List[str], output_labels: List[str], processing_fn: Callable, - sample_size: Tuple[int] = (1024, 1024), + sample_size: Tuple[int, int] = (1024, 1024), bound: int = 256, src_nodata=0, nodata=None, dst_nodata=0,