Skip to content

Commit 339341d

Browse files
authored
Merge pull request #492 from schloerke/barret/v1x
v2.0.0
2 parents d489e2c + 72529ab commit 339341d

File tree

457 files changed

+177273
-15552
lines changed

Some content is hidden

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

457 files changed

+177273
-15552
lines changed

.Rbuildignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,21 @@
1313
^package\.json$
1414
^node_modules$
1515
^data-raw$
16+
^npm-shrinkwrap\.json$
17+
^\.Rprofile\.local$
18+
^inst/htmlwidgets/lib/.*/.*\.map$
19+
^inst/htmlwidgets/plugins/.*/.*\.map$
20+
^inst/htmlwidgets/lib/jquery/jquery.js$
21+
^inst/htmlwidgets/lib/leaflet/leaflet-src.js$
22+
^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster.freezable-src.js$
23+
^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster.layersupport-src.js$
24+
^inst/htmlwidgets/plugins/Leaflet.markercluster/leaflet.markercluster-src.js$
25+
^inst/htmlwidgets/lib/leaflet-measure/leaflet-measure.js$
26+
^inst/htmlwidgets/plugins/Proj4Leaflet/proj4.js$
27+
^revdep/
28+
^\.lintr$
29+
^\.github/
30+
^man-roxygen/
31+
^viztest-.*
32+
^scripts
33+
^cran-comments\.md$

