bugfix

aeronet_raster/aeronet_raster/dataadapters/boundsafemixin.py

@@ -1,3 +1,5 @@
+import logging
+
 import numpy as np
 
 
@@ -21,6 +23,8 @@ def __getitem__(self, item):
             elif isinstance(coords, slice):  # coords = (min:max:step)
                 pads.append((max(-coords.start, 0), max(coords.stop - self.shape[axis], 0)))
                 safe_coords.append(slice(coords.start + pads[-1][0], coords.stop - pads[-1][1], coords.step))
+                if safe_coords[-1].start >= safe_coords[-1].stop:
+                    logging.warning(f'Probably incorrect slice {safe_coords[-1]}')
             else:
                 raise ValueError(f'Can not parse coords={coords} at axis={axis}')
 
@@ -39,6 +43,10 @@ def __setitem__(self, item, data):
             elif isinstance(coords, slice):  # coords = (min:max:step)
                 crops.append((max(-coords.start, 0), max(coords.stop - self.shape[axis], 0)))
                 safe_coords.append(slice(coords.start + crops[-1][0], coords.stop - crops[-1][1], coords.step))
+                if safe_coords[-1].start >= safe_coords[-1].stop:
+                    logging.warning(f'Probably incorrect slice {safe_coords[-1]}')
+            else:
+                raise ValueError(f'Can not parse coords={coords} at axis={axis}')
 
         self.write(safe_coords,
                    data[tuple(slice(crops[i][0], data.shape[i]-crops[i][1], 1) for i in range(data.ndim))])

aeronet_raster/aeronet_raster/dataprocessor.py

@@ -1,7 +1,6 @@
 import logging
 from .utils.samplers.gridsampler import GridSampler, make_grid, get_safe_shape
 from .dataadapters.abstractadapter import AbstractAdapter
-from .dataadapters.imageadapter import ImageAdapter
 from typing import Sequence, Callable, Union, Final, Tuple, Optional
 import numpy as np
 
@@ -58,6 +57,7 @@ def process(src: ArrayLike,
                             dst_coords[i] + dst_sample_size[i],
                             1) for i in range(len(dst_coords)))] = readen + res
 
+
 def get_blend_mask(shape: Sequence[int], margin: Sequence[int]) -> np.ndarray:
     """
     Returns alpha-blend float mask with values within [0..1] and linear fades on each side
@@ -125,11 +125,11 @@ def build_sampler(shape: np.ndarray, sample_size: np.ndarray, margin: np.ndarray
     return GridSampler(make_grid([(grid_start[i], grid_end[i]) for i in range(len(shape))], stride))
 
 
-def process_image(src: ImageAdapter,
+def process_image(src: AbstractAdapter,
                   src_sample_size: Union[int, Sequence[int]],
                   src_margin: Union[int, Sequence[int]],
                   processor: Callable,
-                  dst: ImageAdapter,
+                  dst: AbstractAdapter,
                   dst_sample_size: Union[int, Sequence[int], None] = None,
                   dst_margin: Union[int, Sequence[int], None] = None,
                   mode: str = 'crop',
@@ -157,8 +157,8 @@ def add_ch_ndim(size, n_ch):
         else:
             raise ValueError(f'Expecting size to be int or Sequence[int, int], got {size}')
 
-    dst_margin = add_ch_ndim(dst_margin or src_margin, 0)
-    dst_sample_size = add_ch_ndim(dst_sample_size or src_sample_size, dst.shape[0])
+    dst_margin = add_ch_ndim(dst_margin if dst_margin is not None else src_margin, 0)
+    dst_sample_size = add_ch_ndim(dst_sample_size if dst_sample_size is not None else src_sample_size, dst.shape[0])
 
     src_sample_size = add_ch_ndim(src_sample_size, src.shape[0])
     src_margin = add_ch_ndim(src_margin, 0)