RC v2.0.3 (#650)

* bump version * run revdepcheck * fix eslint security issue * fix eslints * build docs * Leaflet Providers is not bundled directly with R pkg. Remove license statements * spellcheck * run_revdep with last package * Update cran-comments.md * fix comment from carson * Update cran-comments.md * report revdep * Remove unneeded maintainer line * run revdep and update cran comments * update yarn lock file and make sure lock file isn't updated * Update docs
rstudio · Nov 22, 2019 · c621264 · c621264
1 parent 2cfd8b5
commit c621264
Show file tree

Hide file tree

Showing 56 changed files with 1,892 additions and 43,862 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -31,3 +31,4 @@
 ^viztest-.*
 ^scripts
 ^cran-comments\.md$
+^revdep$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: leaflet
 Type: Package
 Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
-Version: 2.0.2
+Version: 2.0.3
 Authors@R: c(
       person("Joe", "Cheng", email = "[email protected]", role = c("aut", "cre")),
       person("Bhaskar", "Karambelkar", role = c("aut")),
@@ -14,7 +14,6 @@ Authors@R: c(
       person("Vladimir", "Agafonkin", role = c("ctb", "cph"), comment = "Leaflet library"),
       person("CloudMade", role = c("cph"), comment = "Leaflet library"),
       person("Leaflet contributors", role = c("ctb"), comment = "Leaflet library"),
-      person("Leaflet Providers contributors", role = c("ctb", "cph"), comment = "Leaflet Providers plugin"),
       person("Brandon Copeland", role = c("ctb", "cph"), comment = "leaflet-measure plugin"),
       person("Joerg Dietrich", role = c("ctb", "cph"), comment = "Leaflet.Terminator plugin"),
       person("Benjamin Becquet", role = c("ctb", "cph"), comment = "Leaflet.MagnifyingGlass plugin"),
@@ -27,7 +26,6 @@ Authors@R: c(
       person("Michael Bostock", role = c("ctb", "cph"), comment = "topojson"),
       person("RStudio", role = c("cph"))
     )
-Maintainer: Joe Cheng <[email protected]>
 Description: Create and customize interactive maps using the 'Leaflet'
     JavaScript library and the 'htmlwidgets' package. These maps can be used
     directly from the R console, from 'RStudio', in Shiny applications and R Markdown

diff --git a/LICENSE.note b/LICENSE.note
@@ -7,7 +7,6 @@ these components are included below):
 
 - jQuery, https://github.com/jquery/jquery
 - Leaflet (JavaScript library), https://github.com/Leaflet/Leaflet
-- Leaflet Providers, https://github.com/leaflet-extras/leaflet-providers
 - leaflet-measure, https://github.com/ljagis/leaflet-measure
 - Leaflet.Terminator, https://github.com/joergdietrich/Leaflet.Terminator
 - Leaflet.SimpleGraticule, https://github.com/ablakey/Leaflet.SimpleGraticule
@@ -74,20 +73,6 @@ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF TH
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Leaflet Providers license
-----------------------------------------------------------------------
-
-Copyright (c) 2013 Leaflet Providers contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-_THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE._
-
-
 leaflet-measure license
 ----------------------------------------------------------------------
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ m %>% addPopups(-93.65, 42.0285, 'Here is the <b>Department of Statistics</b>, I
 
 ## Installation
 
-You can install this package from CRAN, or the development version from Github:
+You can install this package from CRAN, or the development version from GitHub:
 
 ```r
 # CRAN version
@@ -32,7 +32,7 @@ devtools::install_github('rstudio/leaflet')
 ## Documentation
 
 In addition to the usual R package documentation, we also have extensive docs and examples at:
-http://rstudio.github.io/leaflet You may use [Github issues](https://github.com/rstudio/leaflet/issues) to file bug reports or feature requests, and ask questions on [StackOverflow](http://stackoverflow.com/questions/tagged/r+leaflet) or in the [Shiny mailing list](https://groups.google.com/forum/#!forum/shiny-discuss).
+http://rstudio.github.io/leaflet You may use [GitHub issues](https://github.com/rstudio/leaflet/issues) to file bug reports or feature requests, and ask questions on [StackOverflow](http://stackoverflow.com/questions/tagged/r+leaflet) or in the [Shiny mailing list](https://groups.google.com/forum/#!forum/shiny-discuss).
 
 ## Development
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,30 +1,40 @@
-# Comments
+## Comments
 
-## 2018-8-24
+#### 2019-11-08
 
-This submission is done to correct the testing issue from a scales update.
+This submission is done to correct a testing issue with `scales`.
 
 This submission is done by Barret Schloerke <[email protected]> on behalf of Joe Cheng <[email protected]>. Please submit any changes to be made to <[email protected]>.
 
 - Barret
 
 
 ## Test environments
-* local OS X install, R 3.5.1, --run-dontcheck
+
+* local OS X install, R 3.6.1, --run-dontcheck
   * 0 errors | 0 warnings | 0 notes
-* ubuntu 14.04.5 (on travis-ci), R version 3.5.0 (2017-01-27)
+
+* ubuntu 14.04.5 (on travis-ci), R version 3.6.1 (2017-01-27)
   * 0 errors | 0 warnings | 0 notes
-* devtools::build_win() x86_64-w64-mingw32, R version 3.5.1 (2018-07-02)
+
+* win-builder (oldrelease, release, and devel)
   * 0 errors | 0 warnings | 0 notes
-* devtools::build_win() x86_64-w64-mingw32, R Under development (unstable) (2018-08-22 r75177)
+
+* R-hub windows-x86_64-devel (r-devel)
   * 0 errors | 0 warnings | 0 notes
 
-## Reverse dependencies
+* R-hub ubuntu-gcc-release (r-release)
+  ❯ On ubuntu-gcc-release (r-release)
+    checking package dependencies ... NOTE
+    Packages suggested but not available for checking: 'sf', 'rgdal'
+  * 0 errors ✖ | 0 warnings ✔ | 1 note ✖
+
+* R-hub fedora-clang-devel (r-devel)
+  * 0 errors | 0 warnings | 0 notes
 
-* Revdep maintainers were not contacted as this release is for documentation fixes and to fix the cran test error.
+## revdepcheck results
 
-* I have run R CMD check on the 66 downstream dependencies.
-  * https://github.com/rstudio/leaflet/blob/master/revdep/problems.md
-  * No errors, warnings, or notes were introduced due to changes in leaflet
+We checked 95 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
-* All revdeps except segclust2d were able to be tested
+* We saw 0 new problems
+* We failed to check 0 packages
diff --git a/docs/basemaps.html b/docs/basemaps.html
@@ -7,6 +7,7 @@
 <meta charset="utf-8" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="pandoc" />
+<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
 
 
 
@@ -30,7 +31,7 @@
 <script src="libs/Proj4Leaflet/proj4leaflet.js"></script>
 <link href="libs/rstudio_leaflet/rstudio_leaflet.css" rel="stylesheet" />
 <script src="libs/leaflet-binding/leaflet.js"></script>
-<script src="libs/leaflet-providers/leaflet-providers.js"></script>
+<script src="libs/leaflet-providers/leaflet-providers_1.9.0.js"></script>
 <script src="libs/leaflet-providers-plugin/leaflet-providers-plugin.js"></script>
 
 <style type="text/css">code{white-space: pre;}</style>
@@ -79,9 +80,7 @@
 </style>
 
 
-</head>
 
-<body>
 
 <style type = "text/css">
 .main-container {
@@ -95,7 +94,6 @@
 }
 img {
   max-width:100%;
-  height: auto;
 }
 .tabbed-pane {
   padding-top: 12px;
@@ -106,12 +104,13 @@
 button.code-folding-btn:focus {
   outline: none;
 }
+summary {
+  display: list-item;
+}
 </style>
 
 
 
-<div class="container-fluid main-container">
-
 <!-- tabsets -->
 
 <style type="text/css">
@@ -168,21 +167,18 @@
 }
 </style>
 
-<script>
-$(document).ready(function () {
-  window.buildTabsets("TOC");
-});
+<!-- code folding -->
 
-$(document).ready(function () {
-  $('.tabset-dropdown > .nav-tabs > li').click(function () {
-    $(this).parent().toggleClass('nav-tabs-open')
-  });
-});
-</script>
 
-<!-- code folding -->
 
 
+</head>
+
+<body>
+
+
+<div class="container-fluid main-container">
+
 
 
 <style type="text/css">
@@ -268,8 +264,8 @@ <h3>Default (OpenStreetMap) Tiles</h3>
 <p>The easiest way to add tiles is by calling <code>addTiles()</code> with no arguments; by default, <a href="https://www.openstreetmap.org/">OpenStreetMap</a> tiles are used.</p>
 <pre class="r"><code>m &lt;- leaflet() %&gt;% setView(lng = -71.0589, lat = 42.3601, zoom = 12)
 m %&gt;% addTiles()</code></pre>
-<div id="htmlwidget-927ec88a166bf954e46a" style="width:100%;height:240px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-927ec88a166bf954e46a">{
+<div id="htmlwidget-562da05387aef08f69fb" style="width:100%;height:240px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-562da05387aef08f69fb">{
   "x": {
     "options": {
       "crs": {
@@ -320,8 +316,8 @@ <h3>Third-Party Tiles</h3>
 <p>Alternatively, many popular free third-party basemaps can be added using the <code>addProviderTiles()</code> function, which is implemented using the <a href="https://github.com/leaflet-extras/leaflet-providers">leaflet-providers plugin</a>. See <a href="http://leaflet-extras.github.io/leaflet-providers/preview/index.html">here</a> for the complete set.</p>
 <p>As a convenience, leaflet also provides a named list of all the third-party tile providers that are supported by the plugin. This enables you to use auto-completion feature of your favorite R IDE (like RStudio) and not have to remember or look up supported tile providers; just type <code>providers$</code> and choose from one of the options. You can also use <code>names(providers)</code> to view all of the options.</p>
 <pre class="r"><code>m %&gt;% addProviderTiles(providers$Stamen.Toner)</code></pre>
-<div id="htmlwidget-e2aad06f99e8b55df8d8" style="width:100%;height:120px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-e2aad06f99e8b55df8d8">{
+<div id="htmlwidget-92aa9ec4a26e6d2eb4c3" style="width:100%;height:120px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-92aa9ec4a26e6d2eb4c3">{
   "x": {
     "options": {
       "crs": {
@@ -357,8 +353,8 @@ <h3>Third-Party Tiles</h3>
   "jsHooks": []
 }</script>
 <pre class="r"><code>m %&gt;% addProviderTiles(providers$CartoDB.Positron)</code></pre>
-<div id="htmlwidget-ec9d8b9e435c1a666871" style="width:100%;height:120px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-ec9d8b9e435c1a666871">{
+<div id="htmlwidget-fb03bf98e7202586eee1" style="width:100%;height:120px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-fb03bf98e7202586eee1">{
   "x": {
     "options": {
       "crs": {
@@ -394,8 +390,8 @@ <h3>Third-Party Tiles</h3>
   "jsHooks": []
 }</script>
 <pre class="r"><code>m %&gt;% addProviderTiles(providers$Esri.NatGeoWorldMap)</code></pre>
-<div id="htmlwidget-65e60ed4f5440bdab363" style="width:100%;height:120px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-65e60ed4f5440bdab363">{
+<div id="htmlwidget-b182c7e3d7d2f09bcc5e" style="width:100%;height:120px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-b182c7e3d7d2f09bcc5e">{
   "x": {
     "options": {
       "crs": {
@@ -446,8 +442,8 @@ <h3>WMS Tiles</h3>
     options = WMSTileOptions(format = &quot;image/png&quot;, transparent = TRUE),
     attribution = &quot;Weather data © 2012 IEM Nexrad&quot;
   )</code></pre>
-<div id="htmlwidget-c6a36a601760297b5cca" style="width:100%;height:240px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-c6a36a601760297b5cca">{
+<div id="htmlwidget-2e17ae06f223c72250d9" style="width:100%;height:240px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-2e17ae06f223c72250d9">{
   "x": {
     "options": {
       "crs": {
@@ -516,8 +512,8 @@ <h3>Combining Tile Layers</h3>
   addProviderTiles(providers$Stamen.TonerLines,
     options = providerTileOptions(opacity = 0.35)) %&gt;%
   addProviderTiles(providers$Stamen.TonerLabels)</code></pre>
-<div id="htmlwidget-6d8788299161dc56faef" style="width:100%;height:168px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-6d8788299161dc56faef">{
+<div id="htmlwidget-2f386608a10ed269577b" style="width:100%;height:168px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-2f386608a10ed269577b">{
   "x": {
     "options": {
       "crs": {
@@ -611,6 +607,23 @@ <h3>Combining Tile Layers</h3>
 
 </script>
 
+<!-- tabsets -->
+
+<script>
+$(document).ready(function () {
+  window.buildTabsets("TOC");
+});
+
+$(document).ready(function () {
+  $('.tabset-dropdown > .nav-tabs > li').click(function () {
+    $(this).parent().toggleClass('nav-tabs-open')
+  });
+});
+</script>
+
+<!-- code folding -->
+
+
 <!-- dynamically load mathjax for compatibility with self-contained -->
 <script>
   (function () {