Skip to content

Commit

Permalink
remove band_expression option in MultiBandReader (#437)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincentsarago
vincentsarago authored Oct 14, 2021
1 parent 02f904c commit bcc996c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 50 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ with COGReader(
* remove `rio_tiler.io.base.SpatialMixin.spatial_info` and `rio_tiler.io.base.SpatialMixin.center` properties (https://github.com/cogeotiff/rio-tiler/pull/429)
* `rio_tiler.io.base.SpatialMixin.bounds` should now be in dataset's CRS (not in `WGS84`) (https://github.com/cogeotiff/rio-tiler/pull/429)
* Use `RIO_TILER_MAX_THREADS` environment variable instead of `MAX_THREADS` (author @rodrigoalmeida94, https://github.com/cogeotiff/rio-tiler/pull/432)
* remove `band_expression` in `rio_tiler.io.base.MultiBandReader` (https://github.com/cogeotiff/rio-tiler/pull/433)

# 2.1.3 (2021-09-14)

Expand Down
63 changes: 13 additions & 50 deletions rio_tiler/io/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,9 +1026,6 @@ def statistics(
self,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
categorical: bool = False,
categories: Optional[List[float]] = None,
percentiles: List[int] = [2, 98],
Expand All @@ -1041,19 +1038,19 @@ def statistics(
Args:
bands (sequence of str or str): bands to fetch info from. Required keyword argument.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band dataset (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the `self.reader.statistics` method.
categorical (bool): treat input data as categorical data. Defaults to False.
categories (list of numbers, optional): list of caterogies to return value for.
percentiles (list of numbers, optional): list of percentile values to calculate. Defaults to `[2, 98]`.
hist_options (dict, optional): Options to forward to numpy.histogram function.
max_size (int, optional): Limit the size of the longest dimension of the dataset read, respecting bounds X/Y aspect ratio. Defaults to 1024.
kwargs (optional): Options to forward to the `self.preview` method.
Returns:
dict: Multiple assets statistics in form of {"1": rio_tiler.models.BandStatistics, ...}.
dict: Multiple assets statistics in form of {"{band}/{expression}": rio_tiler.models.BandStatistics, ...}.
"""
data = self.preview(
bands=bands,
expression=expression,
band_expression=band_expression,
max_size=max_size,
**kwargs,
bands=bands, expression=expression, max_size=max_size, **kwargs,
)

hist_options = hist_options or {}
Expand All @@ -1078,9 +1075,6 @@ def tile(
tile_z: int,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
**kwargs: Any,
) -> ImageData:
"""Read and merge Web Map tiles multiple bands.
Expand All @@ -1091,7 +1085,6 @@ def tile(
tile_z (int): Tile's zoom level index.
bands (sequence of str or str, optional): bands to fetch info from.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the `self.reader.tile` method.
Returns:
Expand Down Expand Up @@ -1127,15 +1120,7 @@ def _reader(band: str, *args: Any, **kwargs: Any) -> ImageData:
data.band_names = [band]
return data

output = multi_arrays(
bands,
_reader,
tile_x,
tile_y,
tile_z,
expression=band_expression,
**kwargs,
)
output = multi_arrays(bands, _reader, tile_x, tile_y, tile_z, **kwargs,)

if expression:
blocks = expression.split(",")
Expand All @@ -1149,9 +1134,6 @@ def part(
bbox: BBox,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
**kwargs: Any,
) -> ImageData:
"""Read and merge parts from multiple bands.
Expand All @@ -1160,7 +1142,6 @@ def part(
bbox (tuple): Output bounds (left, bottom, right, top) in target crs.
bands (sequence of str or str, optional): bands to fetch info from.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the 'self.reader.part' method.
Returns:
Expand Down Expand Up @@ -1191,9 +1172,7 @@ def _reader(band: str, *args: Any, **kwargs: Any) -> ImageData:
data.band_names = [band]
return data

output = multi_arrays(
bands, _reader, bbox, expression=band_expression, **kwargs,
)
output = multi_arrays(bands, _reader, bbox, **kwargs)

if expression:
blocks = expression.split(",")
Expand All @@ -1206,17 +1185,13 @@ def preview(
self,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
**kwargs: Any,
) -> ImageData:
"""Read and merge previews from multiple bands.
Args:
bands (sequence of str or str, optional): bands to fetch info from.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the `self.reader.preview` method.
Returns:
Expand Down Expand Up @@ -1247,7 +1222,7 @@ def _reader(band: str, **kwargs: Any) -> ImageData:
data.band_names = [band]
return data

output = multi_arrays(bands, _reader, expression=band_expression, **kwargs)
output = multi_arrays(bands, _reader, **kwargs)

if expression:
blocks = expression.split(",")
Expand All @@ -1262,9 +1237,6 @@ def point(
lat: float,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
**kwargs: Any,
) -> List:
"""Read a pixel values from multiple bands.
Expand All @@ -1274,7 +1246,6 @@ def point(
lat (float): Latittude.
bands (sequence of str or str, optional): bands to fetch info from.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the `self.reader.point` method.
Returns:
Expand Down Expand Up @@ -1303,9 +1274,7 @@ def _reader(band: str, *args, **kwargs: Any) -> Dict:
with self.reader(url, tms=self.tms, **self.reader_options) as cog: # type: ignore
return cog.point(*args, **kwargs)[0] # We only return the firt value

data = multi_values(
bands, _reader, lon, lat, expression=band_expression, **kwargs,
)
data = multi_values(bands, _reader, lon, lat, **kwargs)

values = [d for _, d in data.items()]
if expression:
Expand All @@ -1319,9 +1288,6 @@ def feature(
shape: Dict,
bands: Union[Sequence[str], str] = None,
expression: Optional[str] = None,
band_expression: Optional[
str
] = None, # Expression for each band dataset based on band indexes
**kwargs: Any,
) -> ImageData:
"""Read and merge parts defined by geojson feature from multiple bands.
Expand All @@ -1330,7 +1296,6 @@ def feature(
shape (dict): Valid GeoJSON feature.
bands (sequence of str or str, optional): bands to fetch info from.
expression (str, optional): rio-tiler expression for the band list (e.g. b1/b2+b3).
band_expression (str, optional): rio-tiler expression for each band (e.g. b1/b2+b3).
kwargs (optional): Options to forward to the `self.reader.feature` method.
Returns:
Expand Down Expand Up @@ -1361,9 +1326,7 @@ def _reader(band: str, *args: Any, **kwargs: Any) -> ImageData:
data.band_names = [band]
return data

output = multi_arrays(
bands, _reader, shape, expression=band_expression, **kwargs,
)
output = multi_arrays(bands, _reader, shape, **kwargs)

if expression:
blocks = expression.split(",")
Expand Down

0 comments on commit bcc996c

Please sign in to comment.