fix osm inheritance error, trim examples to help with check time

Author: paleolimbot

R/geom-osm.R

@@ -38,7 +38,7 @@
 #' library(prettymapr)
 #' # use as a backdrop for geographical data
 #' cities <- geocode(c("Halifax, NS", "Moncton, NB", "Montreal QC"))
-#' ggplot(cities, aes(lon, lat)) + geom_osm() +
+#' ggplot(cities, aes(lon, lat, shape = query)) + geom_osm() +
 #'   geom_point() + coord_map()
 #'
 #' # use ggosm() shorthand
@@ -76,6 +76,7 @@ geom_osm <- function(x = NULL, zoomin=0, zoom=NULL, type=NULL, forcedownload=FAL
   # return GeomTileSource layer
   layer(data = data, mapping = ggplot2::aes_string("x", "y"),
         position = "identity", geom = GeomTileSource, stat = "identity",
+        show.legend = FALSE, inherit.aes = FALSE,
         params = list(na.rm = TRUE, zoomin = zoomin, zoom = zoom, type = type,
                       forcedownload = forcedownload,
                       cachedir = cachedir, progress = progress, quiet = quiet))

R/geom-spatial.R

@@ -38,23 +38,14 @@
 #' }
 #'
 #' # plot a number of spatial objects
-#' data(longlake_marshdf, longlake_roadsdf, longlake_waterdf, longlake_depthdf,
-#'      longlake_streamsdf, longlake_buildingsdf)
 #' ggplot() +
 #'   geom_spatial(longlake_waterdf, fill="lightblue") +
 #'   geom_spatial(longlake_marshdf, fill="grey", alpha=0.5) +
 #'   geom_spatial(longlake_streamsdf, col="lightblue") +
 #'   geom_spatial(longlake_roadsdf, col="black") +
 #'   geom_spatial(longlake_buildingsdf, pch=1, col="brown", size=0.25) +
-#'   geom_spatial(longlake_depthdf, aes(col=DEPTH.M)) +
-#'   facet_wrap(~NOTES)+
 #'   coord_map()
 #'
-#'
-#' library(maptools)
-#' data(wrld_simpl)
-#' ggplot() + geom_spatial(wrld_simpl)
-#'
 geom_spatial <- function(data, ...) UseMethod("geom_spatial")
 
 

R/geom-spraster.R

@@ -195,9 +195,10 @@ geom_spraster_rgb <- function(raster, interpolate = FALSE, na.value = NA) {
 #' @examples
 #' # standard ggplot syntax
 #' ggplot() + geom_spatial(longlake_osm, aes(fill = band1)) + coord_fixed()
-#'
+#' \donttest{
 #' # or use ggraster()
 #' ggraster(longlake_osm, aes(fill = band1))
+#' }
 #'
 geom_spatial.Raster <- function(data, mapping = NULL, show.legend = TRUE, inherit.aes=FALSE,
                                 position = "identity", crsfrom = crsfrom, crsto = crsto,
@@ -269,10 +270,11 @@ ggraster <- function(data, mapping = NULL, ...) {
 #'             limits_red = NULL, limits_green = NULL, limits_blue = NULL,
 #'             limits_alpha = NULL, interpolate = TRUE) +
 #'   coord_fixed()
-#'
+#' \donttest{
 #' # using ggraster() with stat = 'rgba'
 #' ggraster(longlake_osm, aes(red = band1, green = band2, blue = band3, alpha = 1),
 #'          stat = "rgba")
+#' }
 #'
 stat_rgba <- function(mapping = NULL, data = NULL, ..., limits_red = NA, limits_green = NA,
                       limits_blue = NA, limits_alpha = NA) {