Skip to content

Commit f1c050b

Browse files
gadenbuiegadenbuie
authored
v2.2.1 (#888)
1 parent 18f09fd commit f1c050b

File tree

10 files changed

+53
-64
lines changed

10 files changed

+53
-64
lines changed

‎.Rbuildignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
^inst/htmlwidgets/sources
77
\.bower\.json$
88
\.bowerrc$
9-
^docs/
9+
^docs$
1010
^\.eslintrc\.json$
1111
^Gruntfile\.js$
1212
^javascript$
@@ -24,13 +24,12 @@
2424
^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster-src.js$
2525
^inst/htmlwidgets/lib/leaflet-measure/leaflet-measure.js$
2626
^inst/htmlwidgets/plugins/Proj4Leaflet/proj4.js$
27-
^revdep/
2827
^\.lintr$
29-
^\.github/
30-
^man-roxygen/
28+
^\.github$
29+
^man-roxygen$
3130
^viztest-.*
32-
^scripts
31+
^scripts$
3332
^cran-comments\.md$
3433
^revdep$
35-
^\.github$
3634
^CRAN-SUBMISSION$
35+
^_dev$

‎DESCRIPTION‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: leaflet
33
Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
4-
Version: 2.2.0.9000
4+
Version: 2.2.1
55
Authors@R: c(
66
person("Joe", "Cheng", , "joe@posit.co", role = c("aut", "cre")),
77
person("Barret", "Schloerke", , "barret@posit.co", role = "aut",
@@ -54,7 +54,7 @@ Imports:
5454
htmltools,
5555
htmlwidgets (>= 1.5.4),
5656
jquerylib,
57-
leaflet.providers (>= 1.13.0.9001),
57+
leaflet.providers (>= 2.0.0),
5858
magrittr,
5959
methods,
6060
png,
@@ -79,6 +79,4 @@ Suggests:
7979
Config/testthat/edition: 3
8080
Encoding: UTF-8
8181
LazyData: true
82-
Remotes:
83-
rstudio/leaflet.providers
8482
RoxygenNote: 7.2.3

‎NEWS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# leaflet (development version)
1+
# leaflet 2.2.1
22

33
* When `addProviderTiles()` is used with `{leaflet.providers}` version 2.0.0 or later, the `leaflet-providers` HTML dependency produced can be correctly cached by knitr. When used with older versions of `{leaflet.providers}`, the HTML dependency uses temp files that break knitr's caching mechanism (thanks @qdread, @jaredlander; #884).
44

‎R/layers.R‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,10 +1177,13 @@ markerOptions <- function(
11771177
#' spiderfy it so you can see all of its markers
11781178
#' @param removeOutsideVisibleBounds clusters and markers too far from the
11791179
#' viewport are removed from the map for performance
1180-
#' @param spiderLegPolylineOptions Allows you to specify PolylineOptions (\url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#polyline-option}) to style spider legs. By default, they are { weight: 1.5, color: "#222", opacity: 0.5 }
1180+
#' @param spiderLegPolylineOptions Allows you to specify
1181+
#' \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#polyline-option}{PolylineOptions}
1182+
#' to style spider legs. By default, they are
1183+
#' \code{\{weight: 1.5, color: "#222", opacity: 0.5 \}}.
11811184
#' @param freezeAtZoom Allows you to freeze cluster expansion to a zoom level.
1182-
#' Can be a zoom level e.g. 10, 12 or "max" or "maxKeepSpiderify"
1183-
#' See \url{https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference}
1185+
#' Can be a zoom level e.g. 10, 12 or "max" or "maxKeepSpiderify".
1186+
#' See <https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference>.
11841187
#' @describeIn map-options Options for marker clusters
11851188
#' @export
11861189
markerClusterOptions <- function(

‎cran-comments.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
## Comments
22

3-
This release removes dependencies on rgdal and rgeos, in addition to other general improvements and bug fixes.
3+
This is a small release to use the latest version of {leaflet.providers}.
44

55
Please let us know if we can provide any more information.
66

77
## revdepcheck results
88

9-
We checked 165 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
9+
We checked 163 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
1010

11-
* We saw 1 new problems
11+
* We saw 0 new problems
1212
* We failed to check 0 packages
1313

1414
Issues with CRAN packages are summarised below.
1515

16-
### New problems
17-
18-
* leaflet.opacity: We provided a fix to the maintainer in a pull request on 2023-08-15 (https://github.com/be-marc/leaflet.opacity/pull/3).

‎man/map-options.Rd‎

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

‎revdep/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## New problems (1)
44

5-
|package |version |error |warning |note |
6-
|:---------------|:-------|:------|:-------|:----|
7-
|[leaflet.opacity](problems.md#leafletopacity)|0.1.0 |__+1__ | |1 |
5+
|package |version |error |warning |note |
6+
|:-------|:-------|:-----|:-------|:------|
7+
|[SSDM](problems.md#ssdm)|0.2.9 | | |__+1__ |
88

‎revdep/cran.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## revdepcheck results
22

3-
We checked 165 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
3+
We checked 163 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
44

55
* We saw 1 new problems
66
* We failed to check 0 packages
@@ -10,6 +10,6 @@ Issues with CRAN packages are summarised below.
1010
### New problems
1111
(This reports the first line of each new failure)
1212

13-
* leaflet.opacity
14-
checking tests ... ERROR
13+
* SSDM
14+
checking installed package size ... NOTE
1515

‎revdep/problems.md‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,24 @@
1-
# leaflet.opacity
1+
# SSDM
22

33
<details>
44

5-
* Version: 0.1.0
6-
* GitHub: https://github.com/be-marc/leaflet.opacity
7-
* Source code: https://github.com/cran/leaflet.opacity
8-
* Date/Publication: 2018-11-29 16:00:10 UTC
9-
* Number of recursive dependencies: 80
5+
* Version: 0.2.9
6+
* GitHub: https://github.com/sylvainschmitt/SSDM
7+
* Source code: https://github.com/cran/SSDM
8+
* Date/Publication: 2023-10-24 13:40:18 UTC
9+
* Number of recursive dependencies: 123
1010

11-
Run `revdepcheck::cloud_details(, "leaflet.opacity")` for more info
11+
Run `revdepcheck::cloud_details(, "SSDM")` for more info
1212

1313
</details>
1414

1515
## Newly broken
1616

17-
* checking tests ... ERROR
17+
* checking installed package size ... NOTE
1818
```
19-
Running ‘testthat.R’
20-
Running the tests in ‘tests/testthat.R’ failed.
21-
Last 13 lines of output:
22-
y[1]: "opacity"
23-
── Failure ('test-controls.R:52:3'): Initialize map dependencies in addHigherOpacity ──
24-
res$dependencies[[1]]$name not equal to "jquery-ui".
25-
1/1 mismatches
26-
x[1]: "jquery"
27-
y[1]: "jquery-ui"
28-
── Failure ('test-controls.R:53:3'): Initialize map dependencies in addHigherOpacity ──
29-
res$dependencies[[2]]$name not equal to "opacity".
30-
1/1 mismatches
31-
x[1]: "leaflet"
32-
y[1]: "opacity"
33-
34-
[ FAIL 6 | WARN 4 | SKIP 0 | PASS 3 ]
35-
Error: Test failures
36-
Execution halted
37-
```
38-
39-
## In both
40-
41-
* checking LazyData ... NOTE
42-
```
43-
'LazyData' is specified without a 'data' directory
19+
installed size is 5.2Mb
20+
sub-directories of 1Mb or more:
21+
R 1.5Mb
22+
doc 3.3Mb
4423
```
4524

‎scripts/viztest.R‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ remotes::install_github("schloerke/viztest")
44

55
# compare to leaflet.js v0.7.x
66
# viztest::viztest(".", "rstudio/leaflet@d489e2c", resize = FALSE, stomp = TRUE)
7-
viztest::viztest(".", "leaflet", output_dir = paste("../viztest",
8-
devtools::as.package(".")$package, devtools::as.package(".")$version, sep = "-"), resize = FALSE, stomp = TRUE)
7+
viztest::viztest(
8+
".",
9+
"leaflet",
10+
output_dir = paste(
11+
"../viztest",
12+
devtools::as.package(".")$package,
13+
devtools::as.package(".")$version,
14+
sep = "-"
15+
),
16+
resize = FALSE,
17+
stomp = TRUE
18+
)
919

1020
# viztest::viztest(".", "rstudio/leaflet", resize = FALSE, stomp = TRUE, skip_old = TRUE)

0 commit comments

Comments
 (0)