R oldrel-2 (4.3) doesn't have %||%

achubaty · achubaty · commit 3ca276a4f3d4 · 2025-07-29T16:41:02.000-06:00
diff --git a/R/map.R b/R/map.R
@@ -226,7 +226,7 @@ mapAdd.default <- function(obj = NULL, map = new("map"), layerName = NULL,
     stop("layerName is required and cannot be NULL")
   }
 
-  leaflet <- leaflet %||% FALSE
+  leaflet <- ifelse(!is.null(leaflet), leaflet, FALSE) ## leaflet %||% FALSE
   if (is.logical(leaflet)) {
     leaflet <- asPath(ifelse(leaflet, getwd(), NA_character_))
   }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ mapAdd.default <- function(obj = NULL, map = new("map"), layerName = NULL,`
`226`	`226`	`stop("layerName is required and cannot be NULL")`
`227`	`227`	`}`
`228`	`228`
`229`		`- leaflet <- leaflet %\|\|% FALSE`
	`229`	`+ leaflet <- ifelse(!is.null(leaflet), leaflet, FALSE) ## leaflet %\|\|% FALSE`
`230`	`230`	`if (is.logical(leaflet)) {`
`231`	`231`	`leaflet <- asPath(ifelse(leaflet, getwd(), NA_character_))`
`232`	`232`	`}`