m

rspatial · Aug 24, 2023 · 201f622 · 201f622
1 parent 8418f9a
commit 201f622
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/R/focal.R b/R/focal.R
@@ -132,11 +132,11 @@ function(x, w=3, fun="sum", ..., na.policy="all", fillvalue=NA, expand=FALSE, si
 				}
 
 				if (checkNA) {
-				  if (nl > 1) {
-				    mv <- readValues(x[[j]], b$row[i], b$nrows[i])
-				  } else {
-				    mv <- readValues(x, b$row[i], b$nrows[i])
-				  }
+					if (nl > 1) {
+						mv <- readValues(x[[j]], b$row[i], b$nrows[i])
+					} else {
+						mv <- readValues(x, b$row[i], b$nrows[i])
+					}
 
 					if (na.only) {
 						k <- !is.na(mv)

diff --git a/R/values.R b/R/values.R
@@ -484,9 +484,8 @@ setMethod("all.equal", signature(target="SpatRaster", current="SpatRaster"),
 			hvT <- hasValues(target)
 			hvC <- hasValues(current)
 			if (hvT && hvC) {
-				s <- spatSample(c(target, current), maxcell, "regular")
-				s1 <- unlist(s[,1:nlyr(target)], use.names = FALSE)
-				s2 <- unlist(s[,(nlyr(target)+1):(nlyr(target) +nlyr(current))], use.names = FALSE)
+				s1 <- spatSample(current, maxcell, "regular")
+				s2 <- spatSample(target, maxcell, "regular")
 				a <- all.equal(s1, s2, ...)
 			} else if (hvT || hvC) {
 				if (hvT) {