superClass.R to terra

R/cloudMask.R

@@ -152,8 +152,3 @@ cloudShadowMask <- function (img, cm, nc = 5, shiftEstimate = NULL, preciseShift
     if(returnShift) return(list(shift = shiftPar, shadowMap = cms)) else return(cms)
 
 }
-
-
-my_test <- function(){
-    class(c(last, last))
-}

R/internalFunctions.R

@@ -92,7 +92,6 @@
     if (isTRUE(getOption('rasterCluster'))) {
         do.call("clusterR", args = c(list(x = raster, fun = rasterFun, args=args), wrArgs))
     } else {
-        #do.call("rasterFun", args=c(x = raster, args), wrArgs)
         do.call("rasterFun", c(list(raster), args, wrArgs))
     }
 }
@@ -193,7 +192,10 @@
     x <- gsub("\\\\", "/", x) ## anti-win
     x <- gsub("//", "/", x)   ## anti-win
 
-    if(basename(x) == x | grepl("^[.][.]/", x))    x   <- file.path(getwd(),x)
+    if(basename(x) == x | grepl("^[.][.]/", x)){
+      x   <- file.path(getwd(),x)
+    }
+
     if(grepl("[.][.]", x)){
         xs  <- strsplit(x, "/")[[1]]
         ups <- grep("[.][.]", xs)  

R/radCor.R

@@ -289,11 +289,3 @@ radCor <- function(img, metaData, method = "apref", bandSet = "full", hazeValues
 
     return(out)
 }
-
-
-test <- function(){
-    devtools::load_all()
-    mtlFile <- system.file("external/landsat/LT52240631988227CUB02_MTL.txt", package = "RStoolbox")
-    method <- "dos"
-    radCor(lsat, metaData = mtlFile, method = method, hazeBands = c(1, 2))
-}

R/saveRSTBX.R

@@ -42,47 +42,63 @@
 NULL
 
 #' @describeIn saveRSTBX Save RStoolbox object to file 
-saveRSTBX <- function(x, filename, format ="raster", ...){
-
+saveRSTBX <- function(x, filename, format = "raster", ...){
     stopifnot(inherits(x, "RStoolbox"))
-
+
+    if(!inherits(x$map, "SpatRaster")){
+        x$map <- .toTerra(x$map)
+    }
+
     rdsFile <- rastFile <- .fullPath(filename)
-    extension(rdsFile)  <- ".rds"
-    extension(rastFile) <- .rasterExtension(format)          
-    f <- raster::filename(x$map)
-    if(inherits(x$map, "Raster")){
-        if(inMemory(x$map)){
-            ## In memory
-            x$map <- writeRaster(x$map, filename = rastFile, format=format, ...)
-        } else {
-            if(f!=rastFile){
-                ## File onDisk but not in requested path and/or format
-                x$map <- writeRaster(x$map, filename = rastFile, format=format, ...)                           
-            }
-        }  
+    rdsFile <- paste0(rdsFile, ".rds")
+    rastFile <- paste0(rastFile, .rasterExtension(format))
+
+    f <- terra::sources(x$map)
+
+    if(inMemory(x$map)){
+        x$map <- writeRaster(x$map, filename = rastFile, ...)
+    } else {
+        if(f!=rastFile){
+            x$map <- writeRaster(x$map, filename = rastFile, ...)
+        }
     }
-    saveRDS(x, rdsFile)
+    base::saveRDS(x, rdsFile)
 }
 
 #' @describeIn saveRSTBX Read files saved with saveRSTBX
 #' @export 
 readRSTBX <- function(filename){
     rdsFile <- rastFile <- .fullPath(filename)
-    extension(rdsFile)  <- ".rds"
-    x         <- readRDS(rdsFile)
-    if(!inherits(x, "RStoolbox")) stop(filename, "is not a RStoolbox object.", call. = FALSE)
+
+    x <- readRDS(rdsFile)
+    print(x)
+
+    if(!inherits(x, "RStoolbox"))
+      stop(filename, "is not a RStoolbox object.", call. = FALSE)
+
     namesBU <- names(x$map) ## backup names (might get lost between file formats)
-    if(inherits(x$map, "Raster")){
-        extension(rastFile) <-  extension(filename(x$map))  
+
+    if(inherits(x$map, "SpatRaster")){
+        rastFile <- paste0(rastFile, sources(x$map))
         if(!file.exists(rastFile)) {
             warning("Corresponding raster file ", rastFile, " cannot be found.  \nThe *.rds and the raster file must be located in the same directory.")
             x$map <- "Raster map not found"
         } else {
-            x$map <- if(inherits(x$map, "RasterLayer")) raster(rastFile) else brick(rastFile) 
+            x$map <- rast(rastFile)
         }          
         names(x$map) <- namesBU
     }
     x
 }
 
+test <- function(){
+    devtools::load_all()
+
+    train <- readRDS(system.file("external/trainingPoints.rds", package="RStoolbox"))
+    sc <- superClass(rlogo, train, tuneLength = 1, resp="class")
 
+    ## Save and re-import
+    outbase <- paste0(tempdir(),"/test-RSTOOLBOX-sc")
+    saveRSTBX(sc, outbase , overwrite = TRUE)
+    sc_re <- readRSTBX(paste0(outbase, ".rds"))
+}