rio-tiler 7.2.0__tar.gz → 7.2.1__tar.gz

{rio_tiler-7.2.0 → rio_tiler-7.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rio-tiler
-Version: 7.2.0
+Version: 7.2.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/
@@ -37,8 +37,6 @@ License: BSD 3-Clause License
         CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
         OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License-File: AUTHORS.txt
-License-File: LICENSE
 Keywords: COGEO,Cloud Optimized Geotiff,STAC,rasterio,slippy-map
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research

{rio_tiler-7.2.0 → rio_tiler-7.2.1}/pyproject.toml

@@ -158,7 +158,7 @@ ignore = [
 max-complexity = 14
 
 [tool.bumpversion]
-current_version = "7.2.0"
+current_version = "7.2.1"
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

{rio_tiler-7.2.0 → rio_tiler-7.2.1}/rio_tiler/__init__.py

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

{rio_tiler-7.2.0 → rio_tiler-7.2.1}/rio_tiler/colormap.py

@@ -4,6 +4,7 @@ import json
 import os
 import pathlib
 import re
+import warnings
 from typing import Dict, List, Sequence, Tuple, Union
 
 import attr
@@ -18,6 +19,7 @@ from rio_tiler.errors import (
 from rio_tiler.types import (
     ColorMapType,
     DataMaskType,
+    DiscreteColorMapType,
     GDALColorMapType,
     IntervalColorMapType,
 )
@@ -116,28 +118,38 @@ def apply_cmap(data: numpy.ndarray, colormap: ColorMapType) -> DataMaskType:
     # rio_tiler.colormap.make_lut, because we don't want to create a `lookup table`
     # with more than 256 entries (256 x 4) array. In this case we use `apply_discrete_cmap`
     # which can work with arbitrary colormap dict.
-    if len(colormap) != 256 or max(colormap) >= 256 or min(colormap) < 0:
+    if (
+        len(colormap) != 256
+        or max(colormap) >= 256
+        or min(colormap) < 0
+        or any(isinstance(k, float) for k in colormap)
+    ):
         return apply_discrete_cmap(data, colormap)
 
-    lookup_table = make_lut(colormap)
+    # For now we assume ColorMap are in uint8
+    if data.dtype != numpy.uint8:
+        warnings.warn(
+            f"Input array is of type {data.dtype} and `will be converted to Int in order to apply the ColorMap.",
+            UserWarning,
+        )
+        data = data.astype(numpy.uint8)
+
+    lookup_table = make_lut(colormap)  # type: ignore
     data = lookup_table[data[0], :]
 
     data = numpy.transpose(data, [2, 0, 1])
 
-    # If the colormap has values between 0-255
-    # we cast the output array to Uint8.
-    if data.min() >= 0 and data.max() <= 255:
-        data = data.astype("uint8")
-
     return data[:-1], data[-1]
 
 
-def apply_discrete_cmap(data: numpy.ndarray, colormap: GDALColorMapType) -> DataMaskType:
+def apply_discrete_cmap(
+    data: numpy.ndarray, colormap: Union[GDALColorMapType, DiscreteColorMapType]
+) -> DataMaskType:
     """Apply discrete colormap.
 
     Args:
         data (numpy.ndarray): 1D image array to translate to RGB.
-        colormap (GDALColorMapType): Discrete ColorMap dictionary.
+        colormap (GDALColorMapType or DiscreteColorMapType): Discrete ColorMap dictionary.
 
     Returns:
         tuple: Data (numpy.ndarray) and Alpha band (numpy.ndarray).

{rio_tiler-7.2.0 → rio_tiler-7.2.1}/rio_tiler/types.py

@@ -18,11 +18,15 @@ IntervalTuple = Tuple[NumType, NumType]  # (0, 100)
 # ColorMap Dict: {1: (0, 0, 0, 255), ...}
 GDALColorMapType = Dict[int, ColorTuple]
 
+# Discrete Colormap, like GDALColorMapType but accept Float: {0.1: (0, 0, 0, 255), ...}
+DiscreteColorMapType = Dict[NumType, ColorTuple]
+
 # Intervals ColorMap: [((0, 1), (0, 0, 0, 0)), ...]
 IntervalColorMapType = Sequence[Tuple[IntervalTuple, ColorTuple]]
 
 ColorMapType = Union[
     GDALColorMapType,
+    DiscreteColorMapType,
     IntervalColorMapType,
 ]