From a0463c07869459dce0f1ce98308846b70cb356d2 Mon Sep 17 00:00:00 2001 From: Rob Marty Date: Mon, 15 Apr 2024 10:01:08 -0400 Subject: [PATCH] import terra --- DESCRIPTION | 2 +- NAMESPACE | 4 ++-- R/blackmarbler.R | 2 +- readme_figures/testing.R | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d1bd436..f197430 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -10,7 +10,7 @@ Description: Geographically referenced data and statistics of nighttime lights f License: MIT + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.1 +RoxygenNote: 7.3.1 URL: https://worldbank.github.io/blackmarbler/ BugReports: https://github.com/worldbank/blackmarbler/issues Imports: diff --git a/NAMESPACE b/NAMESPACE index 1f07434..79f4ef9 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,9 +8,9 @@ import(hdf5r) import(httr) import(lubridate) import(purrr, except = c(flatten_df, values)) -import(raster, except = c(union, select, intersect, origin, tail, head, values)) - import(readr) import(sf) import(stringr) +import(terra, except = c(intersect, values, origin, union)) + import(tidyr, except = c(extract)) diff --git a/R/blackmarbler.R b/R/blackmarbler.R index 4709aa1..af2bb99 100644 --- a/R/blackmarbler.R +++ b/R/blackmarbler.R @@ -932,7 +932,7 @@ bm_extract <- function(roi_sf, #' @import lubridate #' @rawNamespace import(tidyr, except = c(extract)) #' @rawNamespace import(purrr, except = c(flatten_df, values)) -#' @rawNamespace import(raster, except = c(union, select, intersect, origin, tail, head, values)) +#' @rawNamespace import(terra, except = c(intersect, values, origin, union)) #' # @rawNamespace import(utils, except = c(stack, unstack)) bm_raster <- function(roi_sf, diff --git a/readme_figures/testing.R b/readme_figures/testing.R index 359e8b1..2579cb3 100644 --- a/readme_figures/testing.R +++ b/readme_figures/testing.R @@ -50,8 +50,6 @@ e_202110 <- bm_raster(roi_sf = roi_sf, e_202110 <- bm_extract(roi_sf = roi_sf, product_id = "VNP46A3", date = c("2021-10-01", "2021-11-01"), - bearer = bearer, - output_location_type = "file", - file_dir = "~/Desktop/test1") + bearer = bearer)