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
rstudio · Jun 4, 2018 · 7de631d · 7de631d
1 parent ea646ea
commit 7de631d
Show file tree

Hide file tree

Showing 12 changed files with 303 additions and 210 deletions.
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.0.9000
+Version: 2.0.1
 Authors@R: c(
       person("Joe", "Cheng", email = "joe@rstudio.com", role = c("aut", "cre")),
       person("Bhaskar", "Karambelkar", role = c("aut")),

diff --git a/NEWS b/NEWS
@@ -1,12 +1,12 @@
-leaflet 2.0.0.9000
+leaflet 2.0.1
 --------------------------------------------------------------------------------
 
 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
+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)

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,76 +1,72 @@
 # Comments
 
-## 2018-4-20
-Resubmitting to avoid example execution time NOTE. Test environment outputs updated below.
-
-- Barret
-
-## 2018-4-19
+## 2018-6-4
 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>.
 
 - Barret
 
 
 ## Test environments
-* local OS X install, R 3.4.4, --run-dontcheck
+* local OS X install, R 3.5.0, --run-dontcheck
+  * 0 errors | 0 warnings | 0 notes
+* ubuntu 14.04.5 (on travis-ci), R version 3.5.0 (2017-01-27)
   * 0 errors | 0 warnings | 0 notes
-* ubuntu 12.04 (on travis-ci), R version 3.4.4 (2017-01-27)
+* devtools::build_win() x86_64-w64-mingw32, R version 3.5.0 (2018-04-23)
   * 0 errors | 0 warnings | 0 notes
-* devtools::build_win() x86_64-w64-mingw32, R version 3.4.4 (2018-03-15)
+* devtools::build_win() x86_64-w64-mingw32, R Under development (unstable) (2018-06-03 r74839)
   * 0 errors | 0 warnings | 0 notes
 
 I believe the warning and note below are transient within r-hub.
   * WARNING: Conversion of "README.md" failed:
     * the svg at https://travis-ci.org/rstudio/leaflet.svg?branch=master exists
   * NOTE: checking package dependencies
-    * On linux... Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
+    * Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
+      * rgdal
+        * I know rgdal has a source version that does not compile without an external library
+        * The tests rgdal validated locally and on travis
 
 * r-hub
+
   * Platform:   Windows Server 2008 R2 SP1, R-release, 32/64 bit
-    https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-3915b63fe8c34d99b3ad7aa4b6e94640
+    http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-15775eb481a9459f904cba113f9323be
     ❯ checking top-level files ... WARNING
-      Conversion of 'README.md' failed:
-      pandoc.exe: Could not fetch https://travis-ci.org/rstudio/leaflet.svg?branch=master
-      no store
-      CallStack (from HasCallStack):
-        error, called at .\System\X509\Win32.hs:56:31 in x509-system-1.6.4-E9zvdZ6nI282vjtOPFYSd1:System.X509.Win32
+    ❯ checking package dependencies ... NOTE
+      Packages suggested but not available for checking: 'rgdal' 'rgeos'
+    0 errors ✔ | 1 warning ✖ | 1 note ✖
 
-    0 errors ✔ | 1 warning ✖ | 0 notes ✔
 
   * Platform:   Windows Server 2008 R2 SP1, R-devel, 32/64 bit
-    https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-fb1316cbeb5f48eba08e959769a990d4
+    http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-4f5603a8abeb470db77bb3adb682fc29
     ❯ checking top-level files ... WARNING
       Conversion of 'README.md' failed:
       pandoc.exe: Could not fetch https://travis-ci.org/rstudio/leaflet.svg?branch=master
       no store
       CallStack (from HasCallStack):
         error, called at .\System\X509\Win32.hs:56:31 in x509-system-1.6.4-E9zvdZ6nI282vjtOPFYSd1:System.X509.Win32
-
-    0 errors ✔ | 1 warning ✖ | 0 notes ✔
+    ❯ checking package dependencies ... NOTE
+      Packages suggested but not available for checking: 'rgdal' 'rgeos'
+    0 errors ✔ | 1 warning ✖ | 1 note ✖
 
   * Platform:   Ubuntu Linux 16.04 LTS, R-release, GCC
     * checked with `_R_CHECK_FORCE_SUGGESTS_=0`
-    https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-cec4735e750d4f1ea05dca55c153a847
+    http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-0bc1c360b5cb45a883cd87b5c8408b2f
     ❯ checking package dependencies ... NOTE
       Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
-
     0 errors ✔ | 0 warnings ✔ | 1 note ✖
 
   * Platform:   Fedora Linux, R-devel, clang, gfortran
     * checked with `_R_CHECK_FORCE_SUGGESTS_=0`
