diff --git a/NAMESPACE b/NAMESPACE index 0cb344b..80ff329 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -103,10 +103,8 @@ importFrom(httr,stop_for_status) importFrom(httr,warn_for_status) importFrom(jpeg,readJPEG) importFrom(magrittr,"%>%") -importFrom(plyr,.) importFrom(plyr,arrange) importFrom(plyr,compact) -importFrom(plyr,ddply) importFrom(plyr,desc) importFrom(plyr,dlply) importFrom(plyr,is.discrete) diff --git a/R/ggmap-package.R b/R/ggmap-package.R index 7b05f38..645b96f 100644 --- a/R/ggmap-package.R +++ b/R/ggmap-package.R @@ -2,8 +2,8 @@ #' @name ggmap #' @importFrom png readPNG #' @importFrom jpeg readJPEG -#' @importFrom plyr arrange compact ddply desc dlply is.discrete is.formula join -#' ldply llply . +#' @importFrom plyr arrange compact desc dlply is.discrete is.formula join +#' ldply llply #' @importFrom bitops bitOr bitShiftL bitShiftR bitAnd #' @importFrom grDevices as.raster extendrange gray rgb #' @importFrom stats time asOneSidedFormula diff --git a/R/ggmap.R b/R/ggmap.R index af3efc5..7e71326 100644 --- a/R/ggmap.R +++ b/R/ggmap.R @@ -147,7 +147,11 @@ #' geom_path(aes(x = lon, y = lat, group = plotOrder), #' data = zips, colour = "white", alpha = .4, size = .4) #' -#' library(plyr) +#' zips <- zips[!duplicated(names(zips))] +#' zipsLabels <- zips %>% +#' dplyr::slice(1L, .by = zip) %>% +#' dplyr::select(area, perimeter, zip, lonCent, latCent) %>% +#' dplyr::arrange(zip) #' zipsLabels <- ddply(zips, .(zip), function(df){ #' df[1,c("area", "perimeter", "zip", "lonCent", "latCent")] #' }) diff --git a/man/ggmap.Rd b/man/ggmap.Rd index 3868ace..3aad0d5 100644 --- a/man/ggmap.Rd +++ b/man/ggmap.Rd @@ -178,10 +178,11 @@ ggmap(get_map(maptype = "satellite", zoom = 8), extent = "device") + geom_path(aes(x = lon, y = lat, group = plotOrder), data = zips, colour = "white", alpha = .4, size = .4) -library(plyr) -zipsLabels <- ddply(zips, .(zip), function(df){ - df[1,c("area", "perimeter", "zip", "lonCent", "latCent")] -}) +zips <- zips[!duplicated(names(zips))] +zipsLabels <- zips %>% + dplyr::slice(1L, .by = zip) %>% + dplyr::select(area, perimeter, zip, lonCent, latCent) %>% + dplyr::arrange(zip) ggmap(get_map(maptype = "satellite", zoom = 9), extent = "device", legend = "none", darken = .5) + geom_text(aes(x = lonCent, y = latCent, label = zip, size = area),