adjust CRS for Sentinel-1-RTC data cubes

e-sensing · Mar 24, 2024 · d76c69f · d76c69f
1 parent 2e46779
commit d76c69f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 49 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -16,7 +16,6 @@ S3method(.check_samples,default)
 S3method(.check_samples,sits)
 S3method(.check_samples,tbl_df)
 S3method(.cube_adjust_crs,"mpc_cube_sentinel-1-grd")
-S3method(.cube_adjust_crs,"mpc_cube_sentinel-1-rtc")
 S3method(.cube_adjust_crs,default)
 S3method(.cube_as_sf,default)
 S3method(.cube_as_sf,raster_cube)
@@ -292,7 +291,6 @@ S3method(sits_bands,raster_cube)
 S3method(sits_bands,sits)
 S3method(sits_bands,sits_model)
 S3method(sits_bbox,"mpc_cube_sentinel-1-grd")
-S3method(sits_bbox,"mpc_cube_sentinel-1-rtc")
 S3method(sits_bbox,default)
 S3method(sits_bbox,raster_cube)
 S3method(sits_bbox,sits)

diff --git a/R/api_cube.R b/R/api_cube.R
@@ -314,10 +314,6 @@ NULL
     return(cube)
 }
 #' @export
-`.cube_adjust_crs.mpc_cube_sentinel-1-rtc` <- function(cube) {
-    `.cube_adjust_crs.mpc_cube_sentinel-1-grd`(cube)
-}
-#' @export
 .cube_adjust_crs.default <- function(cube) {
     return(cube)
 }

diff --git a/R/sits_bbox.R b/R/sits_bbox.R
@@ -67,12 +67,6 @@ sits_bbox.raster_cube <- function(data, crs = "EPSG:4326", as_crs = NULL) {
 }
 #' @rdname sits_bbox
 #' @export
-`sits_bbox.mpc_cube_sentinel-1-rtc` <- function(data, crs = "EPSG:4326",
-                                                as_crs = NULL) {
-    `sits_bbox.mpc_cube_sentinel-1-grd`(data, crs = crs, as_crs = as_crs)
-}
-#' @rdname sits_bbox
-#' @export
 sits_bbox.tbl_df <- function(data, crs = "EPSG:4326", as_crs = NULL) {
     data <- tibble::as_tibble(data)
     if (all(.conf("sits_cube_cols") %in% colnames(data))) {

diff --git a/man/sits_bbox.Rd b/man/sits_bbox.Rd
diff --git a/tests/testthat/test-cube.R b/tests/testthat/test-cube.R
@@ -435,7 +435,7 @@ test_that("Creating cubes from BDC - SENTINEL-2 - tile", {
     cube_nrows <- .tile_nrows(bdc_s2_cube_t)
     expect_true(.raster_nrows(r_obj) == cube_nrows)
 })
-test_that("Creating cubes from DEA", {
+test_that("Creating S2 cubes from DEA using ROI", {
     # try to create a DEA cube
     dea_cube <- .try(
         {
@@ -464,7 +464,7 @@ test_that("Creating cubes from DEA", {
     expect_equal(dea_cube$xmax[[1]], .raster_xmax(r), tolerance = 1)
     expect_equal(dea_cube$xmin[[1]], .raster_xmin(r), tolerance = 1)
 })
-test_that("Creating cubes from DEA - using tiles", {
+test_that("Creating S2 cubes from DEA - using tiles", {
     dea_cube <- .try(
         {
             sits_cube(
@@ -489,7 +489,7 @@ test_that("Creating cubes from DEA - using tiles", {
     expect_true(all(dea_cube$tile %in% c("37MDT","37MET")))
 
 })
-test_that("Creating Sentinel cubes from MPC", {
+test_that("Creating S2 cubes from MPC using tiles", {
     mpc_token <- Sys.getenv("MPC_TOKEN")
     Sys.setenv("MPC_TOKEN" = "")
     s2_cube <- .try(
@@ -538,7 +538,7 @@ test_that("Creating Sentinel cubes from MPC", {
     n_images_2 <- nrow(s2_cube_s2a$file_info[[1]])
     expect_true(n_images_2 < n_images_1)
 })
-test_that("Creating Sentinel cubes from MPC with ROI", {
+test_that("Creating S2 cubes from MPC with ROI", {
     roi <- c(
         lon_min = -48.28579, lat_min = -16.05026,
         lon_max = -47.30839, lat_max = -15.50026
@@ -568,36 +568,6 @@ test_that("Creating Sentinel cubes from MPC with ROI", {
     cube_nrows <- .tile_nrows(s2_cube_mpc)
     expect_true(.raster_nrows(r_obj) == cube_nrows)
 })
-test_that("Creating Sentinel-1 RTC cubes from MPC", {
-    cube_s1_rtc <-  sits_cube(
-        source = "MPC",
-        collection = "SENTINEL-1-RTC",
-        bands = c("VV", "VH"),
-        orbit = "descending",
-        tiles = c("24MUS", "24MVS"),
-        start_date = "2021-03-01",
-        end_date = "2021-09-30"
-    )
-    bbox <- sits_bbox(cube_s1_rtc)
-    expect_equal("EPSG:4326", bbox[["crs"]])
-    expect_equal(381340, bbox[["xmin"]])
-    expect_equal(701860, bbox[["xmax"]])
-
-    # output_dir <- paste0(tempdir(), "/s1rtc2")
-    # if (!dir.exists(output_dir)) {
-    #     dir.create(output_dir)
-    # }
-    #
-    # cube_s1_20LKP_rtc <- sits_regularize(
-    #     cube = cube_s1_rtc,
-    #     period = "P12D",
-    #     res = 120,
-    #     roi = roi,
-    #     multicores = 4,
-    #     output_dir = output_dir,
-    #     progress = TRUE
-    # )
-})
 test_that("Creating Sentinel-1 GRD cubes from MPC using tiles", {
 
     cube_s1_grd <-  sits_cube(
@@ -636,6 +606,39 @@ test_that("Creating Sentinel-1 GRD cubes from MPC using tiles", {
         progress = TRUE
     )
 })
+test_that("Creating S1 RTC cubes from MPC", {
+    cube_s1_rtc <-  sits_cube(
+        source = "MPC",
+        collection = "SENTINEL-1-RTC",
+        bands = c("VV", "VH"),
+        orbit = "descending",
+        tiles = c("24MUS", "24MVS"),
+        start_date = "2021-03-01",
+        end_date = "2021-09-30"
+    )
+    bbox <- sits_bbox(cube_s1_rtc)
+    expect_true(grepl("32724", bbox[["crs"]]))
+    expect_equal(20600, bbox[["xmin"]])
+    expect_equal(749090, bbox[["xmax"]])
+    expect_equal(nrow(cube_s1_rtc$file_info[[1]]), 136)
+    expect_true(all)
+
+    output_dir <- paste0(tempdir(), "/s1rtc2")
+    if (!dir.exists(output_dir)) {
+        dir.create(output_dir)
+    }
+
+    cube_s1_20LKP_rtc <- sits_regularize(
+        cube = cube_s1_rtc,
+        period = "P12D",
+        res = 120,
+        roi = roi,
+        multicores = 4,
+        output_dir = output_dir,
+        progress = TRUE
+    )
+})
+
 test_that("Creating LANDSAT cubes from MPC with ROI", {
     roi <- c(
         lon_min = -48.28579, lat_min = -16.05026,