Slight SAPA Fix

- Only call terrain if w=1 and na.rm=FALSE
ailich · Dec 30, 2023 · e45ae09 · e45ae09
1 parent 6d340f3
commit e45ae09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/R/SAPA.R b/R/SAPA.R
@@ -119,7 +119,7 @@ SAPA<- function(r=NULL, w = 1, slope_correction=TRUE, na.rm=FALSE, include_scale
   } # Sum up surface area in focal window (or scale mean to number of cells)
 
   if(is.null(slope_layer) & slope_correction){
-    if (all(w==1)){
+    if (all(w==1) & (!na.rm)){
       slope_layer<- terra::terrain(r, v="slope", unit="radians", neighbors=8, wopt=wopt)
       } else{
         slope_layer<- SlpAsp(r, w=w+2, unit="radians", method="queen", metrics= "slope", na.rm=na.rm, include_scale=FALSE, wopt=wopt)

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 README
 ================
 Alexander Ilich
-September 12, 2023
+December 30, 2023
 
 # MultiscaleDTM
 
@@ -279,7 +279,7 @@ vrm<- VRM(r, w=c(5,5), na.rm = TRUE)
 ![](man/figures/README-VRM-1.png)<!-- -->
 
 ``` r
-sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE)
+sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE, na.rm=TRUE)
 ```
 
 ![](man/figures/README-SAPA-1.png)<!-- -->

diff --git a/man/fragments/README_Frag.Rmd b/man/fragments/README_Frag.Rmd
@@ -248,7 +248,7 @@ tm_shape(vrm, raster.downsample = FALSE)+
 ```
 
 ```{r}
-sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE)
+sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE, na.rm=TRUE)
 ```
 
 ```{r SAPA, echo=FALSE}
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,7 @@ tm_shape(vrm, raster.downsample = FALSE)+ @@
     ```
     ```{r}
-    sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE)
+    sapa<- SAPA(r, w=c(5,5), slope_correction = TRUE, na.rm=TRUE)
     ```
     ```{r SAPA, echo=FALSE}
@@ Expand Down @@