revert back to useing strsplit and paste0

njtierney · May 3, 2024 · 7be1613 · 7be1613
1 parent 0530463
commit 7be1613
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/R/tar-terra-rast.R b/R/tar-terra-rast.R
@@ -87,7 +87,10 @@ tar_terra_rast <- function(name,
                     path,
                     filetype = Sys.getenv("GEOTARGETS_GDAL_RASTER_DRIVER"),
                     overwrite = TRUE,
-                    gdal = geotargets:::semicolon_split(Sys.getenv("GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS", unset = ";"))
+                    gdal = strsplit(
+                        Sys.getenv("GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS",
+                                   unset = ";"),
+                        ";")[[1]]
                 )
             },
             marshal = function(object) terra::wrap(object),
@@ -103,8 +106,12 @@ tar_terra_rast <- function(name,
         resources = targets::tar_resources(
             custom_format = targets::tar_resources_custom_format(
                 #these envvars are used in write function of format
-                envvars = c("GEOTARGETS_GDAL_RASTER_DRIVER" = filetype,
-                            "GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS" = geotargets:::semicolon_paste(gdal))
+                envvars = c(
+                    "GEOTARGETS_GDAL_RASTER_DRIVER" = filetype,
+                    "GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS" = (
+                        paste0(gdal, collapse = ";")
+                        )
+                    )
             )
         ),
         storage = storage,

diff --git a/R/tar-terra-sprc.R b/R/tar-terra-sprc.R
@@ -126,8 +126,12 @@ tar_terra_sprc <- function(name,
     resources = targets::tar_resources(
         custom_format = targets::tar_resources_custom_format(
             #these envvars are used in write function of format
-            envvars = c("GEOTARGETS_GDAL_RASTER_DRIVER" = filetype,
-                        "GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS" = geotargets:::semicolon_paste(gdal))
+            envvars = c(
+                "GEOTARGETS_GDAL_RASTER_DRIVER" = filetype,
+                "GEOTARGETS_GDAL_RASTER_CREATION_OPTIONS" = (
+                    paste0(gdal, collapse = ";")
+                    )
+            )
         )
     ),
     storage = storage,

diff --git a/R/tar-terra-vect.R b/R/tar-terra-vect.R
@@ -105,8 +105,12 @@ tar_terra_vect <- function(name,
         resources = targets::tar_resources(
             custom_format = targets::tar_resources_custom_format(
                 #these envvars are used in write function of format
-                envvars = c("GEOTARGETS_GDAL_VECTOR_DRIVER" = filetype,
-                            "GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS" = geotargets:::semicolon_paste(gdal))
+                envvars = c(
+                    "GEOTARGETS_GDAL_VECTOR_DRIVER" = filetype,
+                    "GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS" = (
+                        paste0(gdal, collapse = ";")
+                        )
+                )
             )
         ),
         storage = storage,
@@ -129,7 +133,10 @@ create_format_terra_vect <- function() {
                 path,
                 filetype = Sys.getenv("GEOTARGETS_GDAL_VECTOR_DRIVER"),
                 overwrite = TRUE,
-                options = geotargets:::semicolon_split(Sys.getenv("GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS", unset = ";"))
+                options = strsplit(
+                    Sys.getenv("GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS",
+                               unset = ";"),
+                    ";")[[1]]
             )
         },
         marshal = function(object) terra::wrap(object),
@@ -151,7 +158,10 @@ create_format_terra_vect_shz <- function() {
                 filename = paste0(path, ".shz"),
                 filetype = "ESRI Shapefile",
                 overwrite = TRUE,
-                options = geotargets:::semicolon_split(Sys.getenv("GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS", unset = ";"))
+                options = strsplit(
+                    Sys.getenv("GEOTARGETS_GDAL_VECTOR_CREATION_OPTIONS",
+                               unset = ";"),
+                    ";")[[1]]
             )
             file.rename(paste0(path, ".shz"), path)
         },