rio-tiler 7.6.0__tar.gz → 7.7.0__tar.gz

{rio_tiler-7.6.0 → rio_tiler-7.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rio-tiler
-Version: 7.6.0
+Version: 7.7.0
 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.0 → rio_tiler-7.7.0}/pyproject.toml

@@ -161,7 +161,7 @@ exclude = [
 max-complexity = 14
 
 [tool.bumpversion]
-current_version = "7.6.0"
+current_version = "7.7.0"
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

{rio_tiler-7.6.0 → rio_tiler-7.7.0}/rio_tiler/__init__.py

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

{rio_tiler-7.6.0 → rio_tiler-7.7.0}/rio_tiler/io/xarray.py

@@ -173,7 +173,7 @@ class XarrayReader(BaseReader):
         if indexes := cast_to_sequence(indexes):
             assert all(v > 0 for v in indexes), "Indexes value must be >= 1"
             if da.ndim == 2:
-                if indexes != (1,):
+                if set(indexes) != set({1}):
                     raise ValueError(
                         f"Invalid indexes {indexes} for array of shape {da.shape}"
                     )

{rio_tiler-7.6.0 → rio_tiler-7.7.0}/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-7.6.0 → rio_tiler-7.7.0}/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)