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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rio-tiler
-Version: 7.5.1
+Version: 7.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/
@@ -58,7 +58,7 @@ Requires-Dist: morecantile<7.0,>=5.0
 Requires-Dist: numexpr
 Requires-Dist: numpy
 Requires-Dist: pydantic~=2.0
-Requires-Dist: pystac>=0.5.4
+Requires-Dist: pystac<2.0,>=1.9
 Requires-Dist: rasterio>=1.4.0
 Requires-Dist: typing-extensions
 Provides-Extra: benchmark

{rio_tiler-7.5.1 → rio_tiler-7.6.0}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "numpy",
     "morecantile>=5.0,<7.0",
     "pydantic~=2.0",
-    "pystac>=0.5.4",
+    "pystac>=1.9,<2.0",
     "rasterio>=1.4.0",
     "color-operations",
     "typing-extensions",
@@ -161,7 +161,7 @@ exclude = [
 max-complexity = 14
 
 [tool.bumpversion]
-current_version = "7.5.1"
+current_version = "7.6.0"
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

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

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

{rio_tiler-7.5.1 → rio_tiler-7.6.0}/rio_tiler/io/rasterio.py

@@ -638,6 +638,7 @@ class ImageReader(Reader):
         indexes: Optional[Indexes] = None,
         expression: Optional[str] = None,
         force_binary_mask: bool = True,
+        out_dtype: Optional[Union[str, numpy.dtype]] = None,
         resampling_method: RIOResampling = "nearest",
         unscale: bool = False,
         post_process: Optional[
@@ -675,6 +676,7 @@ class ImageReader(Reader):
             indexes=indexes,
             expression=expression,
             force_binary_mask=force_binary_mask,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             unscale=unscale,
             post_process=post_process,
@@ -689,6 +691,7 @@ class ImageReader(Reader):
         height: Optional[int] = None,
         width: Optional[int] = None,
         force_binary_mask: bool = True,
+        out_dtype: Optional[Union[str, numpy.dtype]] = None,
         resampling_method: RIOResampling = "nearest",
         unscale: bool = False,
         post_process: Optional[
@@ -731,6 +734,7 @@ class ImageReader(Reader):
             height=height,
             indexes=indexes,
             force_binary_mask=force_binary_mask,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             unscale=unscale,
             post_process=post_process,
@@ -748,6 +752,8 @@ class ImageReader(Reader):
         y: float,
         indexes: Optional[Indexes] = None,
         expression: Optional[str] = None,
+        out_dtype: Optional[Union[str, numpy.dtype]] = None,
+        resampling_method: RIOResampling = "nearest",
         unscale: bool = False,
         post_process: Optional[
             Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]
@@ -760,6 +766,7 @@ class ImageReader(Reader):
             y (float): Y coordinate.
             indexes (sequence of int or int, optional): Band indexes.
             expression (str, optional): rio-tiler expression (e.g. b1/b2+b3).
+            resampling_method (RIOResampling, optional): RasterIO resampling algorithm. Defaults to `nearest`.
             unscale (bool, optional): Apply 'scales' and 'offsets' on output data value. Defaults to `False`.
             post_process (callable, optional): Function to apply on output data and mask values.
 
@@ -775,6 +782,8 @@ class ImageReader(Reader):
             expression=expression,
             unscale=unscale,
             post_process=post_process,
+            out_dtype=out_dtype,
+            resampling_method=resampling_method,
             window=Window(col_off=x, row_off=y, width=1, height=1),
         )
 
@@ -784,6 +793,7 @@ class ImageReader(Reader):
             coordinates=self.dataset.xy(x, y),
             crs=self.dataset.crs,
             band_names=img.band_names,
+            pixel_location=(x, y),
         )
 
     def feature(  # type: ignore
@@ -795,6 +805,7 @@ class ImageReader(Reader):
         height: Optional[int] = None,
         width: Optional[int] = None,
         force_binary_mask: bool = True,
+        out_dtype: Optional[Union[str, numpy.dtype]] = None,
         resampling_method: RIOResampling = "nearest",
         unscale: bool = False,
         post_process: Optional[
@@ -814,6 +825,7 @@ class ImageReader(Reader):
             height=height,
             width=width,
             force_binary_mask=force_binary_mask,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             unscale=unscale,
             post_process=post_process,

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

@@ -227,6 +227,7 @@ class XarrayReader(BaseReader):
         auto_expand: bool = True,
         nodata: Optional[NoData] = None,
         indexes: Optional[Indexes] = None,
+        out_dtype: str | numpy.dtype | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read a Web Map tile from a dataset.
@@ -278,6 +279,8 @@ class XarrayReader(BaseReader):
             stats = ((minv, maxv),) * da.rio.count
 
         arr = da.to_masked_array()
+        if out_dtype:
+            arr = arr.astype(out_dtype)
         arr.mask |= arr.data == da.rio.nodata
 
         output_bounds = da.rio._unordered_bounds()
@@ -306,6 +309,7 @@ class XarrayReader(BaseReader):
         height: Optional[int] = None,
         width: Optional[int] = None,
         resampling_method: RIOResampling = "nearest",
+        out_dtype: str | numpy.dtype | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read part of a dataset.
@@ -368,6 +372,8 @@ class XarrayReader(BaseReader):
             stats = ((minv, maxv),) * da.rio.count
 
         arr = da.to_masked_array()
+        if out_dtype:
+            arr = arr.astype(out_dtype)
         arr.mask |= arr.data == da.rio.nodata
 
         output_bounds = da.rio._unordered_bounds()
@@ -407,6 +413,7 @@ class XarrayReader(BaseReader):
         dst_crs: Optional[CRS] = None,
         reproject_method: WarpResampling = "nearest",
         resampling_method: RIOResampling = "nearest",
+        out_dtype: str | numpy.dtype | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Return a preview of a dataset.
@@ -458,6 +465,8 @@ class XarrayReader(BaseReader):
             stats = ((minv, maxv),) * da.rio.count
 
         arr = da.to_masked_array()
+        if out_dtype:
+            arr = arr.astype(out_dtype)
         arr.mask |= arr.data == da.rio.nodata
 
         output_bounds = da.rio._unordered_bounds()
@@ -494,6 +503,7 @@ class XarrayReader(BaseReader):
         coord_crs: CRS = WGS84_CRS,
         nodata: Optional[NoData] = None,
         indexes: Optional[Indexes] = None,
+        out_dtype: str | numpy.dtype | None = None,
         **kwargs: Any,
     ) -> PointData:
         """Read a pixel value from a dataset.
@@ -528,6 +538,8 @@ class XarrayReader(BaseReader):
         else:
             arr = da[:, int(y[0]), int(x[0])].to_masked_array()
 
+        if out_dtype:
+            arr = arr.astype(out_dtype)
         arr.mask |= arr.data == da.rio.nodata
 
         return PointData(
@@ -535,6 +547,7 @@ class XarrayReader(BaseReader):
             coordinates=(lon, lat),
             crs=coord_crs,
             band_names=band_names,
+            pixel_location=(x, y),
         )
 
     def feature(
@@ -550,6 +563,7 @@ class XarrayReader(BaseReader):
         height: Optional[int] = None,
         width: Optional[int] = None,
         resampling_method: RIOResampling = "nearest",
+        out_dtype: str | numpy.dtype | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read part of a dataset defined by a geojson feature.
@@ -589,6 +603,7 @@ class XarrayReader(BaseReader):
             height=height,
             reproject_method=reproject_method,
             resampling_method=resampling_method,
+            out_dtype=out_dtype,
         )
 
         if dst_crs != shape_crs:

{rio_tiler-7.5.1 → rio_tiler-7.6.0}/rio_tiler/models.py

@@ -158,6 +158,9 @@ class PointData:
     crs: Optional[CRS] = attr.ib(default=None, kw_only=True)
     assets: Optional[List] = attr.ib(default=None, kw_only=True)
     metadata: Optional[Dict] = attr.ib(factory=dict, kw_only=True)
+    pixel_location: Optional[Tuple[NumType, NumType]] = attr.ib(
+        default=None, kw_only=True
+    )
 
     @array.validator
     def _validate_data(self, attribute, value):
@@ -241,9 +244,9 @@ class PointData:
         return cls(
             arr,
             assets=assets,
-            crs=data[0].crs,
-            coordinates=data[0].coordinates,
             band_names=band_names,
+            coordinates=data[0].coordinates,
+            crs=data[0].crs,
             metadata=metadata,
         )
 
@@ -262,6 +265,7 @@ class PointData:
             coordinates=self.coordinates,
             band_names=blocks,
             metadata=self.metadata,
+            pixel_location=self.pixel_location,
         )
 
 

{rio_tiler-7.5.1 → rio_tiler-7.6.0}/rio_tiler/reader.py

@@ -11,7 +11,7 @@ from rasterio import windows
 from rasterio.crs import CRS
 from rasterio.enums import ColorInterp, Resampling
 from rasterio.io import DatasetReader, DatasetWriter
-from rasterio.transform import array_bounds
+from rasterio.transform import array_bounds, rowcol
 from rasterio.vrt import WarpedVRT
 from rasterio.warp import transform as transform_coords
 from rasterio.warp import transform_bounds
@@ -94,6 +94,7 @@ def read(
     force_binary_mask: bool = True,
     nodata: Optional[NoData] = None,
     vrt_options: Optional[Dict] = None,
+    out_dtype: Optional[Union[str, numpy.dtype]] = None,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
     unscale: bool = False,
@@ -151,7 +152,6 @@ def read(
                         "nodata": nodata,
                         "add_alpha": False,
                         "src_nodata": nodata,
-                        "dtype": src_dst.dtypes[0],
                     }
                 )
 
@@ -204,6 +204,7 @@ def read(
                     ),
                     resampling=io_resampling,
                     boundless=boundless,
+                    out_dtype=out_dtype,
                 )
                 mask = dataset.read(
                     indexes=(alpha_idx,),
@@ -211,6 +212,7 @@ def read(
                     out_shape=(1, height, width) if height and width else None,
                     resampling=io_resampling,
                     boundless=boundless,
+                    out_dtype=out_dtype,
                 )
                 data = numpy.ma.MaskedArray(values)
                 data.mask = ~mask.astype("bool")
@@ -223,6 +225,7 @@ def read(
                     out_shape=(len(idx), height, width) if height and width else None,
                     resampling=io_resampling,
                     boundless=boundless,
+                    out_dtype=out_dtype,
                 )
                 mask = ~values[-1].astype("bool")
                 data = numpy.ma.MaskedArray(values[0:-1])
@@ -237,6 +240,7 @@ def read(
                 boundless=boundless,
                 masked=True,
                 fill_value=nodata,
+                out_dtype=out_dtype,
             )
 
             # if data has Nodata then we simply make sure the mask == the nodata
@@ -308,6 +312,7 @@ def part(
     force_binary_mask: bool = True,
     nodata: Optional[NoData] = None,
     vrt_options: Optional[Dict] = None,
+    out_dtype: Optional[Union[str, numpy.dtype]] = None,
     align_bounds_with_dataset: bool = False,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
@@ -430,6 +435,7 @@ def part(
             window=window,
             nodata=nodata,
             vrt_options=vrt_params,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             reproject_method=reproject_method,
             force_binary_mask=force_binary_mask,
@@ -467,6 +473,7 @@ def part(
             height=height,
             window=window,
             nodata=nodata,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             reproject_method=reproject_method,
             force_binary_mask=force_binary_mask,
@@ -490,6 +497,7 @@ def part(
         height=height,
         window=window,
         nodata=nodata,
+        out_dtype=out_dtype,
         resampling_method=resampling_method,
         reproject_method=reproject_method,
         force_binary_mask=force_binary_mask,
@@ -506,8 +514,10 @@ def point(
     force_binary_mask: bool = True,
     nodata: Optional[NoData] = None,
     vrt_options: Optional[Dict] = None,
+    out_dtype: Optional[Union[str, numpy.dtype]] = None,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
+    interpolate: bool = False,
     unscale: bool = False,
     post_process: Optional[Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]] = None,
 ) -> PointData:
@@ -520,8 +530,9 @@ def point(
         coord_crs (rasterio.crs.CRS, optional): Coordinate Reference System of the input coords. Defaults to `epsg:4326`.
         nodata (int or float, optional): Overwrite dataset internal nodata value.
         vrt_options (dict, optional): Options to be passed to the rasterio.warp.WarpedVRT class.
-        resampling_method (RIOResampling, optional): RasterIO resampling algorithm. Defaults to `nearest`.
+        resampling_method (RIOResampling, optional): RasterIO resampling algorithm. Only used when `interpolate=True`. Defaults to `nearest`.
         reproject_method (WarpResampling, optional): WarpKernel resampling algorithm. Defaults to `nearest`.
+        interpolate (bool, optional): Interpolate pixels around the coordinates. Defaults to `False`.
         unscale (bool, optional): Apply 'scales' and 'offsets' on output data value. Defaults to `False`.
         post_process (callable, optional): Function to apply on output data and mask values.
 
@@ -537,6 +548,7 @@ def point(
             vrt_params = {
                 "add_alpha": True,
                 "resampling": Resampling[reproject_method],
+                "dtype": src_dst.dtypes[0],
             }
             nodata = nodata if nodata is not None else src_dst.nodata
             if nodata is not None:
@@ -580,11 +592,30 @@ def point(
         ):
             raise PointOutsideBounds("Point is outside dataset bounds")
 
-        row, col = dataset.index(lon, lat)
+        if interpolate:
+            # Ref: https://github.com/cogeotiff/rio-tiler/issues/793
+            # https://github.com/OSGeo/gdal/blob/a3d68b069e6b3676ba437faca5dca6ae2076ce24/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py#L185-L197
+            rows, cols = rowcol(dataset.transform, xs=[lon], ys=[lat], op=lambda x: x)
+            row, col = float(rows[0]), float(cols[0])
+            row_off, col_off = row - 0.5, col - 0.5
+
+        else:
+            if resampling_method != "nearest":
+                warnings.warn(
+                    f"{resampling_method} resampling will be ignored when `interpolate=False`.",
+                    UserWarning,
+                )
+
+            row, col = dataset.index(lon, lat)
+            row_off, col_off = row, col
+
+        window = windows.Window(row_off=row_off, col_off=col_off, width=1, height=1)
+
         img = read(
             dataset,
             indexes=indexes,
-            window=windows.Window(row_off=row, col_off=col, width=1, height=1),
+            window=window,
+            out_dtype=out_dtype,
             resampling_method=resampling_method,
             force_binary_mask=force_binary_mask,
             unscale=unscale,
@@ -593,8 +624,9 @@ def point(
 
         return PointData(
             img.array[:, 0, 0],
+            band_names=img.band_names,
             coordinates=coordinates,
             crs=coord_crs,
-            band_names=img.band_names,
             metadata=dataset.tags(),
+            pixel_location=(col, row),
         )