rio-tiler 7.6.1__py3-none-any.whl → 7.7.1__py3-none-any.whl

rio_tiler/__init__.py

@@ -1,6 +1,6 @@
 """rio-tiler."""
 
-__version__ = "7.6.1"
+__version__ = "7.7.1"
 
 from . import (  # noqa
     colormap,

rio_tiler/reader.py

@@ -58,6 +58,12 @@ def _get_width_height(max_size, dataset_height, dataset_width) -> Tuple[int, int
     return height, width
 
 
+def _missing_size(w: Optional[int] = None, h: Optional[int] = None):
+    """Check if one and only one size (width, height) is valid."""
+    iterator = iter([w, h])
+    return any(iterator) and not any(iterator)
+
+
 def _apply_buffer(
     buffer: float,
     bounds: BBox,
@@ -124,11 +130,12 @@ def read(
     """
     indexes = cast_to_sequence(indexes)
 
-    if max_size and width and height:
+    if max_size and (width or height):
         warnings.warn(
-            "'max_size' will be ignored with with 'height' and 'width' set.",
+            "'max_size' will be ignored with with 'height' or 'width' set.",
             UserWarning,
         )
+        max_size = None
 
     io_resampling = Resampling[resampling_method]
     warp_resampling = Resampling[reproject_method]
@@ -167,12 +174,11 @@ def read(
         else:
             dataset = src_dst
 
-        if max_size and not (width and height):
-            height, width = _get_width_height(max_size, dataset.height, dataset.width)
-
         if indexes is None:
             indexes = non_alpha_indexes(dataset)
 
+        max_height, max_width = dataset.height, dataset.width
+
         boundless = False
         if window:
             if isinstance(window, tuple):
@@ -188,6 +194,18 @@ def read(
             ):
                 boundless = True
 
+            max_height, max_width = window.height, window.width
+
+        if max_size:
+            height, width = _get_width_height(max_size, max_height, max_width)
+
+        elif _missing_size(width, height):
+            ratio = max_height / max_width
+            if width:
+                height = math.ceil(width * ratio)
+            else:
+                width = math.ceil(height / ratio)
+
         if ColorInterp.alpha in dataset.colorinterp and nodata is None:
             # If dataset has an alpha band we need to get the mask using the alpha band index
             # and then split the data and mask values
@@ -345,11 +363,12 @@ def part(
         ImageData
 
     """
-    if max_size and width and height:
+    if max_size and (width or height):
         warnings.warn(
-            "'max_size' will be ignored with with 'height' and 'width' set.",
+            "'max_size' will be ignored with with 'height' or 'width' set.",
             UserWarning,
         )
+        max_size = None
 
     if buffer and buffer % 0.5:
         raise InvalidBufferSize(
@@ -389,9 +408,16 @@ def part(
         )
         bounds = array_bounds(vrt_height, vrt_width, vrt_transform)
 
-        if max_size and not (width and height):
+        if max_size:
             height, width = _get_width_height(max_size, vrt_height, vrt_width)
 
+        elif _missing_size(width, height):
+            ratio = vrt_height / vrt_width
+            if width:
+                height = math.ceil(width * ratio)
+            else:
+                width = math.ceil(height / ratio)
+
         height = height or vrt_height
         width = width or vrt_width
 
@@ -449,11 +475,18 @@ def part(
         window = _round_window(window)
         bounds = windows.bounds(window, src_dst.transform)
 
-    if max_size and not (width and height):
+    if max_size:
         height, width = _get_width_height(
             max_size, round(window.height), round(window.width)
         )
 
+    elif _missing_size(width, height):
+        ratio = window.height / window.width
+        if width:
+            height = math.ceil(width * ratio)
+        else:
+            width = math.ceil(height / ratio)
+
     height = height or max(1, round(window.height))
     width = width or max(1, round(window.width))
 

rio_tiler/types.py

@@ -45,7 +45,7 @@ RIOResampling = Literal[
 ]
 
 # WarpKernel resampling method.
-# ref: https://gdal.org/api/gdalwarp_cpp.html#_CPPv4N14GDALWarpKernel9eResampleE
+# ref: https://gdal.org/en/stable/api/gdalwarp_cpp.html#_CPPv415GDALResampleAlg
 WarpResampling = Literal[
     "nearest",
     "bilinear",
@@ -54,6 +54,11 @@ WarpResampling = Literal[
     "lanczos",
     "average",
     "mode",
+    "max",
+    "min",
+    "med",
+    "q1",
+    "q3",
     "sum",
     "rms",
 ]

rio_tiler/utils.py

@@ -417,7 +417,17 @@ def get_vrt_transform(
     # NOTE: When we have desired output height/width, we can use them to
     # calculate the output size/transform. The VRT resolution will be aligned with the desired
     # output resolution (if not bigger)
-    if height and width:
+    if height or width:
+        if not height or not width:
+            # get the size's ratio of the reprojected dataset
+            _w = max(1, round((e - w) / w_res))
+            _h = max(1, round((s - n) / h_res))
+            ratio = _h / _w
+            if width:
+                height = math.ceil(width * ratio)
+            else:
+                width = math.ceil(height / ratio)
+
         output_transform = from_bounds(w, s, e, n, width, height)
 
         # NOTE: Here we check if the Output Resolution is higher thant the dataset resolution (OverZoom)

{rio_tiler-7.6.1.dist-info → rio_tiler-7.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rio-tiler
-Version: 7.6.1
+Version: 7.7.1
 Summary: User friendly Rasterio plugin to read raster datasets.
 Project-URL: Homepage, https://cogeotiff.github.io/rio-tiler/
 Project-URL: Documentation, https://cogeotiff.github.io/rio-tiler/

{rio_tiler-7.6.1.dist-info → rio_tiler-7.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rio_tiler/__init__.py,sha256=NgOJMHNbvepJT4EulIhtQrgLUPQU3uS4Dz6TrWxuE24,192
+rio_tiler/__init__.py,sha256=JiD_xTZTq-TugZlBpLQ1MOF5lKKzuuXUScj4Ot0TKq8,192
 rio_tiler/colormap.py,sha256=E2FYp6AysmnSAhj2901XUrgB2q-8OvO8zoe_hmM_UZU,11186
 rio_tiler/constants.py,sha256=55i-7JZDupTXZdLgxL03KsgM4lAzuGuIVP1zZKktzp0,426
 rio_tiler/errors.py,sha256=dnaAHPc5VL7SNKXm00gzlrU_4XIuw5rwzD-9Q2kFJsc,2018
@@ -7,10 +7,10 @@ rio_tiler/logger.py,sha256=RR8lnW3uVXkFkPa3nNJS_tTndmdiNNDVXpCDGDxGf0A,81
 rio_tiler/models.py,sha256=jmFmqrJghjLlPdxceccGvhhsQg9zqkIZUbST6BzAJbQ,27878
 rio_tiler/profiles.py,sha256=EAx2JdcaOcMw5PZjxbCqQBXXWMac9mjtpHoVFPJEDNQ,1562
 rio_tiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rio_tiler/reader.py,sha256=bUcl68xbnb431oo_nIAOvmPrJBGS3xPfmIdMt_mBvQQ,24156
+rio_tiler/reader.py,sha256=C8IQY91PeBA-p14sDVFIoDYJKmIPZ1GcvJtJSuHmB4U,25119
 rio_tiler/tasks.py,sha256=tiQo24rZHBVxids40QkNInuMzDFEei08zYW3I_pkSVE,3157
-rio_tiler/types.py,sha256=wrGiiGBQ-WdzHf-lEypiH3cub7Knu_rXJw7EWZ2FAS8,1632
-rio_tiler/utils.py,sha256=uX8C0RxB_u1sJI3MCvQMdlolDJcWW5G4waU08VfYRF4,30249
+rio_tiler/types.py,sha256=R9XOL-EEb_cwbD4SFNVmViXC84D2p4BEVNCXg0nlh7I,1684
+rio_tiler/utils.py,sha256=iWBm0uoWAbZ1dna5sT1JtjmdvwwVpvB1_uLr0zYbL5M,30611
 rio_tiler/cmap_data/__init__.py,sha256=8FtVmfpTjXlvhxQ5QesN0UC1m_B3MuF3LbGbhMC5Rw4,1039
 rio_tiler/cmap_data/accent.npy,sha256=Qde1ldOoXghe4L05v1QbVvnMA1ldwNjKWPf5xCBbmI4,1152
 rio_tiler/cmap_data/accent_r.npy,sha256=ba-GWSMSPRAcm9CGzlXJeNG4ABbBHDCV602hAWV2idc,1152
@@ -235,8 +235,8 @@ rio_tiler/mosaic/reader.py,sha256=_YBwTJwHvXOzKwpNpOmmh0F4yicyxgWo9vHyof3w_Do,96
 rio_tiler/mosaic/methods/__init__.py,sha256=tgkXM9skaTLXIm5QFoheOEznQXM97KGflcAWHfkrt1g,612
 rio_tiler/mosaic/methods/base.py,sha256=9YZJWVRwH5Fk9KO9q5CW52Q8Mf60tAJ21oM4ixEDXBo,1424
 rio_tiler/mosaic/methods/defaults.py,sha256=z34lna2wGXnAPwculjk_6hDrloqS8wzer68FFoIo7pg,6744
-rio_tiler-7.6.1.dist-info/METADATA,sha256=Yl0OYYTGfxeu5aTKJ0WEE1wjk9EN08OMKYH1bRLEeF8,12233
-rio_tiler-7.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-rio_tiler-7.6.1.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
-rio_tiler-7.6.1.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
-rio_tiler-7.6.1.dist-info/RECORD,,
+rio_tiler-7.7.1.dist-info/METADATA,sha256=JLEAxqf-a9ope_eN3cZ1Spa21PV4pFyfzV2nCl2Qgg0,12233
+rio_tiler-7.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+rio_tiler-7.7.1.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
+rio_tiler-7.7.1.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
+rio_tiler-7.7.1.dist-info/RECORD,,