v2.0.0

.Rbuildignore

@@ -13,3 +13,21 @@
 ^package\.json$
 ^node_modules$
 ^data-raw$
+^npm-shrinkwrap\.json$
+^\.Rprofile\.local$
+^inst/htmlwidgets/lib/.*/.*\.map$
+^inst/htmlwidgets/plugins/.*/.*\.map$
+^inst/htmlwidgets/lib/jquery/jquery.js$
+^inst/htmlwidgets/lib/leaflet/leaflet-src.js$
+^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster.freezable-src.js$
+^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster.layersupport-src.js$
+^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster-src.js$
+^inst/htmlwidgets/lib/leaflet-measure/leaflet-measure.js$
+^inst/htmlwidgets/plugins/Proj4Leaflet/proj4.js$
+^revdep/
+^\.lintr$
+^\.github/
+^man-roxygen/
+^viztest-.*
+^scripts
+^cran-comments\.md$

.github/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+We welcome contributions to the **leaflet** package!
+
+To submit a contribution:
+
+1. [Fork](https://github.com/rstudio/leaflet/fork) the repository and make your changes.
+
+2. Ensure that you have signed the [individual](https://rstudioblog.files.wordpress.com/2017/05/rstudio_individual_contributor_agreement.pdf) or [corporate](https://rstudioblog.files.wordpress.com/2017/05/rstudio_corporate_contributor_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to jj@rstudio.com.
+
+3. Submit a [pull request](https://help.github.com/articles/using-pull-requests).
+
+We generally do not merge pull requests that update included web libraries (such as Bootstrap or jQuery) because it is difficult for us to verify that the update is done correctly; we prefer to update these libraries ourselves.
+
+
+## How to make changes
+
+Before you submit a pull request, please do the following:
+
+* Add an entry to NEWS concisely describing what you changed.
+
+* If appropriate, add unit tests in the tests/ directory.
+
+* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
+
+Doing these things will make it easier for the leaflet development team to evaluate your pull request. Even so, we may still decide to modify your code or even not merge it at all. Factors that may prevent us from merging the pull request include:
+
+* breaking backward compatibility
+* adding a feature that we do not consider relevant for leaflet
+* is hard to understand
+* is hard to maintain in the future
+* is computationally expensive
+* is not intuitive for people to use
+
+We will try to be responsive and provide feedback in case we decide not to merge your pull request.
+
+
+## Filing issues
+
+If you find a bug in leaflet, you can also [file an issue](https://github.com/rstudio/leaflet/issues/new). Please provide as much relevant information as you can, and include a minimal reproducible example if possible.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,13 @@
+Please briefly describe your problem and what output you expect. If you have a question, please try using stackoverflow <http://stackoverflow.com> first.
+
+Please include a minimal reprex. The goal of a reprex is to make it as easy as possible for me to recreate your problem so that I can fix it. If you've never heard of a reprex before, start by reading <https://github.com/jennybc/reprex#what-is-a-reprex>, and follow the advice further down the page. Do NOT include session info unless it's explicitly asked for, or you've used `reprex::reprex(..., si = TRUE)` to hide it away.
+
+Delete these instructions once you have read them.
+
+---
+
+Brief description of the problem
+
+```r
+# insert reprex here
+```

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,39 @@
+## Pull Request
+
+Before you submit a pull request, please do the following:
+
+* Add an entry to NEWS concisely describing what you changed.
+
+* If appropriate, add unit tests in the tests/testthat directory.
+
+* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
+
+Doing these things will make it easier for the leaflet development team to evaluate your pull request. Even so, we may still decide to modify your code or even not merge it at all. Factors that may prevent us from merging the pull request include:
+
+* breaking backward compatibility
+* adding a feature that we do not consider relevant for leaflet
+* is hard to understand
+* is hard to maintain in the future
+* is computationally expensive
+* is not intuitive for people to use
+
+We will try to be responsive and provide feedback in case we decide not to merge your pull request.
+
+## Minimal reproducible example
+
+Finally, please include a minimal reprex. The goal of a reprex is to make it as easy as possible for me to recreate your problem so that I can fix it. If you've never heard of a reprex before, start by reading <https://github.com/jennybc/reprex#what-is-a-reprex>, and follow the advice further down the page. Do NOT include session info unless it's explicitly asked for, or you've used `reprex::reprex(..., si = TRUE)` to hide it away.
+
+Delete these instructions once you have read them.
+
+---
+
+Brief description of the solution
+
+```r
+# insert reprex here
+```
+
+PR task list:
+- [ ] Update NEWS
+- [ ] Add tests (if appropriate)
+- [ ] Update documentation with `devtools::document()`

.gitignore

@@ -7,3 +7,7 @@ inst/htmlwidgets/sources
 inst/examples/rsconnect
 inst/examples/*.html
 R/tags
+revdep/checks.noindex
+revdep/library.noindex
+revdep/data.sqlite
+viztest-*

.lintr

@@ -0,0 +1,8 @@
+linters: with_defaults(
+    camel_case_linter = NULL,
+    line_length_linter = NULL, # line_length_linter(100),
+    commented_code_linter = NULL,
+    object_usage_linter = NULL,
+    NULL
+  )
+exclusions: list()

.travis.yml

@@ -12,3 +12,8 @@ notifications:
   email:
     on_success: change
     on_failure: change
+
+r_github_packages:
+  - jimhester/lintr
+after_success:
+  - Rscript -e 'lintr::lint_package()'

DESCRIPTION

@@ -1,15 +1,15 @@
 Package: leaflet
 Type: Package
 Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
-Version: 1.1.0.9000
-Date: 2017-02-17
+Version: 2.0.0
 Authors@R: c(
       person("Joe", "Cheng", email = "joe@rstudio.com", role = c("aut", "cre")),
       person("Bhaskar", "Karambelkar", role = c("aut")),
       person("Yihui", "Xie", role = c("aut")),
       person("Hadley", "Wickham", role = c("ctb")),
       person("Kenton", "Russell", role = c("ctb")),
-      person("Kent", "Johnson", role=c("ctb")),
+      person("Kent", "Johnson", role = c("ctb")),
+      person("Barret", "Schloerke", role = c("ctb")),
       person("jQuery Foundation and contributors", role = c("ctb", "cph"), comment = "jQuery library"),
       person("Vladimir", "Agafonkin", role = c("ctb", "cph"), comment = "Leaflet library"),
       person("CloudMade", role = c("cph"), comment = "Leaflet library"),

NAMESPACE

@@ -107,6 +107,8 @@ export(expandLimits)
 export(expandLimitsBbox)
 export(filterNULL)
 export(fitBounds)
+export(flyTo)
+export(flyToBounds)
 export(getMapData)
 export(groupOptions)
 export(hideGroup)

NEWS

@@ -1,6 +1,32 @@
-leaflet 1.1.1
+leaflet 2.0.0
 --------------------------------------------------------------------------------
 
+* Update to latest leaflet.js v1.3.1 (#453, 314616f)  Please see http://leafletjs.com/reference-1.3.0.html for the latest documentation
+
+* All plugins updated to versions compatible with leaflet > 1.0 (#458)
+
+    _ 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.label, https://github.com/Leaflet/Leaflet.label
+    _ Leaflet.Terminator, https://github.com/joergdietrich/Leaflet.Terminator
+    _ Leaflet.SimpleGraticule, https://github.com/ablakey/Leaflet.SimpleGraticule
+    _ Leaflet.MagnifyingGlass, https://github.com/bbecquet/Leaflet.MagnifyingGlass
+    _ Leaflet.MiniMap, https://github.com/Norkart/Leaflet-MiniMap
+    _ Leaflet.awesome-markers, https://github.com/lvoogdt/Leaflet.awesome-markers
+    _ Leaflet.EasyButton, https://github.com/CliffCloud/Leaflet.EasyButton/
+    _ Proj4Leaflet, https://github.com/kartena/Proj4Leaflet
+    _ leaflet-locationfilter, https://github.com/kajic/leaflet-locationfilter
+    _ leaflet-omnivore, https://github.com/mapbox/leaflet-omnivore
+    _ topojson, https://github.com/topojson/topojson
+
+* Fix bug where icons where anchored to the top-center, not center-center (2a60751)
+
+* Fix bug where markers would not appear in self contained knitr files (cc79bc3)
+
+* leaflet-label plugin now L.tooltip in leaflet.js.  labelOptions() now translates old options clickable to interactive and noHide to permanent.
+
 * Fix a bug where the default `addTiles()` would not work with .html files
   served directly from the filesystem.
 
@@ -15,6 +41,18 @@ leaflet 1.1.1
 
 * Fix incorrect opacity on NA entry in legend. (PR #425)
 
+* Added support for drag events (#405)
+
+* Ensure type safety of .indexOf(stamp) (#396)
+
+* `validateCoords()` warns on invalid polygon data (#393)
+
+* Added `method` argument to `addRasterImage()` to enable nearest neighbor interpolation when projecting categorical rasters (#462)
+
+* Added an `'auto'` method for `addRasterImage()`. Projected factor results are coerced into factors. (9accc7e)
+
+* Added `data` parameter to remaining `addXXX()` methods, including addLegend. (f273edd, #491, #485)
+
 leaflet 1.1.0
 --------------------------------------------------------------------------------
 
@@ -103,4 +141,3 @@ leaflet 1.0.0
 --------------------------------------------------------------------------------
 
 * Initial release
-