Merge pull request #1070 from e-sensing/revert-1066-feat/appy_prop

Revert "Adjust data type and properties to new computed indexes in `sits_apply()`"

Author: gilbertocamara

R/api_apply.R

@@ -94,9 +94,6 @@
         values <- .apply_data_read(
             tile = feature, block = block, in_bands = in_bands
         )
-        if (all(is.na(values))) {
-            return(NULL)
-        }
         # Evaluate expression here
         # Band and kernel evaluation
         values <- eval(

R/api_conf.R

@@ -428,8 +428,7 @@
 #' @keywords internal
 #' @noRd
 #' @return   names associated to the chosen access key
-.conf_names <- function(...) {
-    key <- c(...)
+.conf_names <- function(key) {
     res <- tryCatch(
         {
             names(sits_env$config[[key]])
@@ -929,23 +928,41 @@ NULL
 #' @param source  Data source.
 #' @param collection  Collection in the data source.
 #' @param band  Band name
+#' @param tile  Tile
 #' @details
 #' If the band is not found, a default value will be returned from config.
 #' If neither source nor collection entries are found in configuration file,
 #' an error is thrown.
 #' @returns  A value in config.
-.conf_eo_band <- function(source, collection, band) {
+.conf_eo_band <- function(source, collection, band, tile = NULL) {
     # Format band name
     band <- .band_eo(band)
     # Return a default value if band does not exists in config
     if (!.conf_eo_band_exists(source, collection, band)) {
-        if (band %in% .conf_names("default_values", "eo_cube")) {
-            return(.conf("default_values", "eo_cube", band))
+        data_type <- "INT2S"
+        # does the file exist?
+        if (!purrr::is_null(tile)) {
+            band_path <- .tile_path(tile, band)
+            if (!purrr::is_null(band_path)) {
+                rast <- terra::rast(band_path)
+                data_type <- terra::datatype(rast)
+                conf_band <- .conf("default_vales", data_type)
+            } else {
+            # file does not exist
+            if (!.has(.conf("default_vales", band)))
+                conf_band <- .conf("default_vales", band)
+            else
+                conf_band <- .conf("default_vales", "INT4S")
+            }
         }
-        return(.conf("default_values", "eo_cube", "default"))
     }
-    # Get band config value and return it
-    .conf("sources", source, "collections", collection, "bands", band)
+    else {
+        # Get band config value and return it
+        conf_band <- .conf("sources", source,
+                           "collections", collection,
+                           "bands", band)
+    }
+    return(conf_band)
 }
 #' @title Config functions for derived_cube
 #' @noRd

R/api_cube.R

@@ -1196,12 +1196,6 @@ NULL
 }
 
 .cube_split_chunks_samples <- function(cube, samples_sf) {
-    # Hold s2 status
-    s2_status <- sf::sf_use_s2()
-    suppressMessages(sf::sf_use_s2(FALSE))
-    # Back to original status on exit
-    on.exit(suppressMessages(sf::sf_use_s2(s2_status)))
-    # Get block size of raster file
     block <- .raster_file_blocksize(.raster_open_rast(.tile_path(cube)))
     cube_chunks <- slider::slide(cube, function(tile) {
         chunks <- .tile_chunks_create(

R/api_source.R

@@ -526,7 +526,7 @@ NULL
     # check source
     .source_check(source = source)
     # get collections from source
-    collections <- .conf_names("sources", source, "collections")
+    collections <- .conf_names(c("sources", source, "collections"))
     return(collections)
 }
 

R/api_space_time_operations.R

@@ -72,7 +72,7 @@
 .intersects <- function(x, y) {
     as_crs <- sf::st_crs(x)
     y <- sf::st_transform(y, crs = as_crs)
-    apply(suppressMessages(sf::st_intersects(x, y, sparse = FALSE)), 1, any)
+    apply(sf::st_intersects(x, y, sparse = FALSE), 1, any)
 }
 #' @title Spatial within
 #' @noRd
@@ -100,7 +100,7 @@
 .within <- function(x, y) {
     as_crs <- sf::st_crs(x)
     y <- sf::st_transform(y, crs = as_crs)
-    apply(suppressMessages(sf::st_within(x, y, sparse = FALSE)), 1, any)
+    apply(sf::st_within(x, y, sparse = FALSE), 1, any)
 }
 #' @title Spatial contains
 #' @noRd

R/api_tile.R

@@ -537,7 +537,8 @@ NULL
 .tile_band_conf.eo_cube <- function(tile, band) {
     .conf_eo_band(
         source = .tile_source(tile), collection = .tile_collection(tile),
-        band = band[[1]]
+        band = band[[1]],
+        tile = tile
     )
 }
 #' @export