diff --git a/.Rbuildignore b/.Rbuildignore index 67fb70193..17dc8aeb6 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -33,3 +33,4 @@ ^cran-comments\.md$ ^revdep$ ^\.github$ +^CRAN-SUBMISSION$ diff --git a/DESCRIPTION b/DESCRIPTION index 31b9099fc..292d8fdc6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,11 @@ Type: Package Package: leaflet Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library -Version: 2.1.2.9000 +Version: 2.2.0 Authors@R: c( - person("Joe", "Cheng", , "joe@rstudio.com", role = c("aut", "cre")), - person("Barret", "Schloerke", role = "aut"), + person("Joe", "Cheng", , "joe@posit.co", role = c("aut", "cre")), + person("Barret", "Schloerke", , "barret@posit.co", role = "aut", + comment = c(ORCID = "0000-0001-9986-114X")), person("Bhaskar", "Karambelkar", role = "aut"), person("Yihui", "Xie", role = "aut"), person("Hadley", "Wickham", role = "ctb"), @@ -46,7 +47,7 @@ License: GPL-3 URL: https://rstudio.github.io/leaflet/, https://github.com/rstudio/leaflet BugReports: https://github.com/rstudio/leaflet/issues -Depends: +Depends: R (>= 3.1.0) Imports: crosstalk, diff --git a/NEWS b/NEWS.md similarity index 91% rename from NEWS rename to NEWS.md index 09d960361..254beb100 100644 --- a/NEWS +++ b/NEWS.md @@ -1,14 +1,14 @@ -## leaflet 2.1.2.9000 +# leaflet 2.2.0 -FEATURES +### Features - Added support for SpatRaster and SpatVector objects from the terra package. (#728) -BUG FIXES and IMPROVEMENTS +- `leaflet()` now uses jQuery 3.6.0 provided via the `{jquerylib}`package. As a result of this change, the HTML dependencies for `leaflet()` are included in the `dependencies` item of the htmlwidget object it returns. (#817, #821) -- Use correct license in OpenStreetMap attribution. (#811) +## Bug fixes and improvements -- Update jQuery to utilize `{jquerylib}`. (#817) +- Use correct license in OpenStreetMap attribution. (#811) - Use `xfun::base64_uri()` for base64 encoding instead of **markdown** and **base64enc**. (#823) @@ -18,23 +18,23 @@ BUG FIXES and IMPROVEMENTS - Fixed #866: Correctly call `terra::has.RGB()` in `addRasterImage()` for a `SpatRaster` object. (#869) -## leaflet 2.1.2 +# leaflet 2.1.2 -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Removed S3 warnings found on R devel (#848) -## leaflet 2.1.1 +# leaflet 2.1.1 -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - The default marker icon for `addMarkers` no longer worked, due to the CDN we were relying on apparently being retired. Fixed by pointing to a new CDN. (#782) - New behavior from tile.openstreetmap.org caused `addTiles` default tileset to break when viewed under non-https protocol on recent versions of Chrome. Fixed by always using the https protocol to connect to openstreetmap. (#786) -## leaflet 2.1.0 +# leaflet 2.1.0 -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Enable JS function literals (wrapped in `htmlwidgets::JS()`) to be included in arguments to methods invoked on `leafletProxy` objects. (JS function literals could already be included with methods invoked on `leaflet` objects, so this change just brings `leafletProxy` to parity.) (#420) @@ -42,25 +42,25 @@ BUG FIXES and IMPROVEMENTS - Allow for _hidden_ but not suspended leaflet maps to queue calls (such as add raster images) until they are rendered. If a new leaflet map is created, all pending calls are removed. (#771) -## leaflet 2.0.4.1 +# leaflet 2.0.4.1 -FEATURES +## Features - Updated proj4.js to 2.6.2 -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Minor tweaks to example data and tests, required to stay on CRAN - Fixes broken URL (#742) and updated examples to run from system files (#576) including updated .Rmd and .html docs. -## leaflet 2.0.3 +# leaflet 2.0.3 -BREAKING CHANGES +## Breaking changes - `data("providers")` and `data("providers.details")` no longer exist. Please use `leaflet::providers` and `leaflet::providers.details`. (#636) -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Integrated data from `leaflet.providers` package. See [leaflet.providers](https://rstudio.github.io/leaflet.providers/) for details. (#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. @@ -69,32 +69,32 @@ BUG FIXES and IMPROVEMENTS - `sf` objects with `names` attributes in the `st_geometry` now visualise correctly (#595) - GeoJSON objects missing `properties` can now be displayed (#622) -## leaflet 2.0.2 +# leaflet 2.0.2 -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Require viridis >= 0.5.1 to avoid namespace issues with viridisLite (#557) - Fixed broken mouse events after using leaflet-search from leaflet.extras within shiny applications (#563) -- Use leaflet namespace on `providers` in `addMiniMap` to make the function accessible in other packages. Fixes [mtennekes/tmap#231](https://github.com/mtennekes/tmap/issues/231). (#568) +- Use leaflet namespace on `providers` in `addMiniMap` to make the function accessible in other packages. Fixes [r-tmap/tmap#231](https://github.com/r-tmap/tmap/issues/231). (#568) - Require scales >= 1.0.0 to avoid exact color matching issues (#578) -## leaflet 2.0.1 +# leaflet 2.0.1 -FEATURES +## Features - Added method `addMapPane` to add custom pane layers to have fine tune control over layer ordering. New feature from within leaflet.js v1.x. (#549) - Exposed htmlwidgets sizingPolicy in leaflet() (#548) -BUG FIXES and IMPROVEMENTS +## Bug fixes and improvements - Default marker icon locations will now use unpkg.com instead of the leaflet cdn when using https or file protocols. (#544) - `.leaflet-map-pane` `z-index` switched to 'auto'. Allows for map panes to appear above the map if they appear later in the dom. (#537) - Use correct Leaflet.js scale control remove method. (#547) - Start from world view if using flyTo or flyToBounds. (#552) -## leaflet 2.0.0 +# leaflet 2.0.0 -BREAKING CHANGES +## Breaking changes - Update to latest leaflet.js v1.3.1 (#453, 314616f) Please see https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html for the latest documentation @@ -121,7 +121,7 @@ BREAKING CHANGES - Tooltips are now displayed with default Leaflet.js styling - In custom javascript extensions, change all `*.bindLabel()` to `*.bindTooltip()` -BUG FIXES AND FEATURES +## Bug fixes and features - Relative protocols are used where possible when adding tiles (#526). In RStudio 1.1.x on linux and windows, a known issue of 'https://' routes fail to load, but works within browsers (rstudio/rstudio#2661). @@ -163,7 +163,7 @@ BUG FIXES AND FEATURES - Added `preferCanvas` argument to `leafletOptions()` (#521) -## leaflet 1.1.0 +# leaflet 1.1.0 - Add support for sf. sf, sfc, and sfg classes are supported with POINT, LINESTRING, MULTILINESTRING, POLYGON, and MULTIPOLYGON geometries (note @@ -202,7 +202,7 @@ BUG FIXES AND FEATURES - Added a way for the Map instance to be instantiated via a factory. -## leaflet 1.0.2 +# leaflet 1.0.2 - When used with `leafletProxy`, `fitBounds` did not return its input object as output, so magrittr chains would break after `fitBounds` was called. @@ -238,10 +238,10 @@ BUG FIXES AND FEATURES - `addScaleBar` and related functions added, for showing Leaflet's built-in scale bar in one of the corners of the map. (PR #201. Thanks Kent Johnson!) -## leaflet 1.0.1 +# leaflet 1.0.1 - Fix #242: Compatibility with htmlwidgets 0.6 (thanks byzheng). -## leaflet 1.0.0 +# leaflet 1.0.0 - Initial release diff --git a/R/layers.R b/R/layers.R index f5fe83035..bdb8b9e43 100644 --- a/R/layers.R +++ b/R/layers.R @@ -301,7 +301,7 @@ addRasterImage <- function( #' @param layer the layer of the raster to target #' @param ... additional arguments to pass through to [addLegend()] #' @seealso [addRasterImage()] -#' @examples +#' @examplesIf interactive() #' #' library(terra) #' diff --git a/R/leaflet-package.R b/R/leaflet-package.R index c503e3c26..e25bbe84b 100644 --- a/R/leaflet-package.R +++ b/R/leaflet-package.R @@ -20,11 +20,11 @@ NULL #' @export JS NULL +# Added to the `use_release_issue()` checklist release_bullets <- function() { c( "Update static imports: `staticimports::import()`", - "`system(\"npm run build\")`", - "Rebuild website: `source(\"scripts/docs_update.R\")", + "Rebuild website: `source(\"scripts/docs_update.R\")`", 'Check Super Zip example: `shiny::runGitHub("rstudio/shiny-examples", subdir = "063-superzip-example")`', "Check licenses if bundled dependencies were updated", '`source("scripts/viztest.R")`' diff --git a/cran-comments.md b/cran-comments.md index 83ed5d68b..ff23abb9d 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,41 +1,18 @@ ## Comments -#### 2023-03-10 - -Fixing S3 method warnings for R Devel prompted by Kurt. - -Please let me know if I can provide any more information. - -Thank you, -Joe - -## Test environments - -* local macOS, R 4.2 -* GitHub Actions - * macOS - * 4.2 - * windows - * 4.2 - * ubuntu20 - * devel, 4.2, 4.1, 4.0, 3.6, 3.5 -* devtools:: - * check_win_devel() - -## R CMD check results - -0 errors ✔ | 0 warnings ✔ | 0 notes ✔ +This release removes dependencies on rgdal and rgeos, in addition to other general improvements and bug fixes. +Please let us know if we can provide any more information. ## revdepcheck results -We checked 159 reverse dependencies (158 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +We checked 165 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. - * We saw 0 new problems - * We failed to check 1 package + * We saw 1 new problems + * We failed to check 0 packages Issues with CRAN packages are summarised below. -### Failed to check +### New problems -* geocmeans (NA) +* 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/docs/basemaps.html b/docs/basemaps.html index 4c32b786d..39d366aae 100644 --- a/docs/basemaps.html +++ b/docs/basemaps.html @@ -40,7 +40,7 @@ - +