rio-tiler 6.4.6__tar.gz → 6.5.0__tar.gz

{rio_tiler-6.4.6 → rio_tiler-6.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rio-tiler
-Version: 6.4.6
+Version: 6.5.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.6 → rio_tiler-6.5.0}/rio_tiler/__init__.py

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

{rio_tiler-6.4.6 → rio_tiler-6.5.0}/rio_tiler/io/base.py

@@ -48,6 +48,18 @@ class SpatialMixin:
     def geographic_bounds(self) -> BBox:
         """Return dataset bounds in geographic_crs."""
         if self.crs == self.geographic_crs:
+            if self.bounds[1] > self.bounds[3]:
+                warnings.warn(
+                    "BoundingBox of the dataset is inverted (minLat > maxLat).",
+                    UserWarning,
+                )
+                return (
+                    self.bounds[0],
+                    self.bounds[3],
+                    self.bounds[2],
+                    self.bounds[1],
+                )
+
             return self.bounds
 
         try:

{rio_tiler-6.4.6 → rio_tiler-6.5.0}/rio_tiler/io/xarray.py

@@ -401,7 +401,7 @@ class XarrayReader(BaseReader):
 
         y, x = rowcol(ds.rio.transform(), ds_lon, ds_lat)
 
-        arr = ds[:, y[0], x[0]].to_masked_array()
+        arr = ds[:, int(y[0]), int(x[0])].to_masked_array()
         arr.mask |= arr.data == ds.rio.nodata
 
         return PointData(

{rio_tiler-6.4.6 → rio_tiler-6.5.0}/rio_tiler/reader.py

@@ -142,11 +142,17 @@ def read(
                 "crs": dst_crs,
                 "add_alpha": True,
                 "resampling": warp_resampling,
+                "dtype": src_dst.dtypes[0],
             }
 
             if nodata is not None:
                 vrt_params.update(
-                    {"nodata": nodata, "add_alpha": False, "src_nodata": nodata}
+                    {
+                        "nodata": nodata,
+                        "add_alpha": False,
+                        "src_nodata": nodata,
+                        "dtype": src_dst.dtypes[0],
+                    }
                 )
 
             if has_alpha_band(src_dst):
@@ -360,6 +366,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,
         )
@@ -378,6 +386,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,
             )
@@ -396,6 +406,7 @@ def part(
             "transform": vrt_transform,
             "width": vrt_width,
             "height": vrt_height,
+            "dtype": src_dst.dtypes[0],
         }
         if vrt_options:
             vrt_params.update(**vrt_options)

{rio_tiler-6.4.6 → rio_tiler-6.5.0}/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`.
 
@@ -334,6 +334,23 @@ def get_vrt_transform(
             src_height = round(w.height)
             src_width = round(w.width)
 
+        # Specific FIX when bounds and transform are inverted
+        # See: https://github.com/US-GHG-Center/veda-config-ghg/pull/333
+        elif (
+            src_dst.crs == WGS84_CRS
+            and dst_crs == WEB_MERCATOR_CRS
+            and (src_bounds[1] > 85.06 or src_bounds[3] < -85.06)
+        ):
+            warnings.warn(
+                "Adjusting dataset latitudes to avoid re-projection overflow",
+                UserWarning,
+            )
+            src_bounds[1] = min(src_bounds[1], 85.06)
+            src_bounds[3] = max(src_bounds[3], -85.06)
+            w = windows.from_bounds(*src_bounds, transform=src_dst.transform)
+            src_height = round(w.height)
+            src_width = round(w.width)
+
         dst_transform, _, _ = calculate_default_transform(
             src_dst.crs, dst_crs, src_width, src_height, *src_bounds
         )
@@ -367,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