-    https://builder.r-hub.io/status/leaflet_2.0.0.tar.gz-09d8a5861fb74ed3baa34d727f1df82b
+    http://builder.r-hub.io/status/leaflet_2.0.1.tar.gz-dcd35d9761ef4e8596ec02e53207de49
     ❯ checking package dependencies ... NOTE
       Packages suggested but not available for checking: ‘sf’ ‘rgdal’ ‘rgeos’
-
     0 errors ✔ | 0 warnings ✔ | 1 note ✖
 
 ## Reverse dependencies
 
-* All revdep maintainers were notified on March 29, 2018 for a release date of April 16th.
+* Revdep maintainers were not contacted as this release is for bug fixes and enhancements from particular maintainers.
 
-* I have run R CMD check on the 60 downstream dependencies.
+* I have run R CMD check on the 63 downstream dependencies.
   * https://github.com/rstudio/leaflet/blob/master/revdep/problems.md
+  * No errors, warnings, or notes were introduced due to changes in leaflet
 
-* No errors, warnings, or notes were introduced due to changes in leaflet
-
-* Could not install: segclust2d
+* All revdeps were able to be tested
diff --git a/docs/libs/leaflet-binding/leaflet.js b/docs/libs/leaflet-binding/leaflet.js
@@ -720,10 +720,18 @@ _htmlwidgets2.default.widget({
           methods.fitBounds.apply(map, data.fitBounds);
         }
         if (data.flyTo) {
+          if (!explicitView && !map.leafletr.hasRendered) {
+            // must be done to give a initial starting point
+            map.fitWorld();
+          }
           explicitView = true;
           map.flyTo.apply(map, data.flyTo);
         }
         if (data.flyToBounds) {
+          if (!explicitView && !map.leafletr.hasRendered) {
+            // must be done to give a initial starting point
+            map.fitWorld();
+          }
           explicitView = true;
           methods.flyToBounds.apply(map, data.flyToBounds);
         }
@@ -2507,6 +2515,11 @@ methods.removeSelect = function () {
   }
 };
 
