From 9d585435168d2891e51300b8603e7985448c5927 Mon Sep 17 00:00:00 2001
From: Samuel Araya <saraya209@users.noreply.github.com>
Date: Thu, 10 Feb 2022 11:57:06 -0600
Subject: [PATCH] Handle SpatRaster class rasters

Handle SpatRaster class rasters from terra package.
---
 R/gplot_data.R | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/R/gplot_data.R b/R/gplot_data.R
index 5d096bc..e6adf62 100644
--- a/R/gplot_data.R
+++ b/R/gplot_data.R
@@ -15,21 +15,36 @@
 #' @export
 
 gplot_data <- function(x, maxpixels = 50000)  {
-  x <- raster::sampleRegular(x, maxpixels, asRaster = TRUE)
-  coords <- raster::xyFromCell(x, seq_len(raster::ncell(x)))
-  ## Extract values
-  dat <- utils::stack(as.data.frame(raster::getValues(x)))
-  names(dat) <- c('value', 'variable')
-  # If only one variable
-  if (dat$variable[1] == "raster::getValues(x)") {
-    dat$variable <- names(x)
-  }
-
-  dat <- dplyr::as_tibble(data.frame(coords, dat))
-
-  if (!is.null(levels(x))) {
-    dat <- dplyr::left_join(dat, levels(x)[[1]],
-                            by = c("value" = "ID"))
+  if (class(x) == "SpatRaster"){ # work with terra package rasters
+    x <- terra::spatSample(x, maxpixels, as.raster = TRUE)
+    coords <- terra::xyFromCell(x, seq_len(terra::ncell(x)))
+    ## Extract values
+    dat <- utils::stack(as.data.frame(terra::values(x)))
+    names(dat) <- c('value', 'variable')
+    # If only one variable
+    if (dat$variable[1] == "terra::values(x)") {
+      dat$variable <- names(x)
+    }
+    
+    dat <- dplyr::as_tibble(data.frame(coords, dat))
+    ## OLD `gplot_data` FUNCTION
+  }else{ # work with raster package rasters
+    x <- raster::sampleRegular(x, maxpixels, asRaster = TRUE)
+    coords <- raster::xyFromCell(x, seq_len(raster::ncell(x)))
+    ## Extract values
+    dat <- utils::stack(as.data.frame(raster::getValues(x)))
+    names(dat) <- c('value', 'variable')
+    # If only one variable
+    if (dat$variable[1] == "raster::getValues(x)") {
+      dat$variable <- names(x)
+    }
+    
+    dat <- dplyr::as_tibble(data.frame(coords, dat))
+    
+    if (!is.null(levels(x))) {
+      dat <- dplyr::left_join(dat, levels(x)[[1]],
+                              by = c("value" = "ID"))
+    }
   }
   dat
 }