rio-tiler 6.4.7__py3-none-any.whl → 6.6.0__py3-none-any.whl

rio_tiler/__init__.py

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

rio_tiler/io/rasterio.py

@@ -265,11 +265,9 @@ class Reader(BaseReader):
             "width": self.dataset.width,
             "height": self.dataset.height,
             "overviews": self.dataset.overviews(1),
+            "scales": self.dataset.scales,
+            "offsets": self.dataset.offsets,
         }
-        if self.dataset.scales[0] != 1.0 or self.dataset.offsets[0] != 0.0:
-            meta.update(
-                {"scale": self.dataset.scales[0], "offset": self.dataset.offsets[0]}
-            )
 
         if self.colormap:
             meta.update({"colormap": self.colormap})

rio_tiler/models.py

@@ -77,8 +77,8 @@ class Info(SpatialInfo):
     dtype: str
     nodata_type: Literal["Alpha", "Mask", "Internal", "Nodata", "None"]
     colorinterp: Optional[List[str]] = None
-    scale: Optional[float] = None
-    offset: Optional[float] = None
+    scales: Optional[List[float]] = None
+    offsets: Optional[List[float]] = None
     colormap: Optional[GDALColorMapType] = None
 
     model_config = {"extra": "allow"}
@@ -331,7 +331,7 @@ class ImageData:
     )
     crs: Optional[CRS] = attr.ib(default=None, kw_only=True)
     metadata: Optional[Dict] = attr.ib(factory=dict, kw_only=True)
-    band_names: List[str] = attr.ib(kw_only=True)
+    band_names: Optional[List[str]] = attr.ib(kw_only=True)
     dataset_statistics: Optional[Sequence[Tuple[float, float]]] = attr.ib(
         default=None, kw_only=True
     )

rio_tiler/reader.py

