Skip to content

Commit c621264

Browse files
authored
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
1 parent 2cfd8b5 commit c621264

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1892
-43862
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131
^viztest-.*
3232
^scripts
3333
^cran-comments\.md$
34+
^revdep$

DESCRIPTION

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: leaflet
22
Type: Package
33
Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
4-
Version: 2.0.2
4+
Version: 2.0.3
55
Authors@R: c(
66
person("Joe", "Cheng", email = "[email protected]", role = c("aut", "cre")),
77
person("Bhaskar", "Karambelkar", role = c("aut")),
@@ -14,7 +14,6 @@ Authors@R: c(
1414
person("Vladimir", "Agafonkin", role = c("ctb", "cph"), comment = "Leaflet library"),
1515
person("CloudMade", role = c("cph"), comment = "Leaflet library"),
1616
person("Leaflet contributors", role = c("ctb"), comment = "Leaflet library"),
17-
person("Leaflet Providers contributors", role = c("ctb", "cph"), comment = "Leaflet Providers plugin"),
1817
person("Brandon Copeland", role = c("ctb", "cph"), comment = "leaflet-measure plugin"),
1918
person("Joerg Dietrich", role = c("ctb", "cph"), comment = "Leaflet.Terminator plugin"),
2019
person("Benjamin Becquet", role = c("ctb", "cph"), comment = "Leaflet.MagnifyingGlass plugin"),
@@ -27,7 +26,6 @@ Authors@R: c(
2726
person("Michael Bostock", role = c("ctb", "cph"), comment = "topojson"),
2827
person("RStudio", role = c("cph"))
2928
)
30-
Maintainer: Joe Cheng <[email protected]>
3129
Description: Create and customize interactive maps using the 'Leaflet'
3230
JavaScript library and the 'htmlwidgets' package. These maps can be used
3331
directly from the R console, from 'RStudio', in Shiny applications and R Markdown

LICENSE.note

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ these components are included below):
77

88
- jQuery, https://github.com/jquery/jquery
99
- Leaflet (JavaScript library), https://github.com/Leaflet/Leaflet
10-
- Leaflet Providers, https://github.com/leaflet-extras/leaflet-providers
1110
- leaflet-measure, https://github.com/ljagis/leaflet-measure
1211
- Leaflet.Terminator, https://github.com/joergdietrich/Leaflet.Terminator
1312
- 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
7473
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7574

7675

77-
Leaflet Providers license
78-
----------------------------------------------------------------------
79-
80-
Copyright (c) 2013 Leaflet Providers contributors
81-
All rights reserved.
82-
83-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
84-
85-
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
86-
* 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.
87-
88-
_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._
89-
90-
9176
leaflet-measure license
9277
----------------------------------------------------------------------
9378

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ m %>% addPopups(-93.65, 42.0285, 'Here is the <b>Department of Statistics</b>, I
1818

1919
## Installation
2020

21-
You can install this package from CRAN, or the development version from Github:
21+
You can install this package from CRAN, or the development version from GitHub:
2222

2323
```r
2424
# CRAN version
@@ -32,7 +32,7 @@ devtools::install_github('rstudio/leaflet')
3232
## Documentation
3333

3434
In addition to the usual R package documentation, we also have extensive docs and examples at:
35-
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).
35+
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).
3636

3737
## Development
3838

cran-comments.md

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
1-
# Comments
1+
## Comments
22

3-
## 2018-8-24
3+
#### 2019-11-08
44

5-
This submission is done to correct the testing issue from a scales update.
5+
This submission is done to correct a testing issue with `scales`.
66

77
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]>.
88

99
- Barret
1010

1111

1212
## Test environments
13-
* local OS X install, R 3.5.1, --run-dontcheck
13+
14+
* local OS X install, R 3.6.1, --run-dontcheck
1415
* 0 errors | 0 warnings | 0 notes
15-
* ubuntu 14.04.5 (on travis-ci), R version 3.5.0 (2017-01-27)
16+
17+
* ubuntu 14.04.5 (on travis-ci), R version 3.6.1 (2017-01-27)
1618
* 0 errors | 0 warnings | 0 notes
17-
* devtools::build_win() x86_64-w64-mingw32, R version 3.5.1 (2018-07-02)
19+
20+
* win-builder (oldrelease, release, and devel)
1821
* 0 errors | 0 warnings | 0 notes
19-
* devtools::build_win() x86_64-w64-mingw32, R Under development (unstable) (2018-08-22 r75177)
22+
23+
* R-hub windows-x86_64-devel (r-devel)
2024
* 0 errors | 0 warnings | 0 notes
2125

22-
## Reverse dependencies
26+
* R-hub ubuntu-gcc-release (r-release)
27+
❯ On ubuntu-gcc-release (r-release)
28+
checking package dependencies ... NOTE
29+
Packages suggested but not available for checking: 'sf', 'rgdal'
30+
* 0 errors ✖ | 0 warnings ✔ | 1 note ✖
31+
32+
* R-hub fedora-clang-devel (r-devel)
33+
* 0 errors | 0 warnings | 0 notes
2334

24-
* Revdep maintainers were not contacted as this release is for documentation fixes and to fix the cran test error.
35+
## revdepcheck results
2536

26-
* I have run R CMD check on the 66 downstream dependencies.
27-
* https://github.com/rstudio/leaflet/blob/master/revdep/problems.md
28-
* No errors, warnings, or notes were introduced due to changes in leaflet
37+
We checked 95 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
2938

30-
* All revdeps except segclust2d were able to be tested
39+
* We saw 0 new problems
40+
* We failed to check 0 packages

docs/basemaps.html

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<meta charset="utf-8" />
88
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
99
<meta name="generator" content="pandoc" />
10+
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
1011

1112

1213

@@ -30,7 +31,7 @@
3031
<script src="libs/Proj4Leaflet/proj4leaflet.js"></script>
3132
<link href="libs/rstudio_leaflet/rstudio_leaflet.css" rel="stylesheet" />
3233
<script src="libs/leaflet-binding/leaflet.js"></script>
33-
<script src="libs/leaflet-providers/leaflet-providers.js"></script>
34+
<script src="libs/leaflet-providers/leaflet-providers_1.9.0.js"></script>
3435
<script src="libs/leaflet-providers-plugin/leaflet-providers-plugin.js"></script>
3536

3637
<style type="text/css">code{white-space: pre;}</style>
@@ -79,9 +80,7 @@
7980
</style>
8081

8182

82-
</head>
8383

84-
<body>
8584

8685
<style type = "text/css">
8786
.main-container {
@@ -95,7 +94,6 @@
9594
}
9695
img {
9796
max-width:100%;
98-
height: auto;
9997
}
10098
.tabbed-pane {
10199
padding-top: 12px;
@@ -106,12 +104,13 @@
106104
button.code-folding-btn:focus {
107105
outline: none;
108106
}
107+
summary {
108+
display: list-item;
109+
}
109110
</style>
110111

111112

112113

113-
<div class="container-fluid main-container">
114-
115114
<!-- tabsets -->
116115

117116
<style type="text/css">
@@ -168,21 +167,18 @@
168167
}
169168
</style>
170169

171-
<script>
172-
$(document).ready(function () {
173-
window.buildTabsets("TOC");
174-
});
170+
<!-- code folding -->
175171

176-
$(document).ready(function () {
177-
$('.tabset-dropdown > .nav-tabs > li').click(function () {
178-
$(this).parent().toggleClass('nav-tabs-open')
179-
});
180-
});
181-
</script>
182172

183-
<!-- code folding -->
184173

185174

175+
</head>
176+
177+
<body>
178+
179+
180+
<div class="container-fluid main-container">
181+
186182

187183

188184
<style type="text/css">
@@ -268,8 +264,8 @@ <h3>Default (OpenStreetMap) Tiles</h3>
268264
<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>
269265
<pre class="r"><code>m &lt;- leaflet() %&gt;% setView(lng = -71.0589, lat = 42.3601, zoom = 12)
270266
m %&gt;% addTiles()</code></pre>
271-
<div id="htmlwidget-927ec88a166bf954e46a" style="width:100%;height:240px;" class="leaflet html-widget"></div>
272-
<script type="application/json" data-for="htmlwidget-927ec88a166bf954e46a">{
267+
<div id="htmlwidget-562da05387aef08f69fb" style="width:100%;height:240px;" class="leaflet html-widget"></div>
268+
<script type="application/json" data-for="htmlwidget-562da05387aef08f69fb">{
273269
"x": {
274270
"options": {
275271
"crs": {
@@ -320,8 +316,8 @@ <h3>Third-Party Tiles</h3>
320316
<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>
321317
<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>
322318
<pre class="r"><code>m %&gt;% addProviderTiles(providers$Stamen.Toner)</code></pre>
323-
<div id="htmlwidget-e2aad06f99e8b55df8d8" style="width:100%;height:120px;" class="leaflet html-widget"></div>
324-
<script type="application/json" data-for="htmlwidget-e2aad06f99e8b55df8d8">{
319+
<div id="htmlwidget-92aa9ec4a26e6d2eb4c3" style="width:100%;height:120px;" class="leaflet html-widget"></div>
320+
<script type="application/json" data-for="htmlwidget-92aa9ec4a26e6d2eb4c3">{
325321
"x": {
326322
"options": {
327323
"crs": {
@@ -357,8 +353,8 @@ <h3>Third-Party Tiles</h3>
357353
"jsHooks": []
358354
}</script>
359355
<pre class="r"><code>m %&gt;% addProviderTiles(providers$CartoDB.Positron)</code></pre>
360-
<div id="htmlwidget-ec9d8b9e435c1a666871" style="width:100%;height:120px;" class="leaflet html-widget"></div>
361-
<script type="application/json" data-for="htmlwidget-ec9d8b9e435c1a666871">{
356+
<div id="htmlwidget-fb03bf98e7202586eee1" style="width:100%;height:120px;" class="leaflet html-widget"></div>
357+
<script type="application/json" data-for="htmlwidget-fb03bf98e7202586eee1">{
362358
"x": {
363359
"options": {
364360
"crs": {
@@ -394,8 +390,8 @@ <h3>Third-Party Tiles</h3>
394390
"jsHooks": []
395391
}</script>
396392
<pre class="r"><code>m %&gt;% addProviderTiles(providers$Esri.NatGeoWorldMap)</code></pre>
397-
<div id="htmlwidget-65e60ed4f5440bdab363" style="width:100%;height:120px;" class="leaflet html-widget"></div>
398-
<script type="application/json" data-for="htmlwidget-65e60ed4f5440bdab363">{
393+
<div id="htmlwidget-b182c7e3d7d2f09bcc5e" style="width:100%;height:120px;" class="leaflet html-widget"></div>
394+
<script type="application/json" data-for="htmlwidget-b182c7e3d7d2f09bcc5e">{
399395
"x": {
400396
"options": {
401397
"crs": {
@@ -446,8 +442,8 @@ <h3>WMS Tiles</h3>
446442
options = WMSTileOptions(format = &quot;image/png&quot;, transparent = TRUE),
447443
attribution = &quot;Weather data © 2012 IEM Nexrad&quot;
448444
)</code></pre>
449-
<div id="htmlwidget-c6a36a601760297b5cca" style="width:100%;height:240px;" class="leaflet html-widget"></div>
450-
<script type="application/json" data-for="htmlwidget-c6a36a601760297b5cca">{
445+
<div id="htmlwidget-2e17ae06f223c72250d9" style="width:100%;height:240px;" class="leaflet html-widget"></div>
446+
<script type="application/json" data-for="htmlwidget-2e17ae06f223c72250d9">{
451447
"x": {
452448
"options": {
453449
"crs": {
@@ -516,8 +512,8 @@ <h3>Combining Tile Layers</h3>
516512
addProviderTiles(providers$Stamen.TonerLines,
517513
options = providerTileOptions(opacity = 0.35)) %&gt;%
518514
addProviderTiles(providers$Stamen.TonerLabels)</code></pre>
519-
<div id="htmlwidget-6d8788299161dc56faef" style="width:100%;height:168px;" class="leaflet html-widget"></div>
520-
<script type="application/json" data-for="htmlwidget-6d8788299161dc56faef">{
515+
<div id="htmlwidget-2f386608a10ed269577b" style="width:100%;height:168px;" class="leaflet html-widget"></div>
516+
<script type="application/json" data-for="htmlwidget-2f386608a10ed269577b">{
521517
"x": {
522518
"options": {
523519
"crs": {
@@ -611,6 +607,23 @@ <h3>Combining Tile Layers</h3>
611607

612608
</script>
613609

610+
<!-- tabsets -->
611+
612+
<script>
613+
$(document).ready(function () {
614+
window.buildTabsets("TOC");
615+
});
616+
617+
$(document).ready(function () {
618+
$('.tabset-dropdown > .nav-tabs > li').click(function () {
619+
$(this).parent().toggleClass('nav-tabs-open')
620+
});
621+
});
622+
</script>
623+
624+
<!-- code folding -->
625+
626+
614627
<!-- dynamically load mathjax for compatibility with self-contained -->
615628
<script>
616629
(function () {

0 commit comments

Comments
 (0)