delete redundant option getters

njtierney · Mar 26, 2024 · 1c5abb8 · 1c5abb8
1 parent 04bea6c
commit 1c5abb8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/R/tar-terra-rast.R b/R/tar-terra-rast.R
@@ -51,6 +51,10 @@ tar_terra_rast <- function(name,
     filetype <- filetype %||% "GTiff"
     gdal <- gdal %||% "ENCODING=UTF-8"
 
+    #check that filetype option is available
+    drv <- get_gdal_available_driver_list("raster")
+    filetype <- rlang::arg_match0(filetype, drv$name)
+
     check_pkg_installed("terra")
 
     name <- targets::tar_deparse_language(substitute(name))
@@ -69,14 +73,6 @@ tar_terra_rast <- function(name,
         tidy_eval = tidy_eval
     )
 
-    drv <- get_gdal_available_driver_list("raster")
-
-    # if not specified by user, pull the corresponding geotargets option
-    filetype <- filetype %||% geotargets_option_get("gdal.raster.driver")
-    filetype <- rlang::arg_match0(filetype, drv$name)
-
-    gdal <- gdal %||% geotargets_option_get("gdal.raster.creation_options")
-
     targets::tar_target_raw(
         name = name,
         command = command,
@@ -106,13 +102,6 @@ create_format_terra_raster <- function(filetype, gdal, ...) {
 
     check_pkg_installed("terra")
 
-    drv <- get_gdal_available_driver_list("raster")
-
-    filetype <- filetype %||% geotargets_option_get("gdal.raster.driver")
-    filetype <- rlang::arg_match0(filetype, drv$name)
-
-    gdal <- gdal %||% geotargets_option_get("gdal.raster.creation_options")
-
     .write_terra_raster <- eval(substitute(function(object, path) {
         terra::writeRaster(
             object,

diff --git a/R/tar-terra-vect.R b/R/tar-terra-vect.R
@@ -60,6 +60,10 @@ tar_terra_vect <- function(name,
     filetype <- filetype %||% "GeoJSON"
     gdal <- gdal %||% "ENCODING=UTF-8"
 
+    #Check that filetype is available
+    drv <- get_gdal_available_driver_list("vector")
+    filetype <- rlang::arg_match0(filetype, drv$name)
+
     check_pkg_installed("terra")
 
     name <- targets::tar_deparse_language(substitute(name))
@@ -77,14 +81,6 @@ tar_terra_vect <- function(name,
         tidy_eval = tidy_eval
     )
 
-    drv <- get_gdal_available_driver_list("vector")
-
-    # if not specified by user, pull the corresponding geotargets option
-    filetype <- filetype %||% geotargets_option_get("gdal.vector.driver")
-    filetype <- rlang::arg_match0(filetype, drv$name)
-
-    gdal <- gdal %||% geotargets_option_get("gdal.vector.creation_options")
-
     format <- ifelse(
         test = filetype == "ESRI Shapefile",
         #special handling of ESRI shapefiles because the output is a dir of multiple files.
@@ -124,12 +120,6 @@ create_format_terra_vect <- function(filetype, options, ...) {
 
     check_pkg_installed("terra")
 
-    drv <- get_gdal_available_driver_list("vector")
-
-    filetype <- filetype %||% "GeoJSON"
-
-    filetype <- match.arg(filetype, drv$name)
-
     .write_terra_vector <- eval(substitute(function(object, path) {
         terra::writeVector(
             object,