@@ -261,8 +261,13 @@ def read(
 
         if unscale:
             data = data.astype("float32", casting="unsafe")
-            numpy.multiply(data, dataset.scales[0], out=data, casting="unsafe")
-            numpy.add(data, dataset.offsets[0], out=data, casting="unsafe")
+
+            # reshaped to match data
+            scales = numpy.array(dataset.scales).reshape(-1, 1, 1)
+            offsets = numpy.array(dataset.offsets).reshape(-1, 1, 1)
+
+            numpy.multiply(data, scales, out=data, casting="unsafe")
+            numpy.add(data, offsets, out=data, casting="unsafe")
 
         if post_process:
             data = post_process(data)
@@ -366,6 +371,8 @@ def part(
         vrt_transform, vrt_width, vrt_height = get_vrt_transform(
             src_dst,
             bounds,
+            height,
+            width,
             dst_crs=dst_crs,
             align_bounds_with_dataset=align_bounds_with_dataset,
         )
@@ -384,6 +391,8 @@ def part(
             vrt_transform, vrt_width, vrt_height = get_vrt_transform(
                 src_dst,
                 bounds,
+                height,
+                width,
                 dst_crs=dst_crs,
                 align_bounds_with_dataset=align_bounds_with_dataset,
             )

rio_tiler/utils.py

@@ -296,8 +296,8 @@ def get_vrt_transform(
     Args:
         src_dst (rasterio.io.DatasetReader or rasterio.io.DatasetWriter or rasterio.vrt.WarpedVRT): Rasterio dataset.
         bounds (tuple): Bounding box coordinates in target crs (**dst_crs**).
-        height (int, optional): Desired output height of the array for the input bounds.
-        width (int, optional): Desired output width of the array for the input bounds.
+        height (int, optional): Output height of the array for the input bounds.
+        width (int, optional): Output width of the array for the input bounds.
         dst_crs (rasterio.crs.CRS, optional): Target Coordinate Reference System. Defaults to `epsg:3857`.
         align_bounds_with_dataset (bool): Align input bounds with dataset transform. Defaults to `False`.
 
@@ -384,31 +384,35 @@ def get_vrt_transform(
 
     w, s, e, n = bounds
 
-    # TODO: Explain
-    if not height or not width:
-        vrt_width = max(1, round((e - w) / dst_transform.a))
-        vrt_height = max(1, round((s - n) / dst_transform.e))
-        vrt_transform = from_bounds(w, s, e, n, vrt_width, vrt_height)
-        return vrt_transform, vrt_width, vrt_height
-
-    # TODO: Explain
-    tile_transform = from_bounds(w, s, e, n, width, height)
-    w_res = (
-        tile_transform.a
-        if abs(tile_transform.a) < abs(dst_transform.a)
-        else dst_transform.a
-    )
-    h_res = (
-        tile_transform.e
-        if abs(tile_transform.e) < abs(dst_transform.e)
-        else dst_transform.e
-    )
+    # When no output size (resolution) - Use Dataset Resolution
+    # NOTE: When we don't `fix` the output width/height, we're using the reprojected dataset resolution
+    # to calculate what is the size/transform of the VRT
+    w_res = dst_transform.a
+    h_res = dst_transform.e
+
+    # 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:
+        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)
+        # When not overzooming we don't want to use the output Width/Height to calculate the transform
+        # See issues https://github.com/cogeotiff/rio-tiler/pull/648
+        w_res = (
+            output_transform.a
+            if abs(output_transform.a) < abs(dst_transform.a)
+            else dst_transform.a
+        )
+        h_res = (
+            output_transform.e
+            if abs(output_transform.e) < abs(dst_transform.e)
+            else dst_transform.e
+        )
 
-    # TODO: Explain
     vrt_width = max(1, round((e - w) / w_res))
     vrt_height = max(1, round((s - n) / h_res))
     vrt_transform = from_bounds(w, s, e, n, vrt_width, vrt_height)
-
     return vrt_transform, vrt_width, vrt_height
 
 

{rio_tiler-6.4.7.dist-info → rio_tiler-6.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rio-tiler
-Version: 6.4.7
+Version: 6.6.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-6.4.7.dist-info → rio_tiler-6.6.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-rio_tiler/__init__.py,sha256=vHddqRd_9wVkQaEb950PsIvnUUDBxfLLiDKLLnMEB80,192
+rio_tiler/__init__.py,sha256=KBppTQcprO6lj0jdPe52UbbmBDGLXnQ-eDtixrPuB1Q,192
 rio_tiler/colormap.py,sha256=uXeK2p-h6fMqTaCogHWkDP6AqJDtKCpCHa5ylRdEnj0,9775
 rio_tiler/constants.py,sha256=55i-7JZDupTXZdLgxL03KsgM4lAzuGuIVP1zZKktzp0,426
 rio_tiler/errors.py,sha256=ag-wNr13JaQ4YcQzWWPFzjegeGdzJIMMrOrbb3coQ40,1733
 rio_tiler/expression.py,sha256=EVHWgjMqIn4TTPfqT_HV1RWCQlxqOj3OtEr1iUDiFHE,2282
 rio_tiler/logger.py,sha256=RR8lnW3uVXkFkPa3nNJS_tTndmdiNNDVXpCDGDxGf0A,81
-rio_tiler/models.py,sha256=TlJ0VoZVIzeMDTzdGIxmBKutLcMpxRAAdrcWg63T5Ts,28149
+rio_tiler/models.py,sha256=slIxi1xjIdJ0fr1UmOxZzD3KGkJ3DADsC9DKEO5CjJM,28173
 rio_tiler/profiles.py,sha256=EAx2JdcaOcMw5PZjxbCqQBXXWMac9mjtpHoVFPJEDNQ,1562
 rio_tiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rio_tiler/reader.py,sha256=t8iMYYjfKKGvtSH7ljUdbmdilbTC50_98PwtTrFC7Ek,21841
+rio_tiler/reader.py,sha256=Bi8BbeIF7BDSOPLEyb153tdNQIiZgTY4l4vteg5FqN8,22080
 rio_tiler/tasks.py,sha256=tiQo24rZHBVxids40QkNInuMzDFEei08zYW3I_pkSVE,3157
 rio_tiler/types.py,sha256=508_E5R-nKrAo8TWB-6h7pF6SYwNM8kJPiHjQw-k-tA,1443
-rio_tiler/utils.py,sha256=ZbOG2eCHBY5gx82LcqLQzPMOy0kQ4Mimy1aA_6w0dAE,27257
+rio_tiler/utils.py,sha256=3TBlnQVFA-2igDpMrwxhjN_Quvc8t21xv7sQkM7e6dQ,27748
 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
@@ -225,7 +225,7 @@ rio_tiler/cmap_data/ylorrd.npy,sha256=9ImXljw40oe60w8uV4EMDPY4aFFVkGbyCBi6SlTX83
 rio_tiler/cmap_data/ylorrd_r.npy,sha256=K5uiHNHbLxV5SizyT09cSVAxldE-BW5GpOXxUp7UsTE,1152
 rio_tiler/io/__init__.py,sha256=_L4iILm6vSiJ14GEDDOvkuUHRtbWC9oqx6Bu8PxHhvA,270
 rio_tiler/io/base.py,sha256=_NB2xkC0qgk87pt8ofqayHznEVXMzgClE1PUogy_FYw,45645
-rio_tiler/io/rasterio.py,sha256=XBq3b3zXLg9R1g0SbPR2DGH8g8UbgOsgHC9QVmoW6yM,32154
+rio_tiler/io/rasterio.py,sha256=GW77fhWHPU1Ue8hifZhJA99pWDomsahJ9EDfVvu7GBo,32042
 rio_tiler/io/stac.py,sha256=4qU4mqssqzxyNYDNIB3U5x1D-9Q9aJyFF2hKUUDXJHg,10539
 rio_tiler/io/xarray.py,sha256=0e562x2zXtIrHkzwNXStyHEtYE9z4dgEvCkW0aCHvyw,17766
 rio_tiler/mosaic/__init__.py,sha256=Yj6CKpnFl8PJhLSp-a55wo33hKZ8-6OOBJtWA1HZVy8,118
@@ -233,8 +233,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-6.4.7.dist-info/METADATA,sha256=4SBddP6XLK-3pFOJGuxuW0gCfemnF-upGM-1mYXR8As,11920
-rio_tiler-6.4.7.dist-info/WHEEL,sha256=osohxoshIHTFJFVPhsi1UkZuLRGMHRXZzwEBW2ezjrc,87
-rio_tiler-6.4.7.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
-rio_tiler-6.4.7.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
-rio_tiler-6.4.7.dist-info/RECORD,,
+rio_tiler-6.6.0.dist-info/METADATA,sha256=7LKGbh4UH_R9XzxsXyHezpUM7fg0wdzC1y3tsdlmcTs,11920
+rio_tiler-6.6.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+rio_tiler-6.6.0.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
+rio_tiler-6.6.0.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
+rio_tiler-6.6.0.dist-info/RECORD,,

{rio_tiler-6.4.7.dist-info → rio_tiler-6.6.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.1
+Generator: hatchling 1.24.2
 Root-Is-Purelib: true
 Tag: py3-none-any