Skip to content

Commit af60f53

Browse files
committed
activebindings work!
1 parent 12bd862 commit af60f53

File tree

4 files changed

+39
-26
lines changed

4 files changed

+39
-26
lines changed

R/plugin-minimap.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ addMiniMap <- function(
8888
tilesURL <- NULL
8989
tilesProvider <- NULL
9090
if (!is.null(tiles)) {
91-
if (tiles %in% get_providers()) {
91+
if (tiles %in% providers) {
9292
map$dependencies <- c(map$dependencies, leafletProviderDependencies())
9393
tilesProvider <- tiles
9494
} else {

R/plugin-providers.R

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,37 +68,39 @@ providerTileOptions <- function(errorTileUrl = "", noWrap = FALSE,
6868
#' @format A list of characters
6969
#' @source \url{https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js}
7070
#'
71-
#' @export
71+
#' @name providers
72+
#' @export providers
7273
#' @rdname providers
73-
makeActiveBinding("providers", function() {
74-
leaflet.providers::loaded_providers()$providers
75-
}, env = environment())
74+
NULL
75+
# Active binding added in zzz.R
76+
"providers"
7677

77-
#' @export
78+
#' @name providers.details
79+
#' @export providers.details
7880
#' @rdname providers
79-
makeActiveBinding("providers.details", function() {
80-
leaflet.providers::loaded_providers()$providers.details
81-
}, env = environment())
81+
NULL
82+
# Active binding added in zzz.R
83+
"providers.details"
8284

83-
makeActiveBinding("providers.version_num", function() {
84-
leaflet.providers::loaded_providers()$version_num
85-
}, env = environment())
85+
# Active binding added in zzz.R
86+
"providers.version_num"
8687

87-
makeActiveBinding("html_src", function() {
88-
leaflet.providers::loaded_providers()$html_dependency
89-
}, env = environment())
88+
# Active binding added in zzz.R
89+
"providers.src"
9090

9191
get_providers_html_dependency <- function() {
92-
tmpfile <- file.path(tempdir(), paste0("leaflet-providers_", version_num, ".js"))
92+
tmpfile <- file.path(tempdir(), paste0("leaflet-providers_", providers.version_num, ".js"))
9393

9494
if (!file.exists(tmpfile)) {
95-
src <- html_src
95+
src <- providers.src
9696
writeLines(src, tmpfile)
9797
}
9898

99-
html_dependency <- htmltools::htmlDependency(
99+
htmltools::htmlDependency(
100100
"leaflet-providers",
101101
providers.version_num,
102-
src = tmpfile
102+
src = dirname(tmpfile),
103+
script = basename(tmpfile),
104+
all_files = FALSE
103105
)
104106
}

R/zzz.R

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
leaflet_envir <- environment()
2+
.onLoad <- function(...) {
3+
makeActiveBinding("providers", function() {
4+
leaflet.providers::providers_loaded()$providers
5+
}, env = leaflet_envir)
6+
7+
makeActiveBinding("providers.details", function() {
8+
leaflet.providers::providers_loaded()$providers_details
9+
}, env = leaflet_envir)
10+
11+
makeActiveBinding("providers.version_num", function() {
12+
leaflet.providers::providers_loaded()$version_num
13+
}, env = leaflet_envir)
14+
15+
makeActiveBinding("providers.src", function() {
16+
leaflet.providers::providers_loaded()$src
17+
}, env = leaflet_envir)
18+
}

man/providers.Rd

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)