diff --git a/NAMESPACE b/NAMESPACE index 0cb344b..5e09897 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -105,7 +105,6 @@ importFrom(jpeg,readJPEG) importFrom(magrittr,"%>%") importFrom(plyr,.) importFrom(plyr,arrange) -importFrom(plyr,compact) importFrom(plyr,ddply) importFrom(plyr,desc) importFrom(plyr,dlply) diff --git a/R/ggmap-package.R b/R/ggmap-package.R index 7b05f38..a1791aa 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 ddply desc dlply is.discrete is.formula join #' ldply llply . #' @importFrom bitops bitOr bitShiftL bitShiftR bitAnd #' @importFrom grDevices as.raster extendrange gray rgb diff --git a/R/qmplot.R b/R/qmplot.R index b2af1d4..3ce2307 100644 --- a/R/qmplot.R +++ b/R/qmplot.R @@ -275,7 +275,7 @@ qmplot <- function(x, y, ..., data, zoom, source = "stadia", maptype = "stamen_t if("mapcolour" %in% argsgiven) mapcolor <- eval(args$mapcolour) .all_aesthetics <- unlist(.all_aesthetics[1:42]) - aesthetics <- compact(arguments[.all_aesthetics]) + aesthetics <- Filter(function(x) !is.null(x), arguments[.all_aesthetics]) aesthetics <- aesthetics[!is.constant(aesthetics)] aes_names <- names(aesthetics) aesthetics <- rename_aes(aesthetics)