diff --git a/R/postProcessTo.R b/R/postProcessTo.R index fb2f6c56e..2327da95c 100644 --- a/R/postProcessTo.R +++ b/R/postProcessTo.R @@ -666,7 +666,7 @@ projectTo <- function(from, projectTo, overwrite = FALSE, if (!terra::is.lonlat(from)) { # if (sf::st_crs("epsg:4326") != sf::st_crs(from)) { newRes <- terra::res(from) - messagePreProcess("Using resolution of ", paste(newRes, collapse = "x"), "m; ", + messagePreProcess("Using original resolution (", paste(newRes, collapse = "x"), "m) ", verbose = verbose ) projectTo <- terra::rast(projectTo, resolution = newRes) @@ -674,13 +674,10 @@ projectTo <- function(from, projectTo, overwrite = FALSE, projectTo <- terra::crs(projectTo) } - messagePreProcess("in the projection of `projectTo`, using the origin and extent", + messagePreProcess("Using the origin and extent from `ext(from)` in the projection from `crs(projectTo)`.", verbose = verbose ) - messagePreProcess("from `ext(from)` (in the projection from `projectTo`).", - verbose = verbose - ) - messagePreProcess("If this is not correct, create a template gridded object and pass that to projectTo...", + messagePreProcess("If this is not correct, create a template gridded object and pass that to `projectTo`...", verbose = verbose ) messagePreProcess("", @@ -758,7 +755,7 @@ projectTo <- function(from, projectTo, overwrite = FALSE, from } -#' @param needBuffer Logical. Defaults to `TRUE`, meaning nothing is done out +#' @param needBuffer Logical. Defaults to `FALSE`, meaning nothing is done out #' of the ordinary. If `TRUE`, then a buffer around the cropTo, so that if a reprojection #' has to happen on the `cropTo` prior to using it as a crop layer, then a buffer #' of 1.5 * res(cropTo) will occur prior, so that no edges are cut off. diff --git a/R/prepInputs.R b/R/prepInputs.R index bc2c2f846..0a14fe468 100644 --- a/R/prepInputs.R +++ b/R/prepInputs.R @@ -191,9 +191,11 @@ utils::globalVariables(c( #' Defaults to `getOption("reproducible.useCache", 2L)` in `prepInputs`, and #' `getOption("reproducible.useCache", FALSE)` if calling any of the inner #' functions manually. For `prepInputs`, this mean it will use `Cache` -#' only up to 2 nested levels, which will generally including `postProcess` and -#' the first level of `*Input` functions, e.g., `cropInputs`, `projectInputs`, -#' `maskInputs`, but not `fixErrors`. +#' only up to 2 nested levels, which includes `preProcess`. `postProcess` and +#' its nested `*Input` functions (e.g., `cropInputs`, `projectInputs`, +#' `maskInputs`) are no longer internally cached, as `terra` processing speeds +#' mean internal caching is more time consuming. We recommend caching the full +#' `prepInputs` call instead (e.g. `prepInputs(...) |> Cache()`). #' #' @param .tempPath Optional temporary path for internal file intermediate steps. #' Will be cleared on.exit from this function. diff --git a/man/CacheGeo.Rd b/man/CacheGeo.Rd index 203e0e241..49eaa5de7 100644 --- a/man/CacheGeo.Rd +++ b/man/CacheGeo.Rd @@ -57,9 +57,11 @@ folder on your google drive.} Defaults to \code{getOption("reproducible.useCache", 2L)} in \code{prepInputs}, and \code{getOption("reproducible.useCache", FALSE)} if calling any of the inner functions manually. For \code{prepInputs}, this mean it will use \code{Cache} -only up to 2 nested levels, which will generally including \code{postProcess} and -the first level of \verb{*Input} functions, e.g., \code{cropInputs}, \code{projectInputs}, -\code{maskInputs}, but not \code{fixErrors}.} +only up to 2 nested levels, which includes \code{preProcess}. \code{postProcess} and +its nested \verb{*Input} functions (e.g., \code{cropInputs}, \code{projectInputs}, +\code{maskInputs}) are no longer internally cached, as \code{terra} processing speeds +mean internal caching is more time consuming. We recommend caching the full +\code{prepInputs} call instead (e.g. \code{prepInputs(...) |> Cache()}).} \item{overwrite}{Logical. Should downloading and all the other actions occur even if they pass the checksums or the files are all there.} diff --git a/man/checkPath.Rd b/man/checkPath.Rd index 699789edb..0f8ecc5c1 100644 --- a/man/checkPath.Rd +++ b/man/checkPath.Rd @@ -14,7 +14,7 @@ checkPath(path, create) \S4method{checkPath}{character,missing}(path) -\S4method{checkPath}{NULL,ANY}(path) +\S4method{checkPath}{`NULL`,ANY}(path) \S4method{checkPath}{missing,ANY}() } diff --git a/man/normPath.Rd b/man/normPath.Rd index f8d3c13a4..0149f5682 100644 --- a/man/normPath.Rd +++ b/man/normPath.Rd @@ -16,7 +16,7 @@ normPath(path) \S4method{normPath}{list}(path) -\S4method{normPath}{NULL}(path) +\S4method{normPath}{`NULL`}(path) \S4method{normPath}{missing}() diff --git a/man/postProcessTo.Rd b/man/postProcessTo.Rd index 4a1126722..2e0a31d20 100644 --- a/man/postProcessTo.Rd +++ b/man/postProcessTo.Rd @@ -126,7 +126,7 @@ or \code{terra::writeRaster} (for \code{writeTo}) and not used for \code{cropTo} \verb{writeTo = }. If \code{reproducible.gdalwarp = TRUE}, then these will be passed to the \verb{gdal*} functions. See them for details.} -\item{needBuffer}{Logical. Defaults to \code{TRUE}, meaning nothing is done out +\item{needBuffer}{Logical. Defaults to \code{FALSE}, meaning nothing is done out of the ordinary. If \code{TRUE}, then a buffer around the cropTo, so that if a reprojection has to happen on the \code{cropTo} prior to using it as a crop layer, then a buffer of 1.5 * res(cropTo) will occur prior, so that no edges are cut off.} diff --git a/man/prepInputs.Rd b/man/prepInputs.Rd index be6c8c5d6..3e67702e1 100644 --- a/man/prepInputs.Rd +++ b/man/prepInputs.Rd @@ -89,9 +89,11 @@ even if they pass the checksums or the files are all there.} Defaults to \code{getOption("reproducible.useCache", 2L)} in \code{prepInputs}, and \code{getOption("reproducible.useCache", FALSE)} if calling any of the inner functions manually. For \code{prepInputs}, this mean it will use \code{Cache} -only up to 2 nested levels, which will generally including \code{postProcess} and -the first level of \verb{*Input} functions, e.g., \code{cropInputs}, \code{projectInputs}, -\code{maskInputs}, but not \code{fixErrors}.} +only up to 2 nested levels, which includes \code{preProcess}. \code{postProcess} and +its nested \verb{*Input} functions (e.g., \code{cropInputs}, \code{projectInputs}, +\code{maskInputs}) are no longer internally cached, as \code{terra} processing speeds +mean internal caching is more time consuming. We recommend caching the full +\code{prepInputs} call instead (e.g. \code{prepInputs(...) |> Cache()}).} \item{.tempPath}{Optional temporary path for internal file intermediate steps. Will be cleared on.exit from this function.} diff --git a/man/robustDigest.Rd b/man/robustDigest.Rd index a9555d909..adb6dc389 100644 --- a/man/robustDigest.Rd +++ b/man/robustDigest.Rd @@ -28,7 +28,7 @@ \S4method{.robustDigest}{ANY}(object, .objects, length, algo, quick, classOptions) -\S4method{.robustDigest}{function}(object, .objects, length, algo, quick, classOptions) +\S4method{.robustDigest}{`function`}(object, .objects, length, algo, quick, classOptions) \S4method{.robustDigest}{expression}(object, .objects, length, algo, quick, classOptions)