From 791b97daf4f4c677c673942998c6698c0178df28 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 2 Jun 2025 10:59:54 -0700 Subject: [PATCH 1/2] use inherits() to determine 'formula' --- R/qmplot.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/qmplot.R b/R/qmplot.R index b2af1d4..0a83570 100644 --- a/R/qmplot.R +++ b/R/qmplot.R @@ -406,7 +406,7 @@ qmplot <- function(x, y, ..., data, zoom, source = "stadia", maptype = "stamen_t if (is.null(facets)) { p <- p + facet_null() - } else if (is.formula(facets) && length(facets) == 2) { + } else if (inherits(facets, "formula") && length(facets) == 2) { p <- p + facet_wrap(facets) } else { p <- p + facet_grid(facets = deparse(facets), margins = margins) From 2f066792f6b69b2135ece1070ccc07997eeb1c03 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Mon, 2 Jun 2025 11:01:58 -0700 Subject: [PATCH 2/2] remove from NAMESPACE, roxygen2 namespace --- NAMESPACE | 1 - R/ggmap-package.R | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 0cb344b..86f31a6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -110,7 +110,6 @@ importFrom(plyr,ddply) importFrom(plyr,desc) importFrom(plyr,dlply) importFrom(plyr,is.discrete) -importFrom(plyr,is.formula) importFrom(plyr,join) importFrom(plyr,ldply) importFrom(plyr,llply) diff --git a/R/ggmap-package.R b/R/ggmap-package.R index 7b05f38..00a56c1 100644 --- a/R/ggmap-package.R +++ b/R/ggmap-package.R @@ -2,7 +2,7 @@ #' @name ggmap #' @importFrom png readPNG #' @importFrom jpeg readJPEG -#' @importFrom plyr arrange compact ddply desc dlply is.discrete is.formula join +#' @importFrom plyr arrange compact ddply desc dlply is.discrete join #' ldply llply . #' @importFrom bitops bitOr bitShiftL bitShiftR bitAnd #' @importFrom grDevices as.raster extendrange gray rgb