rstudio · gadenbuie · Nov 15, 2023 · Oct 23, 2023 · Oct 23, 2023 · Oct 23, 2023
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,7 +6,7 @@
 ^inst/htmlwidgets/sources
 \.bower\.json$
 \.bowerrc$
-^docs/
+^docs$
 ^\.eslintrc\.json$
 ^Gruntfile\.js$
 ^javascript$
@@ -24,13 +24,12 @@
 ^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster-src.js$
 ^inst/htmlwidgets/lib/leaflet-measure/leaflet-measure.js$
 ^inst/htmlwidgets/plugins/Proj4Leaflet/proj4.js$
-^revdep/
 ^\.lintr$
-^\.github/
-^man-roxygen/
+^\.github$
+^man-roxygen$
 ^viztest-.*
-^scripts
+^scripts$
 ^cran-comments\.md$
 ^revdep$
-^\.github$
 ^CRAN-SUBMISSION$
+^_dev$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: leaflet
 Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
-Version: 2.2.0.9000
+Version: 2.2.1
 Authors@R: c(
     person("Joe", "Cheng", , "joe@posit.co", role = c("aut", "cre")),
     person("Barret", "Schloerke", , "barret@posit.co", role = "aut",
@@ -54,7 +54,7 @@ Imports:
     htmltools,
     htmlwidgets (>= 1.5.4),
     jquerylib,
-    leaflet.providers (>= 1.13.0.9001),
+    leaflet.providers (>= 2.0.0),
     magrittr,
     methods,
     png,
@@ -79,6 +79,4 @@ Suggests:
 Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
-Remotes:
-    rstudio/leaflet.providers
 RoxygenNote: 7.2.3
diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# leaflet (development version)
+# leaflet 2.2.1
 
 * 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).
 

diff --git a/R/layers.R b/R/layers.R
@@ -1177,10 +1177,13 @@ markerOptions <- function(
 #'   spiderfy it so you can see all of its markers
 #' @param removeOutsideVisibleBounds clusters and markers too far from the
 #'   viewport are removed from the map for performance
-#' @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 }
+#' @param spiderLegPolylineOptions Allows you to specify
+#'   \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#polyline-option}{PolylineOptions}
+#'   to style spider legs. By default, they are
+#'   \code{\{weight: 1.5, color: "#222", opacity: 0.5 \}}.
 #' @param freezeAtZoom Allows you to freeze cluster expansion to a zoom level.
-#' Can be a zoom level e.g. 10, 12 or "max" or "maxKeepSpiderify"
-#' See \url{https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference}
+#'   Can be a zoom level e.g. 10, 12 or "max" or "maxKeepSpiderify".
+#'   See <https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference>.
 #' @describeIn map-options Options for marker clusters
 #' @export
 markerClusterOptions <- function(

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,18 +1,15 @@
 ## Comments
 
-This release removes dependencies on rgdal and rgeos, in addition to other general improvements and bug fixes.
+This is a small release to use the latest version of {leaflet.providers}.
 
 Please let us know if we can provide any more information.
 
 ## revdepcheck results
 
-We checked 165 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 163 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
- * We saw 1 new problems
+ * We saw 0 new problems
  * We failed to check 0 packages
 
 Issues with CRAN packages are summarised below.
 
-### New problems
-
-* 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).
diff --git a/man/map-options.Rd b/man/map-options.Rd
diff --git a/revdep/README.md b/revdep/README.md
@@ -2,7 +2,7 @@
 
 ## New problems (1)
 
-|package         |version |error  |warning |note |
-|:---------------|:-------|:------|:-------|:----|
-|[leaflet.opacity](problems.md#leafletopacity)|0.1.0   |__+1__ |        |1    |
+|package |version |error |warning |note   |
+|:-------|:-------|:-----|:-------|:------|
+|[SSDM](problems.md#ssdm)|0.2.9   |      |        |__+1__ |
 
diff --git a/revdep/cran.md b/revdep/cran.md
@@ -1,6 +1,6 @@
 ## revdepcheck results
 
-We checked 165 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 163 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 1 new problems
  * We failed to check 0 packages
@@ -10,6 +10,6 @@ Issues with CRAN packages are summarised below.
 ### New problems
 (This reports the first line of each new failure)
 
-* leaflet.opacity
-  checking tests ... ERROR
+* SSDM
+  checking installed package size ... NOTE
 
diff --git a/revdep/problems.md b/revdep/problems.md
@@ -1,45 +1,24 @@
-# leaflet.opacity
+# SSDM
 
 <details>
 
-* Version: 0.1.0
-* GitHub: https://github.com/be-marc/leaflet.opacity
-* Source code: https://github.com/cran/leaflet.opacity
-* Date/Publication: 2018-11-29 16:00:10 UTC
-* Number of recursive dependencies: 80
+* Version: 0.2.9
+* GitHub: https://github.com/sylvainschmitt/SSDM
+* Source code: https://github.com/cran/SSDM
+* Date/Publication: 2023-10-24 13:40:18 UTC
+* Number of recursive dependencies: 123
 
-Run `revdepcheck::cloud_details(, "leaflet.opacity")` for more info
+Run `revdepcheck::cloud_details(, "SSDM")` for more info
 
 </details>
 
 ## Newly broken
 
-*   checking tests ... ERROR
+*   checking installed package size ... NOTE
     ```
-      Running ‘testthat.R’
-    Running the tests in ‘tests/testthat.R’ failed.
-    Last 13 lines of output:
-      y[1]: "opacity"
-      ── Failure ('test-controls.R:52:3'): Initialize map dependencies in addHigherOpacity ──
-      res$dependencies[[1]]$name not equal to "jquery-ui".
-      1/1 mismatches
-      x[1]: "jquery"
-      y[1]: "jquery-ui"
-      ── Failure ('test-controls.R:53:3'): Initialize map dependencies in addHigherOpacity ──
-      res$dependencies[[2]]$name not equal to "opacity".
-      1/1 mismatches
-      x[1]: "leaflet"
-      y[1]: "opacity"
-
-      [ FAIL 6 | WARN 4 | SKIP 0 | PASS 3 ]
-      Error: Test failures
-      Execution halted
-    ```
-
-## In both
-
-*   checking LazyData ... NOTE
-    ```
-      'LazyData' is specified without a 'data' directory
+      installed size is  5.2Mb
+      sub-directories of 1Mb or more:
+        R     1.5Mb
+        doc   3.3Mb
     ```
 
diff --git a/scripts/viztest.R b/scripts/viztest.R
@@ -4,7 +4,17 @@ remotes::install_github("schloerke/viztest")
 
 # compare to leaflet.js v0.7.x
 # viztest::viztest(".", "rstudio/leaflet@d489e2c", resize = FALSE, stomp = TRUE)
-viztest::viztest(".", "leaflet", output_dir = paste("../viztest",
-    devtools::as.package(".")$package, devtools::as.package(".")$version, sep = "-"), resize = FALSE, stomp = TRUE)
+viztest::viztest(
+  ".",
+  "leaflet",
+  output_dir = paste(
+    "../viztest",
+    devtools::as.package(".")$package,
+    devtools::as.package(".")$version,
+    sep = "-"
+  ),
+  resize = FALSE,
+  stomp = TRUE
+)
 
 # viztest::viztest(".", "rstudio/leaflet", resize = FALSE, stomp = TRUE, skip_old = TRUE)