From 660dc975fd379b10d25a0f29666725f5119af9e1 Mon Sep 17 00:00:00 2001
From: Andrew Gene Brown <andrew.g.brown@usda.gov>
Date: Mon, 21 Oct 2024 14:35:56 -0700
Subject: [PATCH] relax test of extent to `relation="overlaps"` rather than
 `"contains"`

---
 R/fetchSOLUS.R                   |  3 ++-
 tests/testthat/test-fetchSOLUS.R | 23 +++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/R/fetchSOLUS.R b/R/fetchSOLUS.R
index 81878d60..f90c900c 100644
--- a/R/fetchSOLUS.R
+++ b/R/fetchSOLUS.R
@@ -166,7 +166,8 @@ fetchSOLUS <- function(x = NULL,
     xe <- terra::ext(terra::project(terra::as.polygons(x, ext = TRUE), r))
     
     # handle requests out-of-bounds
-    if (!terra::relate(terra::ext(r), xe, relation = "contains")[1]) {
+    if (!(terra::relate(terra::ext(r), xe, relation = "contains")[1] || 
+        terra::relate(terra::ext(r), xe, relation = "overlaps")[1])) {
       stop("Extent of `x` is outside the boundaries of the source data extent.", call. = FALSE)
     }
     
diff --git a/tests/testthat/test-fetchSOLUS.R b/tests/testthat/test-fetchSOLUS.R
index 8646b03f..3ee8196c 100644
--- a/tests/testthat/test-fetchSOLUS.R
+++ b/tests/testthat/test-fetchSOLUS.R
@@ -24,7 +24,7 @@ test_that("fetchSOLUS works", {
     geomIntersection = TRUE
   )
   
-  # SoilProfileCollection output, using linear interpolation for 1cm slices
+  # raster and SoilProfileCollection output, using linear interpolation for 1cm slices
   # site-level variables (e.g. resdept) added to site data.frame of SPC
   res <- fetchSOLUS(
     ssurgo.geom,
@@ -61,17 +61,32 @@ test_that("virtual and out-of-bounds requests", {
                     depth_slices = "0")
   
   expect_true(inherits(tmp, "SpatRaster"))
+  expect_true(grepl("claytotal_0_cm_p", terra::sources(tmp)))
   
   # virtual raster covers large area
   pe <- terra::as.polygons(tmp, ext = TRUE)
   expect_true(terra::expanse(pe, unit = "km") > 1e7)
   
-  # extract corner point and buffer 500m
-  te <- terra::buffer(terra::as.points(terra::simplifyGeom(pe))[1], 500)
+  # extract corner point and buffer 500km
+  te1 <- terra::buffer(terra::as.points(terra::simplifyGeom(pe))[1], 5e5)
+  
+  # only bottom-right corner returns data (expected 5000x5000 cells at 100m resolution)
+  expect_equal(terra::ncell(
+    fetchSOLUS(
+      x = te1,
+      variables = "claytotal",
+      output_type = "prediction",
+      depth_slices = "0"
+    )
+  ), 2.5e7)
+  
+  # choose an area that does not overlap the source raster at all
+  te2 <- terra::as.polygons(terra::ext(-1, 1, -1, 1))
+  terra::crs(te2) <- "OGC:CRS84"
   
   expect_error(
     fetchSOLUS(
-      x = te,
+      x = te2,
       variables = "claytotal",
       output_type = "prediction",
       depth_slices = "0"