Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix roi/tile validation and file deletion #1208

Merged
merged 1 commit into from
Sep 2, 2024
Merged

fix roi/tile validation and file deletion #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions R/api_gdalcubes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,15 +477,15 @@
.check_set_caller(".gc_regularize")
# require gdalcubes package
.check_require_packages("gdalcubes")

# prepare temp_output_dir
temp_output_dir <- file.path(output_dir, ".sits")
if (!dir.exists(temp_output_dir)) {
dir.create(temp_output_dir, recursive = TRUE)
}
# set to delete all files in temp dir
on.exit(unlink(list.files(temp_output_dir, full.names = TRUE)), add = TRUE)
# timeline of intersection
timeline <- .gc_get_valid_timeline(cube, period = period)

# filter only intersecting tiles
if (.has(roi)) {
cube <- .cube_filter_spatial(cube, roi = roi)
Expand All @@ -502,8 +502,7 @@
)
# start processes
.parallel_start(workers = multicores)
on.exit(.parallel_stop())

on.exit(.parallel_stop(), add = TRUE)
# does a local cube exist
local_cube <- tryCatch(
{
Expand Down
4 changes: 3 additions & 1 deletion R/sits_regularize.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ sits_regularize.raster_cube <- function(cube, ...,
output_dir <- .file_path_expand(output_dir)
.check_output_dir(output_dir)
# check for ROI and tiles
.check_roi_tiles(roi, tiles)
if (!is.null(roi) || !is.null(tiles)) {
.check_roi_tiles(roi, tiles)
}
# check multicores
.check_num_parameter(multicores, min = 1, max = 2048)
# check progress
Expand Down
Loading