Merge pull request #377 from sjevelazco/extr

calib_area was speeded up
sjevelazco · May 13, 2024 · f550efe · f550efe
2 parents 1691570 + a6d260a
commit f550efe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -158,6 +158,7 @@ importFrom(terra,freq)
 importFrom(terra,geom)
 importFrom(terra,global)
 importFrom(terra,is.factor)
+importFrom(terra,is.related)
 importFrom(terra,lapp)
 importFrom(terra,levels)
 importFrom(terra,mask)

diff --git a/R/calib_area.R b/R/calib_area.R
@@ -22,7 +22,7 @@
 #'
 #' @importFrom grDevices chull
 #' @importFrom methods as is
-#' @importFrom terra vect buffer aggregate union crs extract
+#' @importFrom terra vect buffer aggregate union crs extract is.related
 #'
 #' @examples
 #' \dontrun{
@@ -210,8 +210,9 @@ calib_area <- function(data, x, y, method, groups = NULL, crs = NULL) {
     data <- data[, c("x", "y")]
     data_sp <- data
     data_sp <- terra::vect(data_sp, geom = names(data_sp), crs = terra::crs(polyc))
-    result <- terra::extract(polyc, data_sp)[, cname] %>% unique()
-    result <- polyc[polyc[[cname]][, 1] %in% result, ]
+
+    result <- polyc[terra::is.related(polyc, data_sp, "intersects"), cname]
+    # result <- polyc[polyc[[cname]][, 1] %in% result, ]
   }
   return(result)
 }