Skip to content

Commit 7de631d

Browse files
schloerkeschloerke
authored
v2.0.1 (#556)
* bump version * update docs folder (and script tweaks) * compare against cran * news updates * make sure builds directory is there * make sure suggested pkg rgeos is available for test * tweaks to scripts * run revdep. no issues. * update cran comments
1 parent ea646ea commit 7de631d

File tree

12 files changed

+303
-210
lines changed

12 files changed

+303
-210
lines changed

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
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.0.9000
4+
Version: 2.0.1
55
Authors@R: c(
66
person("Joe", "Cheng", email = "joe@rstudio.com", role = c("aut", "cre")),
77
person("Bhaskar", "Karambelkar", role = c("aut")),

‎NEWS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
leaflet 2.0.0.9000
1+
leaflet 2.0.1
22
--------------------------------------------------------------------------------
33

44
FEATURES
55

66
* 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)
77
* Exposed htmlwidgets sizingPolicy in leaflet() (#548)
88

9-
BUG FIXES
9+
BUG FIXES and IMPROVEMENTS
1010

1111
* Default marker icon locations will now use unpkg.com instead of the leaflet cdn when using https or file protocols. (#544)
1212
* `.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)

‎cran-comments.md‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,72 @@
11
# Comments
22

3-
## 2018-4-20
4-
Resubmitting to avoid example execution time NOTE. Test environment outputs updated below.
5-
6-
- Barret
7-
8-
## 2018-4-19
3+
## 2018-6-4
94
This submission is done by Barret Schloerke <barret@rstudio.com> on behalf of Joe Cheng <joe@rstudio.com>. Please submit any changes to be made to <barret@rstudio.com>.
105

116
- Barret
127

138

149
## Test environments
15-
* local OS X install, R 3.4.4, --run-dontcheck
10+
* local OS X install, R 3.5.0, --run-dontcheck
11+
* 0 errors | 0 warnings | 0 notes
12+
* ubuntu 14.04.5 (on travis-ci), R version 3.5.0 (2017-01-27)
1613
* 0 errors | 0 warnings | 0 notes
17-
* ubuntu 12.04 (on travis-ci), R version 3.4.4 (2017-01-27)
14+
* devtools::build_win() x86_64-w64-mingw32, R version 3.5.0 (2018-04-23)
1815
* 0 errors | 0 warnings | 0 notes
19-
* devtools::build_win() x86_64-w64-mingw32, R version 3.4.4 (2018-03-15)
16+
* devtools::build_win() x86_64-w64-mingw32, R Under development (unstable) (2018-06-03 r74839)
2017
* 0 errors | 0 warnings | 0 notes
2118

2219
I believe the warning and note below are transient within r-hub.
2320
* WARNING: Conversion of "README.md" failed:
2421
* the svg at https://travis-ci.org/rstudio/leaflet.svg?branch=master exists
2522
* NOTE: checking package dependencies
26-
* On linux... Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
23+
* Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
24+
* rgdal
25+
* I know rgdal has a source version that does not compile without an external library
26+
* The tests rgdal validated locally and on travis
2727

2828
* r-hub
29+
2930
* Platform: Windows Server 2008 R2 SP1, R-release, 32/64 bit
30-
https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-3915b63fe8c34d99b3ad7aa4b6e94640
31+
http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-15775eb481a9459f904cba113f9323be
3132
❯ checking top-level files ... WARNING
32-
Conversion of 'README.md' failed:
33-
pandoc.exe: Could not fetch https://travis-ci.org/rstudio/leaflet.svg?branch=master
34-
no store
35-
CallStack (from HasCallStack):
36-
error, called at .\System\X509\Win32.hs:56:31 in x509-system-1.6.4-E9zvdZ6nI282vjtOPFYSd1:System.X509.Win32
33+
❯ checking package dependencies ... NOTE
34+
Packages suggested but not available for checking: 'rgdal' 'rgeos'
35+
0 errors ✔ | 1 warning ✖ | 1 note ✖
3736

38-
0 errors ✔ | 1 warning ✖ | 0 notes ✔
3937

4038
* Platform: Windows Server 2008 R2 SP1, R-devel, 32/64 bit
41-
https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-fb1316cbeb5f48eba08e959769a990d4
39+
http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-4f5603a8abeb470db77bb3adb682fc29
4240
❯ checking top-level files ... WARNING
4341
Conversion of 'README.md' failed:
4442
pandoc.exe: Could not fetch https://travis-ci.org/rstudio/leaflet.svg?branch=master
4543
no store
4644
CallStack (from HasCallStack):
4745
error, called at .\System\X509\Win32.hs:56:31 in x509-system-1.6.4-E9zvdZ6nI282vjtOPFYSd1:System.X509.Win32
48-
49-
0 errors ✔ | 1 warning ✖ | 0 notes ✔
46+
❯ checking package dependencies ... NOTE
47+
Packages suggested but not available for checking: 'rgdal' 'rgeos'
48+
0 errors ✔ | 1 warning ✖ | 1 note ✖
5049

5150
* Platform: Ubuntu Linux 16.04 LTS, R-release, GCC
5251
* checked with `_R_CHECK_FORCE_SUGGESTS_=0`
53-
https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-cec4735e750d4f1ea05dca55c153a847
52+
http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-0bc1c360b5cb45a883cd87b5c8408b2f
5453
❯ checking package dependencies ... NOTE
5554
Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
56-
5755
0 errors ✔ | 0 warnings ✔ | 1 note ✖
5856

5957
* Platform: Fedora Linux, R-devel, clang, gfortran
6058
* checked with `_R_CHECK_FORCE_SUGGESTS_=0`
61-
https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-09d8a5861fb74ed3baa34d727f1df82b
59+
http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-dcd35d9761ef4e8596ec02e53207de49
6260
❯ checking package dependencies ... NOTE
6361
Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
64-
6562
0 errors ✔ | 0 warnings ✔ | 1 note ✖
6663

6764
## Reverse dependencies
6865

69-
* All revdep maintainers were notified on March 29, 2018 for a release date of April 16th.
66+
* Revdep maintainers were not contacted as this release is for bug fixes and enhancements from particular maintainers.
7067

71-
* I have run R CMD check on the 60 downstream dependencies.
68+
* I have run R CMD check on the 63 downstream dependencies.
7269
* https://github.com/rstudio/leaflet/blob/master/revdep/problems.md
70+
* No errors, warnings, or notes were introduced due to changes in leaflet
7371

74-
* No errors, warnings, or notes were introduced due to changes in leaflet
75-
76-
* Could not install: segclust2d
72+
* All revdeps were able to be tested

‎docs/libs/leaflet-binding/leaflet.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,10 +720,18 @@ _htmlwidgets2.default.widget({
720720
methods.fitBounds.apply(map, data.fitBounds);
721721
}
722722
if (data.flyTo) {
723+
if (!explicitView && !map.leafletr.hasRendered) {
724+
// must be done to give a initial starting point
725+
map.fitWorld();
726+
}
723727
explicitView = true;
724728
map.flyTo.apply(map, data.flyTo);
725729
}
726730
if (data.flyToBounds) {
731+
if (!explicitView && !map.leafletr.hasRendered) {
732+
// must be done to give a initial starting point
733+
map.fitWorld();
734+
}
727735
explicitView = true;
728736
methods.flyToBounds.apply(map, data.flyToBounds);
729737
}
@@ -2507,6 +2515,11 @@ methods.removeSelect = function () {
25072515
}
25082516
};
25092517

2518+
methods.createMapPane = function (name, zIndex) {
2519+
this.createPane(name);
2520+
this.getPane(name).style.zIndex = zIndex;
2521+
};
2522+
25102523

25112524
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
25122525
},{"./cluster-layer-store":1,"./crs_utils":3,"./dataframe":4,"./global/htmlwidgets":8,"./global/jquery":9,"./global/leaflet":10,"./global/shiny":12,"./mipmapper":16,"./util":17}],16:[function(require,module,exports){

‎docs/shapes.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,10 @@ <h4>Simplifying complex polygons/polylines</h4>
596596

597597
fullsize &lt;- usa_sf()
598598
object.size(fullsize)</code></pre>
599-
<pre><code>## 922816 bytes</code></pre>
599+
<pre><code>## 933016 bytes</code></pre>
600600
<pre class="r"><code>simplified &lt;- rmapshaper::ms_simplify(fullsize)
601601
object.size(simplified)</code></pre>
602-
<pre><code>## 114216 bytes</code></pre>
602+
<pre><code>## 120496 bytes</code></pre>
603603
</div>
604604
</div>
605605
<div id="circles" class="section level3">

‎revdep/README.md‎

Lines changed: 37 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,134 +2,95 @@
22

33
|field |value |
44
|:--------|:----------------------------|
5-
|version |R version 3.4.4 (2018-03-15) |
6-
|os |macOS High Sierra 10.13.3 |
5+
|version |R version 3.5.0 (2018-04-23) |
6+
|os |macOS High Sierra 10.13.4 |
77
|system |x86_64, darwin15.6.0 |
88
|ui |X11 |
99
|language |(EN) |
1010
|collate |en_US.UTF-8 |
1111
|tz |America/New_York |
12-
|date |2018-04-19 |
12+
|date |2018-06-04 |
1313

1414
# Dependencies
1515

16-
|package |old |new |Δ |
17-
|:------------|:-------|:-------|:--|
18-
|leaflet |1.1.0 |2.0.0 |* |
19-
|assertthat |0.2.0 |0.2.0 | |
20-
|base64enc |0.1-3 |0.1-3 | |
21-
|cli |1.0.0 |1.0.0 | |
22-
|colorspace |1.3-2 |1.3-2 | |
23-
|crayon |1.3.4 |1.3.4 | |
24-
|crosstalk |1.0.0 |1.0.0 | |
25-
|dichromat |2.0-0 |2.0-0 | |
26-
|digest |0.6.15 |0.6.15 | |
27-
|ggplot2 |2.2.1 |2.2.1 | |
28-
|glue |1.2.0 |1.2.0 | |
29-
|gridExtra |2.3 |2.3 | |
30-
|gtable |0.2.0 |0.2.0 | |
31-
|htmltools |0.3.6 |0.3.6 | |
32-
|htmlwidgets |1.2 |1.2 | |
33-
|httpuv |1.3.6.2 |1.3.6.2 | |
34-
|jsonlite |1.5 |1.5 | |
35-
|labeling |0.3 |0.3 | |
36-
|lazyeval |0.2.1 |0.2.1 | |
37-
|magrittr |1.5 |1.5 | |
38-
|markdown |0.8 |0.8 | |
39-
|mime |0.5 |0.5 | |
40-
|munsell |0.4.3 |0.4.3 | |
41-
|pillar |1.2.1 |1.2.1 | |
42-
|plyr |1.8.4 |1.8.4 | |
43-
|png |0.1-7 |0.1-7 | |
44-
|R6 |2.2.2 |2.2.2 | |
45-
|raster |2.6-7 |2.6-7 | |
46-
|RColorBrewer |1.1-2 |1.1-2 | |
47-
|Rcpp |0.12.16 |0.12.16 | |
48-
|reshape2 |1.4.3 |1.4.3 | |
49-
|rlang |0.2.0 |0.2.0 | |
50-
|scales |0.5.0 |0.5.0 | |
51-
|shiny |1.0.5 |1.0.5 | |
52-
|sourcetools |0.1.6 |0.1.6 | |
53-
|sp |1.2-7 |1.2-7 | |
54-
|stringi |1.1.7 |1.1.7 | |
55-
|stringr |1.3.0 |1.3.0 | |
56-
|tibble |1.4.2 |1.4.2 | |
57-
|utf8 |1.1.3 |1.1.3 | |
58-
|viridis |0.5.1 |0.5.1 | |
59-
|viridisLite |0.3.0 |0.3.0 | |
60-
|xtable |1.8-2 |1.8-2 | |
61-
|yaml |2.1.18 |2.1.18 | |
16+
|package |old |new |Δ |
17+
|:-------|:-----|:-------|:--|
18+
|leaflet |2.0.0 |2.0.1 |* |
19+
|pillar |NA |1.2.3 |* |
20+
|png |0.1-7 |0.1-7 | |
21+
|raster |2.6-7 |2.6-7 | |
22+
|Rcpp |NA |0.12.17 |* |
23+
|rlang |NA |0.2.1 |* |
24+
|shiny |NA |1.1.0 |* |
25+
|utf8 |NA |1.1.4 |* |
6226

6327
# Revdeps
6428

65-
## Couldn't check (1)
66-
67-
|package |version |error |warning |note |
68-
|:------------------------------------|:-------|:-----|:-------|:----|
69-
|[segclust2d](problems.md#segclust2d) |0.1.0 |1 | | |
70-
71-
## All (60)
29+
## All (63)
7230

7331
|package |version |error |warning |note |
7432
|:--------------------------------------------------|:-------|:-----|:-------|:----|
75-
|[amt](problems.md#amt) |0.0.3.0 | | |1 |
76-
|blscrapeR |3.1.2 | | | |
33+
|[amt](problems.md#amt) |0.0.4.0 | | |1 |
34+
|antaresViz |0.13.0 | | | |
35+
|[blscrapeR](problems.md#blscraper) |3.1.2 |1 | | |
7736
|cancensus |0.1.7 | | | |
78-
|[CDECRetrieve](problems.md#cdecretrieve) |0.1.0 | | |1 |
37+
|[CDECRetrieve](problems.md#cdecretrieve) |0.1.1 | | |1 |
7938
|cycleRtools |1.1.1 | | | |
8039
|eAnalytics |0.1.3 | | | |
8140
|futureheatwaves |1.0.3 | | | |
8241
|genogeographer |0.1.8 | | | |
8342
|geojsonio |0.6.0 | | | |
8443
|[geoSpectral](problems.md#geospectral) |0.17.4 |1 | | |
85-
|inlmisc |0.4.0 | | | |
44+
|[inlmisc](problems.md#inlmisc) |0.4.0 |1 | | |
8645
|[jpmesh](problems.md#jpmesh) |1.1.0 | | |1 |
87-
|[jpndistrict](problems.md#jpndistrict) |0.3.0 |1 | |1 |
46+
|[jpndistrict](problems.md#jpndistrict) |0.3.1 | | |1 |
8847
|[lawn](problems.md#lawn) |0.4.2 | | |1 |
89-
|[leaflet.esri](problems.md#leafletesri) |0.2 | | |1 |
90-
|[leaflet.extras](problems.md#leafletextras) |0.2 | | |1 |
91-
|leaflet.minicharts |0.5.2 | | | |
48+
|leaflet.esri |1.0.0 | | | |
49+
|leaflet.extras |1.0.0 | | | |
50+
|leaflet.minicharts |0.5.3 | | | |
9251
|[leafletCN](problems.md#leafletcn) |0.2.1 | | |3 |
9352
|[lingtypology](problems.md#lingtypology) |1.0.12 | | |1 |
9453
|macleish |0.3.2 | | | |
9554
|manipulateWidget |0.9.0 | | | |
9655
|[mapedit](problems.md#mapedit) |0.4.1 | | |1 |
9756
|[mapr](problems.md#mapr) |0.4.0 | | |1 |
9857
|[mapsapi](problems.md#mapsapi) |0.3.5 | | |1 |
99-
|mapview |2.3.0 | | | |
58+
|mapview |2.4.0 | | | |
10059
|meltt |0.4.0 | | | |
10160
|[metScanR](problems.md#metscanr) |1.2.0 | | |1 |
61+
|[mgwrsar](problems.md#mgwrsar) |0.1 | | |1 |
10262
|neotoma |1.7.0 | | | |
10363
|nyctaxi |0.0.1 | | | |
10464
|openadds |0.2.0 | | | |
10565
|owmr |0.7.2 | | | |
106-
|[parlitools](problems.md#parlitools) |0.2.1 | | |1 |
66+
|[parlitools](problems.md#parlitools) |0.2.1 | |-1 |1 |
10767
|[phenocamr](problems.md#phenocamr) |1.1.0 | | |1 |
68+
|pkgdown |1.1.0 | | | |
10869
|ppcSpatial |0.2.0 | | | |
109-
|PWFSLSmoke |1.0.16 | |-1 | |
70+
|PWFSLSmoke |1.0.20 | | | |
11071
|QRAGadget |0.1.0 | | | |
11172
|rdefra |0.3.4 | | | |
112-
|rdwd |0.10.1 | | | |
113-
|RgoogleMaps |1.4.1 |-1 | | |
114-
|Rnightlights |0.1.5 | | | |
73+
|[rdwd](problems.md#rdwd) |0.10.2 | | |1 |
74+
|RgoogleMaps |1.4.1 | | | |
75+
|Rnightlights |0.2.1 | | | |
11576
|rnoaa |0.7.0 | | | |
11677
|robis |1.0.0 | | | |
11778
|[rpostgisLT](problems.md#rpostgislt) |0.6.0 | | |1 |
11879
|RSurvey |0.9.3 | | | |
119-
|[segclust2d](problems.md#segclust2d) |0.1.0 |1 | | |
80+
|segclust2d |0.1.0 | | | |
12081
|[SpatialEpiApp](problems.md#spatialepiapp) |0.3 | | |2 |
12182
|[statesRcontiguous](problems.md#statesrcontiguous) |0.1.0 | | |2 |
12283
|[stationaRy](problems.md#stationary) |0.4.1 | | |1 |
123-
|[SWMPrExtension](problems.md#swmprextension) |0.3.12 | | |1 |
124-
|synthACS |1.0.1 | | | |
84+
|[SWMPrExtension](problems.md#swmprextension) |0.3.14 |1 | |1 |
85+
|synthACS |1.4.2 | | | |
12586
|[teachingApps](problems.md#teachingapps) |1.0.2 | | |1 |
12687
|tigris |0.7 | | | |
12788
|[tilegramsR](problems.md#tilegramsr) |0.2.0 | | |2 |
128-
|[tmap](problems.md#tmap) |1.11-2 | | |1 |
89+
|[tmap](problems.md#tmap) |1.11-2 |1 |1 |1 |
12990
|[trackeR](problems.md#tracker) |1.0.0 | | |1 |
13091
|[USAboundaries](problems.md#usaboundaries) |0.3.1 | | |1 |
131-
|[wallace](problems.md#wallace) |1.0.4 | | |1 |
92+
|[wallace](problems.md#wallace) |1.0.4 | | |2 |
13293
|wellknown |0.5.0 | | | |
133-
|[windfarmGA](problems.md#windfarmga) |1.2.1 | | |1 |
94+
|[windfarmGA](problems.md#windfarmga) |1.2.1 |1 | |1 |
13495
|worldmet |0.8.4 | | | |
13596

0 commit comments

Comments
 (0)