Fix: replace Stamen/Stadia in vignettes, function documentation, and inst examples

R/layers.R

@@ -123,7 +123,7 @@ hideGroup <- function(map, group) {
 #'   addMarkers(data = quakes, group = "basic") %>%
 #'   # When zoomed in, we'll show circles at the base of each marker whose
 #'   # radius and color reflect the magnitude
-#'   addProviderTiles(providers$Stamen.TonerLite, group = "detail") %>%
+#'   addProviderTiles(providers$Esri.WorldTopoMap, group = "detail") %>%
 #'   addCircleMarkers(data = quakes, group = "detail", fillOpacity = 0.5,
 #'     radius = ~mag * 5, color = ~pal(mag), stroke = FALSE) %>%
 #'   # Set the detail group to only appear when zoomed in
@@ -1608,10 +1608,10 @@ clearGeoJSON <- function(map) {
 #' \donttest{
 #' leaflet() %>%
 #'   addTiles(group = "OpenStreetMap") %>%
-#'   addProviderTiles("Stamen.Toner", group = "Toner by Stamen") %>%
+#'   addProviderTiles("CartoDB.Voyager", group = "Carto Voyager") %>%
 #'   addMarkers(runif(20, -75, -74), runif(20, 41, 42), group = "Markers") %>%
 #'   addLayersControl(
-#'     baseGroups = c("OpenStreetMap", "Toner by Stamen"),
+#'     baseGroups = c("OpenStreetMap", "Carto Voyager"),
 #'     overlayGroups = c("Markers")
 #'   )
 #' }

R/plugin-providers.R

@@ -27,8 +27,8 @@ leafletProviderDependencies <- function() {
 #'
 #' @examples
 #' leaflet() %>%
-#'   addProviderTiles("Stamen.Watercolor") %>%
-#'   addProviderTiles("Stamen.TonerHybrid")
+#'   addProviderTiles("Esri.WorldTopoMap") %>%
+#'   addProviderTiles("CartoDB.DarkMatter")
 #'
 #' @export
 addProviderTiles <- function(

inst/examples/geojson.R

@@ -22,10 +22,10 @@ icons <- awesomeIconList(
 leaflet() %>% addTiles() %>%
   setView(10.758276373601069, 59.92448055859924, 13) %>%
   addAwesomeMarkers(data = spdf,
-             label = ~stringr::str_c(amenity, ": ", name),
-             icon = ~icons[amenity],
-             options = markerOptions(riseOnHover = TRUE, opacity = 0.75),
-             group = "pubs")
+                    label = ~stringr::str_c(amenity, ": ", name),
+                    icon = ~icons[amenity],
+                    options = markerOptions(riseOnHover = TRUE, opacity = 0.75),
+                    group = "pubs")
 
 
 #' <br/><br/>
@@ -36,7 +36,7 @@ mhSPDF <- geojsonio::geojson_read(url, what = "sp")
 
 cols <- colorFactor(topo.colors(nrow(mhSPDF)), mhSPDF$NAME_2)
 
-leaflet() %>% addProviderTiles(providers$Stamen.TonerLite) %>%
+leaflet() %>% addProviderTiles(providers$CartoDB.Voyager) %>%
   setView(75.7139, 19.7515, 6) %>%
   addPolygons(data = mhSPDF, opacity = 5,
               label = ~NAME_2, weight = 1,

inst/examples/providers-shiny.R

@@ -8,9 +8,9 @@ ui <- fluidPage(
       selectInput(
         "providerName",
         "Tile set",
-        c("Stamen.Toner",
-          "Stamen.TonerLite",
-          "Stamen.Watercolor")
+        c("CartoDB.Positron",
+          "CartoDB.Voyager",
+          "CartoDB.DarkMatter")
         )
     ),
     column(

vignettes/articles/basemaps.Rmd

@@ -29,9 +29,9 @@ Alternatively, many popular free third-party basemaps can be added using the `ad
 As a convenience, leaflet also provides a named list of all the third-party tile providers that are supported by the plugin. This enables you to use auto-completion feature of your favorite R IDE (like RStudio) and not have to remember or look up supported tile providers; just type `providers$` and choose from one of the options. You can also use `names(providers)` to view all of the options.
 
 ```{r fig.height=1.25}
-m %>% addProviderTiles(providers$Stadia.StamenToner)
 m %>% addProviderTiles(providers$CartoDB.Positron)
 m %>% addProviderTiles(providers$Esri.NatGeoWorldMap)
+m %>% addProviderTiles(providers$OpenTopoMap)
 ```
 
 Note that some tile set providers require you to register; see the [project page](https://github.com/leaflet-extras/leaflet-providers) for more information. You can pass access tokens/keys, and other options, to the tile provider by populating the `options` argument with the `providerTileOptions()` function.
@@ -59,8 +59,8 @@ leaflet() %>% addTiles() %>% setView(-93.65, 42.0285, zoom = 4) %>%
 You aren't restricted to using a single basemap on a map; you can stack them by adding multiple tile layers. This generally only makes sense if the front tiles consist of semi transparent tiles, or have an adjusted opacity via the `options` argument.
 
 ```{r fig.height=1.75}
-m %>% addProviderTiles(providers$MtbMap) %>%
-  addProviderTiles(providers$Stadia.StamenTonerLines,
-    options = providerTileOptions(opacity = 0.35)) %>%
-  addProviderTiles(providers$Stadia.StamenTonerLabels)
+m %>% 
+  addProviderTiles(providers$Esri.WorldImagery,
+                   options = providerTileOptions(opacity = 0.5)) %>%
+  addProviderTiles(providers$CartoDB.VoyagerOnlyLabels)
 ```

vignettes/articles/shiny.Rmd

@@ -37,7 +37,7 @@ server <- function(input, output, session) {
 
   output$mymap <- renderLeaflet({
     leaflet() %>%
-      addProviderTiles(providers$Stadia.StamenTonerLite,
+      addProviderTiles(providers$CartoDB.Positron,
         options = providerTileOptions(noWrap = TRUE)
       ) %>%
       addMarkers(data = points())

vignettes/articles/showhide.Rmd

@@ -55,15 +55,33 @@ outline <- quakes[chull(quakes$long, quakes$lat),]
 map <- leaflet(quakes) %>%
   # Base groups
   addTiles(group = "OSM (default)") %>%
-  addProviderTiles(providers$Stadia.StamenToner, group = "Toner") %>%
-  addProviderTiles(providers$Stadia.StamenTonerLite, group = "Toner Lite") %>%
+  addProviderTiles(providers$CartoDB.Positron, group = "Positron (minimal)") %>%
+  addProviderTiles(providers$Esri.WorldImagery, group = "World Imagery (satellite)") %>%
   # Overlay groups
-  addCircles(~long, ~lat, ~10^mag/5, stroke = FALSE, group = "Quakes") %>%
-  addPolygons(data = outline, lng = ~long, lat = ~lat,
-    fill = FALSE, weight = 2, color = "#FFFFCC", group = "Outline") %>%
+  addCircles(
+    ~ long,
+    ~ lat,
+    ~ 10 ^ mag / 5,
+    stroke = FALSE,
+    group = "Quakes",
+    fillColor = "tomato"
+  ) %>%
+  addPolygons(
+    data = outline,
+    lng = ~ long,
+    lat = ~ lat,
+    fill = FALSE,
+    weight = 2,
+    color = "#FFFFCC",
+    group = "Outline"
+  ) %>%
   # Layers control
   addLayersControl(
-    baseGroups = c("OSM (default)", "Toner", "Toner Lite"),
+    baseGroups = c(
+      "OSM (default)",
+      "Positron (minimal)",
+      "World Imagery (satellite)"
+    ),
     overlayGroups = c("Quakes", "Outline"),
     options = layersControlOptions(collapsed = FALSE)
   )