.github/CONTRIBUTING.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
We welcome contributions to the **leaflet** package!
2+
3+
To submit a contribution:
4+
5+
1. [Fork](https://github.com/rstudio/leaflet/fork) the repository and make your changes.
6+
7+
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 [email protected].
8+
9+
3. Submit a [pull request](https://help.github.com/articles/using-pull-requests).
10+
11+
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.
12+
13+
14+
## How to make changes
15+
16+
Before you submit a pull request, please do the following:
17+
18+
* Add an entry to NEWS concisely describing what you changed.
19+
20+
* If appropriate, add unit tests in the tests/ directory.
21+
22+
* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
23+
24+
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:
25+
26+
* breaking backward compatibility
27+
* adding a feature that we do not consider relevant for leaflet
28+
* is hard to understand
29+
* is hard to maintain in the future
30+
* is computationally expensive
31+
* is not intuitive for people to use
32+
33+
We will try to be responsive and provide feedback in case we decide not to merge your pull request.
34+
35+
36+
## Filing issues
37+
38+
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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Please briefly describe your problem and what output you expect. If you have a question, please try using stackoverflow <http://stackoverflow.com> first.
2+
3+
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.
4+
5+
Delete these instructions once you have read them.
6+
7+
---
8+
9+
Brief description of the problem
10+
11+
```r
12+
# insert reprex here
13+
```

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
## Pull Request
2+
3+
Before you submit a pull request, please do the following:
4+
5+
* Add an entry to NEWS concisely describing what you changed.
6+
7+
* If appropriate, add unit tests in the tests/testthat directory.
8+
9+
* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
10+
11+
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:
12+
13+
* breaking backward compatibility
14+
* adding a feature that we do not consider relevant for leaflet
15+
* is hard to understand
16+
* is hard to maintain in the future
17+
* is computationally expensive
18+
* is not intuitive for people to use
19+
20+
We will try to be responsive and provide feedback in case we decide not to merge your pull request.
21+
22+
## Minimal reproducible example
23+
24+
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.
25+
26+
Delete these instructions once you have read them.
27+
28+
---
29+
30+
Brief description of the solution
31+
32+
```r
33+
# insert reprex here
34+
```
35+
36+
PR task list:
37+
- [ ] Update NEWS
38+
- [ ] Add tests (if appropriate)
39+
- [ ] Update documentation with `devtools::document()`

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ inst/htmlwidgets/sources
77
inst/examples/rsconnect
88
inst/examples/*.html
99
R/tags
10+
revdep/checks.noindex
11+
revdep/library.noindex
12+
revdep/data.sqlite
13+
viztest-*

.lintr

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
linters: with_defaults(
2+
camel_case_linter = NULL,
3+
line_length_linter = NULL, # line_length_linter(100),
4+
commented_code_linter = NULL,
5+
object_usage_linter = NULL,
6+
NULL
7+
)
8+
exclusions: list()

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ notifications:
1212
email:
1313
on_success: change
1414
on_failure: change
15+
16+
r_github_packages:
17+
- jimhester/lintr
18+
after_success:
19+
- Rscript -e 'lintr::lint_package()'

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Package: leaflet
22
Type: Package
33
Title: Create Interactive Web Maps with the JavaScript 'Leaflet' Library
4-
Version: 1.1.0.9000
5-
Date: 2017-02-17
4+
Version: 2.0.0
65
Authors@R: c(
76
person("Joe", "Cheng", email = "[email protected]", role = c("aut", "cre")),
87
person("Bhaskar", "Karambelkar", role = c("aut")),
98
person("Yihui", "Xie", role = c("aut")),
109
person("Hadley", "Wickham", role = c("ctb")),
1110
person("Kenton", "Russell", role = c("ctb")),
12-
person("Kent", "Johnson", role=c("ctb")),
11+
person("Kent", "Johnson", role = c("ctb")),
12+
person("Barret", "Schloerke", role = c("ctb")),
1313
person("jQuery Foundation and contributors", role = c("ctb", "cph"), comment = "jQuery library"),
1414
person("Vladimir", "Agafonkin", role = c("ctb", "cph"), comment = "Leaflet library"),
1515
person("CloudMade", role = c("cph"), comment = "Leaflet library"),

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ export(expandLimits)
107107
export(expandLimitsBbox)
108108
export(filterNULL)
109109
export(fitBounds)
110+
export(flyTo)
111+
export(flyToBounds)
110112
export(getMapData)
111113
export(groupOptions)
112114
export(hideGroup)

NEWS

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
leaflet 1.1.1
1+
leaflet 2.0.0
22
--------------------------------------------------------------------------------
33

4+
* Update to latest leaflet.js v1.3.1 (#453, 314616f) Please see http://leafletjs.com/reference-1.3.0.html for the latest documentation
5+
6+
* All plugins updated to versions compatible with leaflet > 1.0 (#458)
7+
8+
_ jQuery, https://github.com/jquery/jquery
9+
_ Leaflet (JavaScript library), https://github.com/Leaflet/Leaflet
10+
_ Leaflet Providers, https://github.com/leaflet-extras/leaflet-providers
11+
_ leaflet-measure, https://github.com/ljagis/leaflet-measure
12+
_ Leaflet.label, https://github.com/Leaflet/Leaflet.label
13+
_ Leaflet.Terminator, https://github.com/joergdietrich/Leaflet.Terminator
14+
_ Leaflet.SimpleGraticule, https://github.com/ablakey/Leaflet.SimpleGraticule
15+
_ Leaflet.MagnifyingGlass, https://github.com/bbecquet/Leaflet.MagnifyingGlass
16+
_ Leaflet.MiniMap, https://github.com/Norkart/Leaflet-MiniMap
17+
_ Leaflet.awesome-markers, https://github.com/lvoogdt/Leaflet.awesome-markers
18+
_ Leaflet.EasyButton, https://github.com/CliffCloud/Leaflet.EasyButton/
19+
_ Proj4Leaflet, https://github.com/kartena/Proj4Leaflet
20+
_ leaflet-locationfilter, https://github.com/kajic/leaflet-locationfilter
21+
_ leaflet-omnivore, https://github.com/mapbox/leaflet-omnivore
22+
_ topojson, https://github.com/topojson/topojson
23+
24+
* Fix bug where icons where anchored to the top-center, not center-center (2a60751)
25+
26+
* Fix bug where markers would not appear in self contained knitr files (cc79bc3)
27+
28+
* leaflet-label plugin now L.tooltip in leaflet.js. labelOptions() now translates old options clickable to interactive and noHide to permanent.
29+
430
* Fix a bug where the default `addTiles()` would not work with .html files
531
served directly from the filesystem.
632

@@ -15,6 +41,18 @@ leaflet 1.1.1
1541

1642
* Fix incorrect opacity on NA entry in legend. (PR #425)
1743

44+
* Added support for drag events (#405)
45+
46+
* Ensure type safety of .indexOf(stamp) (#396)
47+
48+
* `validateCoords()` warns on invalid polygon data (#393)
49+
50+
* Added `method` argument to `addRasterImage()` to enable nearest neighbor interpolation when projecting categorical rasters (#462)
51+
52+
* Added an `'auto'` method for `addRasterImage()`. Projected factor results are coerced into factors. (9accc7e)
53+
54+
* Added `data` parameter to remaining `addXXX()` methods, including addLegend. (f273edd, #491, #485)
55+
1856
leaflet 1.1.0
1957
--------------------------------------------------------------------------------
2058

@@ -103,4 +141,3 @@ leaflet 1.0.0
103141
--------------------------------------------------------------------------------
104142

105143
* Initial release
106-

0 commit comments

Comments
 (0)