feat: add support for apikey stored in env variable (for Stadia et Th…

…underforest providers)

DESCRIPTION

@@ -34,7 +34,8 @@ Imports:
     png, 
     terra,
     tools, 
-    slippymath
+    slippymath, 
+    utils
 Suggests:
     covr,
     tinytest

NAMESPACE

@@ -23,3 +23,4 @@ importFrom(terra,project)
 importFrom(terra,rast)
 importFrom(terra,writeRaster)
 importFrom(tools,file_path_sans_ext)
+importFrom(utils,globalVariables)

R/utils.R

@@ -95,11 +95,9 @@ get_param <- function(provider) {
     param <- provider
   } else {
     stamen_provider <- c(
-      "Stamen.Toner", "Stamen.TonerBackground",
-      "Stamen.TonerHybrid", "Stamen.TonerLines",
-      "Stamen.TonerLabels", "Stamen.TonerLite",
-      "Stamen.Watercolor", "Stamen.Terrain",
-      "Stamen.TerrainBackground",
+      "Stamen.Toner", "Stamen.TonerBackground", "Stamen.TonerHybrid",
+      "Stamen.TonerLines", "Stamen.TonerLabels", "Stamen.TonerLite",
+      "Stamen.Watercolor", "Stamen.Terrain", "Stamen.TerrainBackground",
       "Stamen.TerrainLabels"
     )
     if (provider %in% stamen_provider) {
@@ -114,11 +112,10 @@ get_param <- function(provider) {
         call. = FALSE
       )
     }
-    param <- maptiles_providers[[provider]]
+    param <- .global_maptiles$providers[[provider]]
   }
-  param$q <- gsub("XXXXXX", "{apikey}", param$q, perl = TRUE)
   param$ext <- get_extension(param$q)
-  param
+  return(param)
 }
 
 # get zoom
@@ -174,13 +171,22 @@ get_cached_raster <- function(filename, forceDownload, verbose) {
 
 
 # get the tiles according to the grid
-download_tiles <- function(tile_grid, param, apikey, verbose,
-                           cachedir, forceDownload) {
+download_tiles <- function(tile_grid, param, apikey, verbose, cachedir,
+                           forceDownload) {
   images <- vector("list", length = nrow(tile_grid$tiles))
-  if (missing(apikey)) {apikey <- ""}
   zoom <- tile_grid$zoom
   ext <- param$ext
   src <- param$src
+  if (missing(apikey)) {
+    apikey <- ""
+    if (startsWith(src, "Stadia") && Sys.getenv("STADIA_MAPS") != "") {
+      apikey <- Sys.getenv("STADIA_MAPS")
+    }
+    if (startsWith(src, "Thunderforest") &&
+        Sys.getenv("THUNDERFOREST_MAPS") != "") {
+      apikey <- Sys.getenv("THUNDERFOREST_MAPS")
+    }
+  }
   cpt <- 0
   for (i in seq_along(images)) {
     x <- tile_grid$tiles[i, ]

README.Rmd

@@ -31,7 +31,7 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re
 <!-- badges: end -->
 
 To create maps from tiles, `maptiles` downloads, composes and displays tiles 
-from a large number of providers (e.g. OpenStreetMap, Stamen, Esri, CARTO, or 
+from a large number of providers (e.g. OpenStreetMap, Stadia, Esri, CARTO, or 
 Thunderforest). 
 
 ## Installation

README.md

@@ -17,7 +17,7 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re
 <!-- badges: end -->
 
 To create maps from tiles, `maptiles` downloads, composes and displays
-tiles from a large number of providers (e.g. OpenStreetMap, Stamen,
+tiles from a large number of providers (e.g. OpenStreetMap, Stadia,
 Esri, CARTO, or Thunderforest).
 
 ## Installation
@@ -88,7 +88,7 @@ nc_osmpos <- get_tiles(
 )
 #> Zoom: 7
 #> Source(s): © OpenStreetMap contributors © CARTO 
-#> Cache directory: /tmp/Rtmpcn8iFm/CARTO.POSITRON
+#> Cache directory: /tmp/Rtmpjmeafm/CARTO.POSITRON
 #> 8 tiles
 # display map
 plot_tiles(nc_osmpos)