Set devel v0.2.1-9000

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rSW2st
 Title: Spatiotemporal Tools for SOILWAT2 and STEPWAT2 Simulation Experiments
-Version: 0.2.0
+Version: 0.2.1
 Authors@R: c(
   person(
     "Daniel", "Schlaepfer",
@@ -16,21 +16,22 @@ Depends:
 Imports:
     abind (>= 1.4.5),
     sf (>= 0.9.8),
-    sp (>= 1.4.5),
-    raster (>= 3.4.5),
+    terra (>= 1.4.22),
     stars (>= 0.4.3)
 Suggests:
     automap,
-    geosphere,
     gstat,
+    lwgeom,
     ggplot2,
     ncdf4 (>= 1.17),
     ncmeta (>= 0.3.0),
     RNetCDF (>= 2.6.2),
+    units (>= 0.8.5),
+    sp (>= 1.4.5),
+    raster (>= 3.4.5),
     testthat (>= 3.0.0),
-    terra (>= 1.4.22),
     spelling,
-    lintr (>= 3.0.0),
+    lintr (>= 3.1.1),
     covr
 License: GPL-3
 URL: https://github.com/DrylandEcology/rSW2st

NAMESPACE

@@ -21,6 +21,7 @@ export(read_netCDF)
 export(read_netCDF_as_array)
 export(read_netCDF_as_raster)
 export(read_netCDF_as_stars)
+export(read_netCDF_as_terra)
 export(utm_zone)
 export(variogram_range)
 importFrom(methods,as)

NEWS.md

@@ -1,3 +1,15 @@
+# rSW2st v0.2.1
+
+* `rSW2st` no longer depends on but instead suggests
+  `"sp"` and `"raster"` packages (#18; @dschlaep).
+    * Functions that gained the ability to handle `"SpatRaster"`
+      (`"terra"` package) objects:
+        `get_xyspace()`, `calculate_cell_area()`,
+        `calculate_nominal_resolution()`, `read_netCDF()`
+    * `as_points()` gained the ability to handle
+      `"SpatVector"` (`"terra"` package) objects.
+
+
 # rSW2st v0.2.0
 
 * Github Actions are triggered for `release/**` branches in addition to `main`.

R/conversions.R

@@ -5,12 +5,15 @@
 #'   (a \code{matrix}, \code{array}, or \code{data.frame})
 #'   with longitude/X, latitude/Y as columns;
 #'   a \code{\link[sp:SpatialPoints-class]{sp::SpatialPoints}} object; or
+#'   a \code{\link[terra:SpatVector-class]{terra::SpatVector}} object; or
 #'   a \var{sf} object with a point geometry,
 #'   i.e., an object with a class \var{sf} or \var{sfc}.
-#' @param to_class A character string. Convert either
+#' @param to_class A character string. Convert
 #'   to \var{"sp"} for
 #'   a \code{\link[sp:SpatialPoints-class]{sp::SpatialPoints}} object;
-#'   convert to \var{"sf"} for a \code{\link[sf:sf]{sf}} object; or
+#'   to \var{"sv"} for
+#'   a \code{\link[terra:SpatVector-class]{terra::SpatVector}} object;
+#'   to \var{"sf"} for a \code{\link[sf:sf]{sf}} object; or
 #'   convert to \var{"sfc"} for
 #'   a \code{\link[sf:sfc_POINT]{sf::sfc_POINT}} object.
 #' @inheritParams rSW2st_crs
@@ -33,26 +36,33 @@
 #'
 #' pts_sf1 <- as_points(locations, crs = 4326, to_class = "sf")
 #' pts_sfc1 <- as_points(locations, crs = 4326, to_class = "sfc")
-#' pts_sp1 <- as_points(locations, crs = 4326, to_class = "sp")
+#' pts_sv1 <- as_points(locations, crs = 4326, to_class = "sv")
 #'
-#' pts_sf2 <- as_points(pts_sp1, to_class = "sf")
-#' pts_sfc2 <- as_points(pts_sp1, to_class = "sfc")
-#' pts_sp2 <- as_points(pts_sf1, to_class = "sp")
+#' pts_sf2 <- as_points(pts_sv1, to_class = "sf")
+#' pts_sfc2 <- as_points(pts_sv1, to_class = "sfc")
+#' pts_sv2 <- as_points(pts_sf1, to_class = "sv")
 #'
 #' all.equal(pts_sf1, pts_sf2, check.attributes = FALSE)
 #' all.equal(pts_sfc1, pts_sfc2, check.attributes = FALSE)
-#' all.equal(pts_sp1, pts_sp2)
+#' all.equal(pts_sv1, pts_sv2)
 #' all.equal(locations, sf::st_coordinates(pts_sf1), check.attributes = FALSE)
 #' all.equal(locations, sf::st_coordinates(pts_sfc1), check.attributes = FALSE)
-#' all.equal(locations, sp::coordinates(pts_sp1), check.attributes = FALSE)
+#' all.equal(locations, terra::crds(pts_sv1), check.attributes = FALSE)
+#'
+#' if (requireNamespace("sp")) {
+#'   pts_sp1 <- as_points(locations, crs = 4326, to_class = "sp")
+#'   pts_sp2 <- as_points(pts_sf1, to_class = "sp")
+#'   all.equal(pts_sp1, pts_sp2)
+#'   all.equal(locations, sp::coordinates(pts_sp1), check.attributes = FALSE)
+#' }
 #'
 #' # A vector of length two is interpreted as a single point location
 #' pts_sf11 <- as_points(locations[1, ], crs = 4326, to_class = "sf")
 #' @export
 as_points <- function(
   x,
   crs,
-  to_class = c("sf", "sfc", "sp")
+  to_class = c("sf", "sfc", "sp", "sv")
 ) {
 
   to_class <- match.arg(to_class)
@@ -63,6 +73,11 @@ as_points <- function(
 
   is_sp <- inherits(x, "SpatialPoints")
   is_sf <- inherits(x, c("sf", "sfc", "sfg"))
+  is_sv <- inherits(x, "SpatVector")
+
+  if (is_sp || to_class == "sp") {
+    stopifnot(requireNamespace("sp"))
+  }
 
   # Convert
   res <- if (is_sf) {
@@ -72,6 +87,7 @@ as_points <- function(
         has_data <- length(setdiff(colnames(x), attr(x, "sf_column"))) > 0
         if (has_data) as(x, "Spatial") else as(sf::st_geometry(x), "Spatial")
       },
+      sv = terra::vect(x),
       sf = x,
       sfc = sf::st_geometry(x)
     )
@@ -80,11 +96,23 @@ as_points <- function(
     switch(
       EXPR = to_class,
       sp = x,
+      sv = terra::vect(x),
       sf = as(x, "sf"),
       sfc = as(x, "sfc")
     )
 
-  } else if (!(is_sp || is_sf)) {
+  } else if (is_sv) {
+    switch(
+      EXPR = to_class,
+      # direct conversion sv -> sp would be possible
+      # of package "raster" were first loaded with `library(raster)`
+      sp = as(sf::st_as_sf(x), "Spatial"),
+      sv = x,
+      sf = sf::st_as_sf(x),
+      sfc = sf::st_geometry(sf::st_as_sf(x))
+    )
+
+  } else if (!(is_sp || is_sf || is_sv)) {
 
     if (is.null(dim(x)) && length(x) == 2) {
       # Assume that this is supposed to be one point (and the object lost its
@@ -96,14 +124,26 @@ as_points <- function(
       stop("`crs` is missing and `x` is not a spatial object.")
     }
 
-    crs <- sf::st_crs(crs)
+    crs_sf <- sf::st_crs(crs)
 
     switch(
       EXPR = to_class,
+
       sp = sp::SpatialPoints(
         coords = unname(x),
-        proj4string = as(crs, "CRS")
+        proj4string = as(crs_sf, "CRS")
       ),
+
+      sv = terra::vect(
+        if (inherits(x, "matrix")) {
+          x
+        } else {
+          data.matrix(x)
+        },
+        type = "points",
+        crs = terra::crs(crs_sf$Wkt) # nolint: extraction_operator_linter.
+      ),
+
       sf = ,
       sfc = sf::st_cast(
         x = sf::st_sfc(
@@ -114,7 +154,7 @@ as_points <- function(
               data.matrix(x)
             }
           ),
-          crs = crs
+          crs = crs_sf
         ),
         to = "POINT"
       )

R/crs.R

@@ -25,7 +25,10 @@ NULL
 #' @examples
 #' crs_units(4326)
 #' crs_units("EPSG:4326")
-#' crs_units(sp::CRS("+init=EPSG:4326"))
+#' crs_units(terra::crs("EPSG:4326"))
+#' if (requireNamespace("sp")) {
+#'   crs_units(sp::CRS("+init=EPSG:4326"))
+#' }
 #'
 #' @export
 crs_units <- function(crs) {