create html_dependency here, restore https handling

Author: leslie-huang

NAMESPACE

@@ -140,7 +140,6 @@ export(projectRasterForLeaflet)
 export(providerTileOptions)
 export(providers)
 export(providers.details)
-export(providers.version_num)
 export(removeControl)
 export(removeGeoJSON)
 export(removeImage)

NEWS

@@ -3,7 +3,6 @@ leaflet 2.0.3
 
 BUG FIXES and IMPROVEMENTS
 * Integrated data from `leaflet.providers` package; this breaks `data("providers")` and `data("providers.details")`. See [leaflet.providers](https://leslie-huang.github.io/leaflet.providers/). (#636)
-* Removed handling of http/https protocols for RStudio v1.1. Please update to RStudio>=v1.2 if you have missing tiles. Fixes #527. (#636)
 * Fixed [rstudio/crosstalk#58](https://github.com/rstudio/crosstalk/issues/58), which caused Leaflet maps that used Crosstalk shared data in Shiny apps, to be redrawn at incorrect times.
 * invokeRemote() now resolves html dependencies before passing them to shiny::createWebDependency() (#620).
 * Upgrade leaflet-provider to 1.4.0, enable more map variants such as CartoDB.Voyager (#567)

R/plugin-providers.R

@@ -69,35 +69,49 @@ providerTileOptions <- function(errorTileUrl = "", noWrap = FALSE,
 #' @source \url{https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js}
 #'
 #' @export
+#' @rdname providers
 providers <- NULL
 get_providers <- function() {
-  getOption("leaflet.providers", default = providers)
+  get_leaflet_providers_options("leaflet_providers", default = providers)
 }
 
-#' Providers Details
-#'
-#' List of all providers with their variations and additional info
-#'
-#' @format A list of lists (JSON)
-#' @source \url{https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js}
-#'
 #' @export
+#' @rdname providers
 providers.details <- NULL
 get_providers_details <- function() {
-  getOption("leaflet.providers.details", default = providers.details)
+  get_leaflet_providers_options("providers_details", default = providers.details)
 }
 
-#' Providers version number
-#'
-#' Version number of the providers data.
-#'
-#' @format character
-#' @source \url{https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js}
-#'
-#' @export
 providers.version_num <- NULL
 
-providers.html_dependency <- NULL
+get_providers_version_num <- function() {
+  get_leaflet_providers_options("version_num", default = providers.version_num)
+}
+
+providers.src <- NULL
+
 get_providers_html_dependency <- function() {
-  getOption("leaflet.providers.html_dependency", default = providers.html_dependency)
+  tmpfile <- file.path(tempdir(), paste0("leaflet-providers_", get_providers_version_num(), ".js"))
+
+  if (!file.exists(tmpfile)) {
+    src <- get_leaflet_providers_options("src", default = providers.src)
+    writeLines(src, tmpfile)
+  }
+
+  html_dependency <- htmltools::htmlDependency(
+    "leaflet-providers",
+    get_providers_version_num(),
+    src = tmpfile
+  )
+}
+
+get_leaflet_providers_options <- function(key, default) {
+  info <- getOption("leaflet.providers")
+  if (!is.null(info)) {
+    val <- info[[key]]
+    if (!is.null(val)) {
+      return(val)
+    }
+  }
+  return(default)
 }

R/zzz.R

@@ -4,5 +4,5 @@
   providers <<- providers_info$providers
   providers.details <<- providers_info$providers_details
   providers.version_num <<- providers_info$version_num
-  providers.html_dependency <<- providers_info$html_dependency
+  providers.src <<- providers_info$src
 }