fix: prevent terra namespace conflict

drieslab · Oct 26, 2024 · 84eaf28 · 84eaf28
1 parent 9bf8d53
commit 84eaf28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/NAMESPACE b/NAMESPACE
@@ -389,6 +389,7 @@ importFrom(methods,validObject)
 importFrom(utils,.DollarNames)
 importMethodsFrom(Matrix,t)
 importMethodsFrom(terra,"ext<-")
+importMethodsFrom(terra,area)
 importMethodsFrom(terra,as.data.frame)
 importMethodsFrom(terra,as.points)
 importMethodsFrom(terra,as.polygons)

diff --git a/R/generics.R b/R/generics.R
@@ -90,7 +90,9 @@ setGeneric("affine", function(x, y, ...) standardGeneric("affine"))
 setGeneric("shear", function(x, ...) standardGeneric("shear"))
 setGeneric("XY", function(x, ...) standardGeneric("XY"))
 setGeneric("XY<-", function(x, ..., value) standardGeneric("XY<-"))
-setGeneric("area", function(x, ...) standardGeneric("area"))
+if (!isGeneric("area")) {
+    setGeneric("area", function(x, ...) standardGeneric("area"))
+}
 
 # Methods and documentations found in methods-overlaps.R
 setGeneric("overlaps", function(x, ...) standardGeneric("overlaps"))

diff --git a/R/package_imports.R b/R/package_imports.R
@@ -27,6 +27,7 @@
 #' @importMethodsFrom terra nrow ncol
 #' @importMethodsFrom terra hist density
 #' @importClassesFrom terra SpatExtent SpatVector
+#' @importMethodsFrom terra area
 #' @import GiottoUtils
 #' @import data.table
 #' @import utils