Merge remote-tracking branch 'upstream/main' into towards_0.1

xdem/coreg/base.py

@@ -755,48 +755,6 @@ def _apply_matrix_pts_arr(
     z: NDArrayf,
     matrix: NDArrayf,
     centroid: tuple[float, float, float] | None = None,
-    resampling: int | str = "bilinear",
-    transform: rio.transform.Affine = None,
-    z_name: str = "z",
-) -> NDArrayf | gu.Raster | gpd.GeoDataFrame:
-    """
-    Apply a 3D affine transformation matrix to a 3D elevation point cloud or 2.5D DEM.
-
-    :param elev: Elevation point cloud or DEM to transform, either a 2D array (requires transform) or
-        geodataframe (requires z_name).
-    :param matrix: Affine (4x4) transformation matrix to apply to the DEM.
-    :param invert: Whether to invert the transformation matrix.
-    :param centroid: The X/Y/Z transformation centroid. Irrelevant for pure translations.
-        Defaults to the midpoint (Z=0).
-    :param resampling: The resampling method to use, only for DEM 2.5D transformation. Can be `nearest`, `bilinear`,
-        `cubic` or an integer from 0-5.
-    :param transform: Geotransform of the DEM, only for DEM passed as 2D array.
-    :param z_name: Column name to use as elevation, only for point elevation data passed as geodataframe.
-    :return:
-    """
-
-    if isinstance(elev, gpd.GeoDataFrame):
-        return _apply_matrix_pts(epc=elev, matrix=matrix, invert=invert, centroid=centroid, z_name=z_name)
-    else:
-        if isinstance(elev, gu.Raster):
-            transform = elev.transform
-            dem = elev.data
-        else:
-            dem = elev
-
-        # TODO: Add exception for translation to update only geotransform, maybe directly in apply_matrix?
-        applied_dem = _apply_matrix_rst(
-            dem=dem, transform=transform, matrix=matrix, invert=invert, centroid=centroid, resampling=resampling
-        )
-        if isinstance(elev, gu.Raster):
-            applied_dem = DEM.from_array(applied_dem, transform, elev.crs, elev.nodata)
-        return applied_dem
-
-
-def _apply_matrix_rst(
-    dem: NDArrayf,
-    transform: rio.transform.Affine,
-    matrix: NDArrayf,
     invert: bool = False,
 ) -> tuple[NDArrayf, NDArrayf, NDArrayf]:
     """Apply matrix to points as arrays with array outputs (to improve speed in some functions)."""