Merge branch 'dev' of https://github.com/e-sensing/sits into dev

Author: gilbertocamara

NAMESPACE

@@ -54,6 +54,7 @@ S3method(.cube_filter_tiles,raster_cube)
 S3method(.cube_find_class,default)
 S3method(.cube_find_class,raster_cube)
 S3method(.cube_find_class,tbl_df)
+S3method(.cube_geometry_use_s2,"bdc_cube_landsat-2m")
 S3method(.cube_geometry_use_s2,default)
 S3method(.cube_geometry_use_s2,ogh_cube)
 S3method(.cube_intersects,default)
@@ -119,6 +120,8 @@ S3method(.odata_cdse_extract_tile,RTC)
 S3method(.odata_cdse_search,RTC)
 S3method(.predictors,sits)
 S3method(.predictors,sits_base)
+S3method(.reg_tile_convert,"bdc_cube_landsat-2m")
+S3method(.reg_tile_convert,default)
 S3method(.reg_tile_convert,dem_cube)
 S3method(.reg_tile_convert,grd_cube)
 S3method(.reg_tile_convert,ogh_cube)
@@ -469,6 +472,7 @@ S3method(sits_reclassify,default)
 S3method(sits_reclassify,probs_cube)
 S3method(sits_reduce,raster_cube)
 S3method(sits_reduce,sits)
+S3method(sits_regularize,"bdc_cube_landsat-2m")
 S3method(sits_regularize,default)
 S3method(sits_regularize,dem_cube)
 S3method(sits_regularize,derived_cube)

R/api_cube.R

@@ -1033,6 +1033,10 @@ NULL
     cube
 }
 #' @export
