feat!: switch to terra in DEMrelatedInput()

gisler · Nov 18, 2023 · c0578e8 · c0578e8
1 parent d5dd9eb
commit c0578e8
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 107 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -26,7 +26,6 @@ Imports:
     checkmate,
     graphics,
     methods,
-    raster (>= 3.6.3),
     Rcpp,
     stats,
     terra,
@@ -36,7 +35,6 @@ Imports:
 Suggests:
     knitr,
     rmarkdown,
-    sp,
     tinytest,
     whitebox (>= 2.0.0)
 LinkingTo:

diff --git a/NAMESPACE b/NAMESPACE
@@ -41,7 +41,6 @@ exportMethods(transportCalcOrder)
 exportMethods(transportPrerequisites)
 import(checkmate)
 import(methods)
-import(raster)
 import(terra)
 importFrom(Rcpp,sourceCpp)
 importFrom(graphics,abline)

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 # RPhosFate v1.0.4.9000
 
-* Switched to utilising the `SpatRaster` class from the `terra` package instead of the `RasterLayer` class from the `raster` package. However, the transition from `raster` to `terra` encompasses only the core and not `DEMrelatedInput()` yet.
+* Switched to utilising the `SpatRaster` and `SpatVector` classes from the `terra` package instead of the `RasterLayer` class from the `raster` and the `Spatial*DataFrame` classes from the `sp` packages.
 * Added `is_ths` argument to `RPhosFate()` and `catchment()` constructors: allows for specifying the number of threads to use for processing. 
 * Ceased support for _ERDAS IMAGINE_ (\*.img) raster files. `img2tif()` can be used to convert all _ERDAS IMAGINE_ raster files in a directory and its subdirectories into _GeoTIFF_ raster files.
 * Dropped backward compatibility to major version zero.

diff --git a/R/aaa.R b/R/aaa.R
@@ -1,6 +1,5 @@
 #' @import checkmate
 #' @import methods
-#' @import raster
 #' @import terra
 #' @importFrom graphics abline clip par
 #' @importFrom Rcpp sourceCpp