From 0e890961b2c4dbc60c76df4dfcdfe7230449e23a Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 12:26:29 -0500 Subject: [PATCH 1/7] Start v2.2.2 release candidate --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 752b408b9..da66dadeb 100644 --- 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.1.9000 +Version: 2.2.2 Authors@R: c( person("Joe", "Cheng", , "joe@posit.co", role = c("aut", "cre")), person("Barret", "Schloerke", , "barret@posit.co", role = "aut", diff --git a/NEWS.md b/NEWS.md index 5d6630b13..7ae4188ee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# leaflet (development version) +# leaflet 2.2.2 * Fixed #893: Correctly call `terra::crs()` when checking the CRS of a `SpatVector` object in `pointData()` or `polygonData()` (thanks @mkoohafkan, #894). * `{leaflet}` now has a brand new pkgdown site (@olivroy, #902) From f748dd2f83767c6c738fbe48e8543516a94b748f Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 12:27:00 -0500 Subject: [PATCH 2/7] Update URLs --- README.md | 2 +- vignettes/leaflet.Rmd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 36c10b94e..64101de83 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![R build status](https://github.com/rstudio/leaflet/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rstudio/leaflet/actions) [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/leaflet)](https://www.r-pkg.org/pkg/leaflet) [![](https://www.r-pkg.org/badges/version/leaflet)](https://www.r-pkg.org/pkg/leaflet) -[![RStudio community](https://img.shields.io/badge/community-leaflet-blue?style=social&logo=rstudio&logoColor=75AADB)](https://community.rstudio.com/new-topic?title=&tags=leaflet&body=%0A%0A%0A%20%20--------%0A%20%20%0A%20%20%3Csup%3EReferred%20here%20by%20%60leaflet%60%27s%20GitHub%3C/sup%3E%0A&u=barret) +[![RStudio community](https://img.shields.io/badge/community-leaflet-blue?style=social&logo=rstudio&logoColor=75AADB)](https://forum.posit.co/new-topic?title=&tags=leaflet&body=%0A%0A%0A%20%20--------%0A%20%20%0A%20%20%3Csup%3EReferred%20here%20by%20%60leaflet%60%27s%20GitHub%3C/sup%3E%0A&u=barret) [Leaflet](https://leafletjs.com) is an open-source JavaScript library for diff --git a/vignettes/leaflet.Rmd b/vignettes/leaflet.Rmd index e072a4821..7080c16f5 100644 --- a/vignettes/leaflet.Rmd +++ b/vignettes/leaflet.Rmd @@ -16,7 +16,7 @@ knitr::opts_chunk$set( ## Introduction -[Leaflet](https://leafletjs.com) is one of the most popular open-source JavaScript libraries for interactive maps. It's used by websites ranging from [The New York Times](http://www.nytimes.com/projects/elections/2013/nyc-primary/mayor/map.html) and [The Washington Post](http://www.washingtonpost.com/sf/local/2013/11/09/washington-a-world-apart/) to [GitHub](https://github.com/blog/1528-there-s-a-map-for-that) and [Flickr](https://www.flickr.com/map), as well as GIS specialists like [OpenStreetMap](http://www.openstreetmap.org/), [Mapbox](http://www.mapbox.com/), and [CartoDB](http://cartodb.com/). +[Leaflet](https://leafletjs.com) is one of the most popular open-source JavaScript libraries for interactive maps. It's used by websites ranging from [The New York Times](https://www.nytimes.com/projects/elections/2013/nyc-primary/mayor/map.html) and [The Washington Post](https://www.washingtonpost.com/sf/local/2013/11/09/washington-a-world-apart/) to [GitHub](https://github.blog/2013-06-13-there-s-a-map-for-that/) and [Flickr](https://www.flickr.com/map), as well as GIS specialists like [OpenStreetMap](https://www.openstreetmap.org/), [Mapbox](https://www.mapbox.com/), and [CartoDB](https://carto.com/). This R package makes it easy to integrate and control Leaflet maps in R. @@ -31,7 +31,7 @@ This R package makes it easy to integrate and control Leaflet maps in R. * Popups * GeoJSON * Create maps right from the R console or RStudio -* Embed maps in [knitr](http://yihui.name/knitr/)/[R Markdown](http://rmarkdown.rstudio.com/) documents and [Shiny](http://shiny.rstudio.com/) apps +* Embed maps in [knitr](https://yihui.org/knitr/)/[R Markdown](https://rmarkdown.rstudio.com/) documents and [Shiny](https://shiny.posit.co/) apps * Easily render spatial objects from the `sp` or `sf` packages, or data frames with latitude/longitude columns * Use map bounds and mouse events to drive Shiny logic * Display maps in non spherical mercator projections @@ -47,7 +47,7 @@ install.packages("leaflet") # devtools::install_github("rstudio/leaflet") ``` -Once installed, you can use this package at the R console, within [R Markdown](http://rmarkdown.rstudio.com/) documents, and within [Shiny](http://shiny.rstudio.com/) applications. +Once installed, you can use this package at the R console, within [R Markdown](https://rmarkdown.rstudio.com/) documents, and within [Shiny](https://shiny.posit.co/) applications. ### Basic Usage From 48cc93d8b04e1c84d61e8b52478c170f157c5ea9 Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 16:41:24 -0500 Subject: [PATCH 3/7] Fix/update more urls --- vignettes/leaflet.Rmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vignettes/leaflet.Rmd b/vignettes/leaflet.Rmd index 7080c16f5..e015a3dbc 100644 --- a/vignettes/leaflet.Rmd +++ b/vignettes/leaflet.Rmd @@ -69,7 +69,7 @@ m <- leaflet() %>% m # Print the map ``` -In case you're not familiar with the [magrittr](https://github.com/smbache/magrittr) pipe operator (`%>%`), here is the equivalent without using pipes: +In case you're not familiar with the [magrittr](https://github.com/tidyverse/magrittr) pipe operator (`%>%`), here is the equivalent without using pipes: ```{r eval=FALSE} m <- leaflet() @@ -80,6 +80,6 @@ m ### Next Steps -We highly recommend that you proceed to [The Map Widget](map_widget.html) page before exploring the rest of this site, as it describes common idioms we'll use throughout the examples on the other pages. +We highly recommend that you proceed to [The Map Widget](widget.html) page before exploring the rest of this site, as it describes common idioms we'll use throughout the examples on the other pages. Although we have tried to provide an R-like interface to Leaflet, you may want to check out the [API documentation](https://leafletjs.com/reference.html) of Leaflet occasionally when the meanings of certain parameters are not clear to you. From 0dabf3078c69d733faf395ce1740aba8915e6d5e Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 16:55:36 -0500 Subject: [PATCH 4/7] Check-in revdep results --- revdep/README.md | 12 ++-- revdep/cran.md | 12 +--- revdep/failures.md | 176 ++++++++++++++++++++++++++++++++++++++++++++- revdep/problems.md | 25 +------ 4 files changed, 186 insertions(+), 39 deletions(-) diff --git a/revdep/README.md b/revdep/README.md index c56bedb10..2d61516ef 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,8 +1,12 @@ # Revdeps -## New problems (1) +## Failed to check (5) -|package |version |error |warning |note | -|:-------|:-------|:-----|:-------|:------| -|[SSDM](problems.md#ssdm)|0.2.9 | | |__+1__ | +|package |version |error |warning |note | +|:--------------------|:-------|:-----|:-------|:----| +|inlmisc |? | | | | +|leaflet.multiopacity |? | | | | +|leaflet.opacity |? | | | | +|modchart |? | | | | +|palmid |? | | | | diff --git a/revdep/cran.md b/revdep/cran.md index 126dedee6..6628e864a 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,15 +1,7 @@ ## revdepcheck results -We checked 163 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. +We checked 167 reverse dependencies (162 from CRAN + 5 from Bioconductor), 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 -(This reports the first line of each new failure) - -* SSDM - checking installed package size ... NOTE - diff --git a/revdep/failures.md b/revdep/failures.md index 9a2073633..fbf319022 100644 --- a/revdep/failures.md +++ b/revdep/failures.md @@ -1 +1,175 @@ -*Wow, no problems at all. :)* \ No newline at end of file +# inlmisc + +
+ +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/inlmisc +* Number of recursive dependencies: 137 + +Run `revdepcheck::cloud_details(, "inlmisc")` for more info + +
+ +## Error before installation + +### Devel + +``` + + + + + + +``` +### CRAN + +``` + + + + + + +``` +# leaflet.multiopacity + +
+ +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/leaflet.multiopacity +* Number of recursive dependencies: 84 + +Run `revdepcheck::cloud_details(, "leaflet.multiopacity")` for more info + +
+ +## Error before installation + +### Devel + +``` + + + + + + +``` +### CRAN + +``` + + + + + + +``` +# leaflet.opacity + +
+ +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/leaflet.opacity +* Number of recursive dependencies: 77 + +Run `revdepcheck::cloud_details(, "leaflet.opacity")` for more info + +
+ +## Error before installation + +### Devel + +``` + + + + + + +``` +### CRAN + +``` + + + + + + +``` +# modchart + +
+ +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/modchart +* Number of recursive dependencies: 123 + +Run `revdepcheck::cloud_details(, "modchart")` for more info + +
+ +## Error before installation + +### Devel + +``` + + + + + + +``` +### CRAN + +``` + + + + + + +``` +# palmid + +
+ +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/palmid +* Number of recursive dependencies: 128 + +Run `revdepcheck::cloud_details(, "palmid")` for more info + +
+ +## Error before installation + +### Devel + +``` + + + + + + +``` +### CRAN + +``` + + + + + + +``` diff --git a/revdep/problems.md b/revdep/problems.md index dd3e96999..9a2073633 100644 --- a/revdep/problems.md +++ b/revdep/problems.md @@ -1,24 +1 @@ -# SSDM - -
- -* 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(, "SSDM")` for more info - -
- -## Newly broken - -* checking installed package size ... NOTE - ``` - installed size is 5.2Mb - sub-directories of 1Mb or more: - R 1.5Mb - doc 3.3Mb - ``` - +*Wow, no problems at all. :)* \ No newline at end of file From 8b336f4691ddfe8a889249486a6f9912c94912aa Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 16:57:48 -0500 Subject: [PATCH 5/7] Rbuildignore all of vignettes --- .Rbuildignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index fa6391680..673811fb5 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -33,5 +33,5 @@ ^revdep$ ^CRAN-SUBMISSION$ ^_dev$ -^vignettes/articles$ +^vignettes$ ^pkgdown$ From 14af5a9f27a72ee7117dbe392824e13c44cea899 Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 17:10:34 -0500 Subject: [PATCH 6/7] Get rid of vignette yaml matter --- vignettes/leaflet.Rmd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vignettes/leaflet.Rmd b/vignettes/leaflet.Rmd index e015a3dbc..5d28df8bf 100644 --- a/vignettes/leaflet.Rmd +++ b/vignettes/leaflet.Rmd @@ -1,10 +1,5 @@ --- title: "Introduction to leaflet" -output: rmarkdown::html_vignette -vignette: > - %\VignetteIndexEntry{Introduction to leaflet} - %\VignetteEngine{knitr::rmarkdown} - %\VignetteEncoding{UTF-8} --- ```{r, include = FALSE} From 936e0ff644bd0980fb841e47f3f86788c5a070a1 Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 25 Mar 2024 17:12:57 -0500 Subject: [PATCH 7/7] Also remove VignetteBuilder field --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index da66dadeb..06c91a024 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -82,4 +82,3 @@ Config/Needs/website: dplyr, geojsonio, ncdf4, tidyverse/tidytemplate Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.1 -VignetteBuilder: knitr