+`.cube_geometry_use_s2.bdc_cube_landsat-2m` <- function(cube, use_s2) {
+    .cube_geometry_use_s2.ogh_cube(cube = cube, use_s2 = use_s2)
+}
+#' @export
 .cube_geometry_use_s2.default <- function(cube, use_s2) {
     # Return
     cube

R/api_regularize.R

@@ -532,7 +532,6 @@
 
 #' @noRd
 #' @export
-#'
 .reg_tile_convert.ogh_cube <- function(cube,
                                        grid_system,
                                        roi = NULL,
@@ -582,7 +581,19 @@
     cube_class <- c(cube_class[[1]], "ogh_cube", cube_class[-1])
     .cube_set_class(cube, cube_class)
 }
-
+#' @noRd
+#' @export
+`.reg_tile_convert.bdc_cube_landsat-2m` <- function(cube,
+                                                    grid_system,
+                                                    roi = NULL,
+                                                    tiles = NULL) {
+    .reg_tile_convert.ogh_cube(cube = cube,
+                               grid_system = grid_system,
+                               roi = roi,
+                               tiles = tiles)
+}
+#' @noRd
+#' @export
 .reg_tile_convert.default <- function(cube,
                                       grid_system,
                                       roi = NULL,

R/api_torch.R

@@ -535,15 +535,14 @@
 #' @noRd
 #' @description Find out if CUDA or MPS are available.
 #' Forces the CPU pipeline if environment variable
-#' SITS_FORCE_CPU is set to 'YES'.
+#' SITS_FORCE_CPU is set to TRUE.
 #'
 #' @return TRUE/FALSE
-#'
 .torch_gpu_classification <- function() {
     # Blank/unset means "let the hardware decide": only an explicit
-    # 'YES' forces the CPU pipeline.
-    force_cpu <- Sys.getenv("SITS_FORCE_CPU", unset = "")
-    if (force_cpu == "YES") return(FALSE)
+    # 'TRUE' forces the CPU pipeline.
+    force_cpu <- Sys.getenv("SITS_FORCE_CPU", unset = "FALSE")
+    if (force_cpu == "TRUE") return(FALSE)
     torch::cuda_is_available() || torch::backends_mps_is_available()
 }
 

R/api_torch_dataset.R

@@ -143,11 +143,11 @@
 .torch_predict_chunks <- function(torch_model, dataset, callback) {
     # We set to 0 to reproduce the same behaviour in sits
     # Once mirai starts with 0 in torch
-    multicores <- ifelse(
-        test = sits_env[["multicores"]] == 1,
-        yes  = 0,
-        no   = sits_env[["multicores"]]
-    )
+    if (sits_env[["multicores"]] == 1) {
+        multicores <- 0
+    } else {
+        multicores <- sits_env[["multicores"]]
+    }
     # Wrap model with custom torch module which enhances GPU handling
     torch_model[["model"]] <- .torch_model_wrap(
         model = torch_model[["model"]],

R/sits_regularize.R

@@ -440,7 +440,7 @@ sits_regularize.ogh_cube <- function(cube, ...,
                                      res,
                                      output_dir,
                                      timeline = NULL,
-                                     grid_system = "MGRS",
+                                     grid_system = "BDC_MD_V2",
                                      roi = NULL,
                                      crs = NULL,
                                      tiles = NULL,
@@ -505,6 +505,31 @@ sits_regularize.ogh_cube <- function(cube, ...,
 }
 #' @rdname sits_regularize
 #' @export
+`sits_regularize.bdc_cube_landsat-2m` <- function(cube, ...,
+                                                  period,
+                                                  res,
+                                                  output_dir,
+                                                  timeline = NULL,
+                                                  grid_system = "BDC_MD_V2",
+                                                  roi = NULL,
+                                                  crs = NULL,
+                                                  tiles = NULL,
+                                                  multicores = 2L,
+                                                  progress = TRUE) {
+    sits_regularize.ogh_cube(cube = cube, ...,
+                             period = period,
+                             res = res,
+                             output_dir = output_dir,
+                             timeline = timeline,
+                             grid_system = grid_system,
+                             roi = roi,
+                             crs = crs,
+                             tiles = tiles,
+                             multicores = 2L,
+                             progress = progress)
+}
+#' @rdname sits_regularize
+#' @export
 sits_regularize.derived_cube <- function(cube, ...) {
     stop(.conf("messages", "sits_regularize_default"))
 }

R/sits_utils.R

@@ -37,28 +37,28 @@ sits_show_prediction <- function(class) {
 #' @name sits_run_tests
 #'
 #' @description
-#' To run the tests, set "SITS_RUN_TESTS" environment to "YES" using
-#' Sys.setenv("SITS_RUN_TESTS" = "YES")
+#' To run the tests, set "SITS_RUN_TESTS" environment to TRUE using
+#' Sys.setenv("SITS_RUN_TESTS" = TRUE)
 #' To come back to the default behaviour, please set
-#' Sys.setenv("SITS_RUN_TESTS" = "NO")
+#' Sys.setenv("SITS_RUN_TESTS" = FALSE)
 #' @return TRUE/FALSE
 #' @export
 sits_run_tests <- function() {
-    !Sys.getenv("SITS_RUN_TESTS") %in% c("", "NO", "FALSE", "OFF")
+    Sys.getenv("SITS_RUN_TESTS", unset = "FALSE") == "TRUE"
 }
 #' @title Informs if sits examples should run
 #'
 #' @name sits_run_examples
 #'
 #' @description
 #' This function informs if sits examples should run.
-#' To run the examples, set "SITS_RUN_EXAMPLES" to "YES" using
-#' Sys.setenv("SITS_RUN_EXAMPLES" = "YES")
+#' To run the examples, set "SITS_RUN_EXAMPLES" to TRUE using
+#' Sys.setenv("SITS_RUN_EXAMPLES" = TRUE)
 #' To come back to the default behaviour, please set
-#' Sys.setenv("SITS_RUN_EXAMPLES" = "NO")
+#' Sys.setenv("SITS_RUN_EXAMPLES" = FALSE)
 #'
 #' @return A logical value
 #' @export
 sits_run_examples <- function() {
-    !Sys.getenv("SITS_RUN_EXAMPLES") %in% c("", "NO", "FALSE", "OFF")
+    Sys.getenv("SITS_RUN_EXAMPLES", unset = "FALSE") == "TRUE"
 }

inst/extdata/sources/config_source_ogh.yml

@@ -49,5 +49,5 @@ sources:
                 open_data_token : false
                 metadata_search : "tile"
                 ext_tolerance   : 0.01
-                grid_system     : "WRS-2"
+                grid_system     : "GLAD_ARD_GTS"
                 dates           : "1997 to 2022"