+methods.createMapPane = function (name, zIndex) {
+  this.createPane(name);
+  this.getPane(name).style.zIndex = zIndex;
+};
+
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{"./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){

diff --git a/docs/shapes.html b/docs/shapes.html
@@ -596,10 +596,10 @@ <h4>Simplifying complex polygons/polylines</h4>
 
 fullsize &lt;- usa_sf()
 object.size(fullsize)</code></pre>
-<pre><code>## 922816 bytes</code></pre>
+<pre><code>## 933016 bytes</code></pre>
 <pre class="r"><code>simplified &lt;- rmapshaper::ms_simplify(fullsize)
 object.size(simplified)</code></pre>
-<pre><code>## 114216 bytes</code></pre>
+<pre><code>## 120496 bytes</code></pre>
 </div>
 </div>
 <div id="circles" class="section level3">

diff --git a/revdep/README.md b/revdep/README.md
@@ -2,134 +2,95 @@
 
 |field    |value                        |
 |:--------|:----------------------------|
-|version  |R version 3.4.4 (2018-03-15) |
-|os       |macOS High Sierra 10.13.3    |
+|version  |R version 3.5.0 (2018-04-23) |
+|os       |macOS High Sierra 10.13.4    |
 |system   |x86_64, darwin15.6.0         |
 |ui       |X11                          |
 |language |(EN)                         |
 |collate  |en_US.UTF-8                  |
 |tz       |America/New_York             |
-|date     |2018-04-19                   |
+|date     |2018-06-04                   |
 
 # Dependencies
 
-|package      |old     |new     |Δ  |
-|:------------|:-------|:-------|:--|
-|leaflet      |1.1.0   |2.0.0   |*  |
-|assertthat   |0.2.0   |0.2.0   |   |
-|base64enc    |0.1-3   |0.1-3   |   |
-|cli          |1.0.0   |1.0.0   |   |
-|colorspace   |1.3-2   |1.3-2   |   |
-|crayon       |1.3.4   |1.3.4   |   |
-|crosstalk    |1.0.0   |1.0.0   |   |
-|dichromat    |2.0-0   |2.0-0   |   |
-|digest       |0.6.15  |0.6.15  |   |
-|ggplot2      |2.2.1   |2.2.1   |   |
-|glue         |1.2.0   |1.2.0   |   |
-|gridExtra    |2.3     |2.3     |   |
-|gtable       |0.2.0   |0.2.0   |   |
-|htmltools    |0.3.6   |0.3.6   |   |
-|htmlwidgets  |1.2     |1.2     |   |
-|httpuv       |1.3.6.2 |1.3.6.2 |   |
-|jsonlite     |1.5     |1.5     |   |
-|labeling     |0.3     |0.3     |   |
-|lazyeval     |0.2.1   |0.2.1   |   |
-|magrittr     |1.5     |1.5     |   |
-|markdown     |0.8     |0.8     |   |
-|mime         |0.5     |0.5     |   |
-|munsell      |0.4.3   |0.4.3   |   |
-|pillar       |1.2.1   |1.2.1   |   |
-|plyr         |1.8.4   |1.8.4   |   |
-|png          |0.1-7   |0.1-7   |   |
-|R6           |2.2.2   |2.2.2   |   |
-|raster       |2.6-7   |2.6-7   |   |
-|RColorBrewer |1.1-2   |1.1-2   |   |
-|Rcpp         |0.12.16 |0.12.16 |   |
-|reshape2     |1.4.3   |1.4.3   |   |
-|rlang        |0.2.0   |0.2.0   |   |
-|scales       |0.5.0   |0.5.0   |   |
-|shiny        |1.0.5   |1.0.5   |   |
-|sourcetools  |0.1.6   |0.1.6   |   |
-|sp           |1.2-7   |1.2-7   |   |
-|stringi      |1.1.7   |1.1.7   |   |
-|stringr      |1.3.0   |1.3.0   |   |
-|tibble       |1.4.2   |1.4.2   |   |
-|utf8         |1.1.3   |1.1.3   |   |
-|viridis      |0.5.1   |0.5.1   |   |
-|viridisLite  |0.3.0   |0.3.0   |   |
-|xtable       |1.8-2   |1.8-2   |   |
-|yaml         |2.1.18  |2.1.18  |   |
+|package |old   |new     |Δ  |
+|:-------|:-----|:-------|:--|
+|leaflet |2.0.0 |2.0.1   |*  |
+|pillar  |NA    |1.2.3   |*  |
+|png     |0.1-7 |0.1-7   |   |
+|raster  |2.6-7 |2.6-7   |   |
+|Rcpp    |NA    |0.12.17 |*  |
+|rlang   |NA    |0.2.1   |*  |
+|shiny   |NA    |1.1.0   |*  |
+|utf8    |NA    |1.1.4   |*  |
 
 # Revdeps
 
-## Couldn't check (1)
-
-|package                              |version |error |warning |note |
-|:------------------------------------|:-------|:-----|:-------|:----|
-|[segclust2d](problems.md#segclust2d) |0.1.0   |1     |        |     |
-
-## All (60)
+## All (63)
 
 |package                                            |version |error |warning |note |
 |:--------------------------------------------------|:-------|:-----|:-------|:----|
-|[amt](problems.md#amt)                             |0.0.3.0 |      |        |1    |
-|blscrapeR                                          |3.1.2   |      |        |     |
+|[amt](problems.md#amt)                             |0.0.4.0 |      |        |1    |
+|antaresViz                                         |0.13.0  |      |        |     |
+|[blscrapeR](problems.md#blscraper)                 |3.1.2   |1     |        |     |
 |cancensus                                          |0.1.7   |      |        |     |
-|[CDECRetrieve](problems.md#cdecretrieve)           |0.1.0   |      |        |1    |
+|[CDECRetrieve](problems.md#cdecretrieve)           |0.1.1   |      |        |1    |
 |cycleRtools                                        |1.1.1   |      |        |     |
 |eAnalytics                                         |0.1.3   |      |        |     |
 |futureheatwaves                                    |1.0.3   |      |        |     |
 |genogeographer                                     |0.1.8   |      |        |     |
 |geojsonio                                          |0.6.0   |      |        |     |
 |[geoSpectral](problems.md#geospectral)             |0.17.4  |1     |        |     |
-|inlmisc                                            |0.4.0   |      |        |     |
+|[inlmisc](problems.md#inlmisc)                     |0.4.0   |1     |        |     |
 |[jpmesh](problems.md#jpmesh)                       |1.1.0   |      |        |1    |
-|[jpndistrict](problems.md#jpndistrict)             |0.3.0   |1     |        |1    |
+|[jpndistrict](problems.md#jpndistrict)             |0.3.1   |      |        |1    |
 |[lawn](problems.md#lawn)                           |0.4.2   |      |        |1    |
-|[leaflet.esri](problems.md#leafletesri)            |0.2     |      |        |1    |
-|[leaflet.extras](problems.md#leafletextras)        |0.2     |      |        |1    |
-|leaflet.minicharts                                 |0.5.2   |      |        |     |
+|leaflet.esri                                       |1.0.0   |      |        |     |
+|leaflet.extras                                     |1.0.0   |      |        |     |
+|leaflet.minicharts                                 |0.5.3   |      |        |     |
 |[leafletCN](problems.md#leafletcn)                 |0.2.1   |      |        |3    |
 |[lingtypology](problems.md#lingtypology)           |1.0.12  |      |        |1    |
 |macleish                                           |0.3.2   |      |        |     |
 |manipulateWidget                                   |0.9.0   |      |        |     |
 |[mapedit](problems.md#mapedit)                     |0.4.1   |      |        |1    |
 |[mapr](problems.md#mapr)                           |0.4.0   |      |        |1    |
 |[mapsapi](problems.md#mapsapi)                     |0.3.5   |      |        |1    |
-|mapview                                            |2.3.0   |      |        |     |
+|mapview                                            |2.4.0   |      |        |     |
 |meltt                                              |0.4.0   |      |        |     |
 |[metScanR](problems.md#metscanr)                   |1.2.0   |      |        |1    |
+|[mgwrsar](problems.md#mgwrsar)                     |0.1     |      |        |1    |
 |neotoma                                            |1.7.0   |      |        |     |
 |nyctaxi                                            |0.0.1   |      |        |     |
 |openadds                                           |0.2.0   |      |        |     |
 |owmr                                               |0.7.2   |      |        |     |
-|[parlitools](problems.md#parlitools)               |0.2.1   |      |        |1    |
+|[parlitools](problems.md#parlitools)               |0.2.1   |      |-1      |1    |
 |[phenocamr](problems.md#phenocamr)                 |1.1.0   |      |        |1    |
+|pkgdown                                            |1.1.0   |      |        |     |
 |ppcSpatial                                         |0.2.0   |      |        |     |
-|PWFSLSmoke                                         |1.0.16  |      |-1      |     |
+|PWFSLSmoke                                         |1.0.20  |      |        |     |
 |QRAGadget                                          |0.1.0   |      |        |     |
 |rdefra                                             |0.3.4   |      |        |     |
-|rdwd                                               |0.10.1  |      |        |     |
-|RgoogleMaps                                        |1.4.1   |-1    |        |     |
-|Rnightlights                                       |0.1.5   |      |        |     |
+|[rdwd](problems.md#rdwd)                           |0.10.2  |      |        |1    |
+|RgoogleMaps                                        |1.4.1   |      |        |     |
+|Rnightlights                                       |0.2.1   |      |        |     |
 |rnoaa                                              |0.7.0   |      |        |     |
 |robis                                              |1.0.0   |      |        |     |
 |[rpostgisLT](problems.md#rpostgislt)               |0.6.0   |      |        |1    |
 |RSurvey                                            |0.9.3   |      |        |     |
-|[segclust2d](problems.md#segclust2d)               |0.1.0   |1     |        |     |
+|segclust2d                                         |0.1.0   |      |        |     |
 |[SpatialEpiApp](problems.md#spatialepiapp)         |0.3     |      |        |2    |
 |[statesRcontiguous](problems.md#statesrcontiguous) |0.1.0   |      |        |2    |
 |[stationaRy](problems.md#stationary)               |0.4.1   |      |        |1    |
-|[SWMPrExtension](problems.md#swmprextension)       |0.3.12  |      |        |1    |
-|synthACS                                           |1.0.1   |      |        |     |
+|[SWMPrExtension](problems.md#swmprextension)       |0.3.14  |1     |        |1    |
+|synthACS                                           |1.4.2   |      |        |     |
 |[teachingApps](problems.md#teachingapps)           |1.0.2   |      |        |1    |
 |tigris                                             |0.7     |      |        |     |
 |[tilegramsR](problems.md#tilegramsr)               |0.2.0   |      |        |2    |
-|[tmap](problems.md#tmap)                           |1.11-2  |      |        |1    |
+|[tmap](problems.md#tmap)                           |1.11-2  |1     |1       |1    |
 |[trackeR](problems.md#tracker)                     |1.0.0   |      |        |1    |
 |[USAboundaries](problems.md#usaboundaries)         |0.3.1   |      |        |1    |
-|[wallace](problems.md#wallace)                     |1.0.4   |      |        |1    |
+|[wallace](problems.md#wallace)                     |1.0.4   |      |        |2    |
 |wellknown                                          |0.5.0   |      |        |     |
-|[windfarmGA](problems.md#windfarmga)               |1.2.1   |      |        |1    |
+|[windfarmGA](problems.md#windfarmga)               |1.2.1   |1     |        |1    |
 |worldmet                                           |0.8.4   |      |        |     |