Crossfade fixes 3

aeronet_raster/aeronet_raster/band/bandsample.py

@@ -18,7 +18,7 @@ class BandSample(GeoObject):
     It implements all the interfaces of the GeoObject, and stores the raster data in memory
 
     Args:
-        name (str): a name of the sample, which is used as a defaule name for saving to file
+        name (str): a name of the sample, which is used as a default name for saving to file
         raster (np.array): the raster data
         crs: geographical coordinate reference system, as :obj:`CRS` or string representation
         transform (Affine): affine transform

aeronet_raster/aeronet_raster/dataadapters/rasterioadapter.py

@@ -16,11 +16,9 @@ def open(self):
 
     def fetch(self, item):
         channels, y, x = item
-        res = self._descriptor.read([ch+1 for ch in channels],
-                                    window=((y.start, y.stop),
-                                            (x.start, x.stop)),
-                                    boundless=True).astype(np.uint8)
-        return res
+        return self._descriptor.read([ch+1 for ch in channels],
+                                     window=((y.start, y.stop),
+                                             (x.start, x.stop)))
 
     @property
     def profile(self):
@@ -46,6 +44,12 @@ def count(self):
             raise ValueError(f'File {self._path} is not opened')
         return self._descriptor.count
 
+    @property
+    def dtype(self):
+        if not self._descriptor:
+            raise ValueError(f'File {self._path} is not opened')
+        return self._descriptor.profile['dtype']
+
 
 class RasterioWriter(ImageWriter, RasterioReader):
     def __init__(self, path, profile, padding_mode: str = 'constant', **kwargs):

aeronet_raster/aeronet_raster/dataprocessor.py

@@ -58,7 +58,6 @@ 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
@@ -173,6 +172,8 @@ def add_ch_ndim(size, n_ch):
         processor = get_auto_cropped_processor(processor, dst_margin, mode)
         dst_margin = np.array((0, 0, 0))  # zero margin
     elif mode == 'crossfade':
+        if dst.dtype not in ('float', 'float32', 'float16', np.float64):
+            logging.warning(f'For crossfade mode it is recommended to set destination dtype to float, got {dst.dtype}')
         mask = get_blend_mask(dst_sample_size, dst_margin)
         processor = get_auto_cropped_processor(processor, dst_margin, mode, mask)
 

aeronet_raster/test/unit/crossfade_test.py

@@ -1,16 +1,18 @@
 import numpy as np
 from aeronet_raster.aeronet_raster import dataprocessor
 from aeronet_raster.aeronet_raster.dataadapters import rasterioadapter
+import logging
+logging.basicConfig(level=logging.INFO)
 
-with rasterioadapter.RasterioReader('test_data/input.tif') as src:
+with rasterioadapter.RasterioReader('test_data/input2.tif') as src:
     profile = src.profile
     profile['dtype'] = 'float32'
     with rasterioadapter.RasterioWriter('test_data/output.tif', profile) as dst:
         dataprocessor.process_image(src=src,
                                     src_sample_size=512,
                                     src_margin=64,
-                                    processor=lambda x: x,
+                                    processor=lambda x: x,#np.ones((3, 512, 512))*127,
                                     dst=dst,
                                     mode='crossfade',
-                                    verbose=False)
+                                    verbose=True)