handle empty numeric vectors without ifelse

adokter · Mar 28, 2024 · a25d6e1 · a25d6e1
1 parent 1dd4aa3
commit a25d6e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/R/plot.scan.R b/R/plot.scan.R
@@ -74,8 +74,8 @@ plot.scan <- function(x, param, xlim = c(0, 100000),
 
   rscale <- x$geo$rscale
   ascale <- x$geo$ascale
-  rstart <- ifelse(is.null(x$geo$rstart), 0, x$geo$rstart)
-  astart <- ifelse(is.null(x$geo$astart), 0, x$geo$astart)
+  rstart <- max(c(0, x$geo$rstart), na.rm = TRUE)
+  astart <- max(c(0, x$geo$astart), na.rm = TRUE)
 
   data <- raster::as.data.frame(raster::flip(raster::raster(t(data), ymn = astart, ymx = astart + 360, xmn = rstart, xmx = rstart + rscale * dimraster[1]), direction = "y"), xy = TRUE)
   # change the name from "layer" to the parameter names

diff --git a/R/project_as_ppi.R b/R/project_as_ppi.R
@@ -193,8 +193,9 @@ sample_polar <- function(param, grid_size, range_max, project, ylim, xlim, k = 4
     cartesian_to_polar(sp::coordinates(gridTopo), elev, k = k, lat = attributes(param)$geo$lat, re = re, rp = rp),
     rangebin = attributes(param)$geo$rscale,
     azimbin = attributes(param)$geo$ascale,
-    azimstart = ifelse(is.null(attributes(param)$geo$astart), 0, attributes(param)$geo$astart),
-    rangestart = ifelse(is.null(attributes(param)$geo$rstart), 0, attributes(param)$geo$rstart)
+    azimstart <- max(c(0, attributes(param)$geo$astart), na.rm = TRUE),
+    rangestart <- max(c(0, attributes(param)$geo$rstart), na.rm = TRUE)
+
   )
   # set indices outside the scan's matrix to NA
   nrang <- dim(param)[1]