Merge tag 'v2.1.2'

Author: jcheng5

NEWS

@@ -1,4 +1,4 @@
-leaflet 2.1.1.9000
+leaflet 2.1.2.9000
 --------------------------------------------------------------------------------
 
 BUG FIXES and IMPROVEMENTS
@@ -10,6 +10,14 @@ BUG FIXES and IMPROVEMENTS
 
 * Remove dependencies on rgdal and rgeos. (#837)
 
+
+leaflet 2.1.2
+--------------------------------------------------------------------------------
+
+BUG FIXES and IMPROVEMENTS
+* Removed S3 warnings found on R devel (#848)
+
+
 leaflet 2.1.1
 --------------------------------------------------------------------------------
 
@@ -90,7 +98,7 @@ leaflet 2.0.0
 
 BREAKING CHANGES
 
-* Update to latest leaflet.js v1.3.1 (#453, 314616f)  Please see https://leafletjs.com/reference-1.3.4.html for the latest documentation
+* Update to latest leaflet.js v1.3.1 (#453, 314616f)  Please see https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html for the latest documentation
 
 * All plugins updated to versions compatible with leaflet > 1.0 (#458)
 
@@ -121,7 +129,7 @@ BUG FIXES AND FEATURES
 
 * Added more providers for `addProviderTiles()`: "OpenStreetMap.CH", "OpenInfraMap", "OpenInfraMap.Power", "OpenInfraMap.Telecom", "OpenInfraMap.Petroleum", "OpenInfraMap.Water", "OpenPtMap", "OpenRailwayMap", "OpenFireMap", "SafeCast". (4aea447)
 
-* `L.multiPolyline` was absorbed into `L.polyline`, which accepts multiple an array of polyline information. https://leafletjs.com/reference-1.3.4.html#polyline. (#515)
+* `L.multiPolyline` was absorbed into `L.polyline`, which accepts multiple an array of polyline information. https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#polyline. (#515)
 
 * Fix bug where icons where anchored to the top-center, not center-center (2a60751)
 

R/layers.R

@@ -147,7 +147,7 @@ groupOptions <- function(map, group, zoomLevels = NULL) {
 #'   \code{\link{popupOptions}}, \code{\link{markerOptions}},
 #'   \code{\link{pathOptions}}
 #' @references The Leaflet API documentation:
-#'   \url{https://leafletjs.com/reference-1.3.4.html}
+#'   \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html}
 #' @describeIn map-layers Add a tile layer to the map
 #' @export
 addTiles <- function(
@@ -486,7 +486,7 @@ clearImages <- function(map) {
 #' @param
 #' minZoom,maxZoom,maxNativeZoom,tileSize,subdomains,errorTileUrl,tms,noWrap,zoomOffset,zoomReverse,zIndex,unloadInvisibleTiles,updateWhenIdle,detectRetina
 #' the tile layer options; see
-#' \url{https://leafletjs.com/reference-1.3.4.html#tilelayer}
+#' \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#tilelayer}
 #' @param ... extra options passed to underlying Javascript object constructor.
 #' @describeIn map-options Options for tile layers
 #' @export
@@ -628,7 +628,7 @@ addPopups <- function(
 #' @param className a CSS class name set on an element
 #' @param
 #' maxWidth,minWidth,maxHeight,autoPan,keepInView,closeButton,closeOnClick
-#' popup options; see \url{https://leafletjs.com/reference-1.3.4.html#popup-option}
+#' popup options; see \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#popup-option}
 #' @describeIn map-options Options for popups
 #' @export
 popupOptions <- function(
@@ -696,13 +696,13 @@ safeLabel <- function(label, data) {
 
 #' @param
 #' noHide,direction,offset,permanent
-#' label options; see \url{https://leafletjs.com/reference-1.3.4.html#tooltip-option}
-#' @param opacity Tooltip container opacity. Ranges from 0 to 1. Default value is \code{1} (different from leaflet.js \code{0.9}); see \url{https://leafletjs.com/reference-1.3.4.html#tooltip-opacity}
+#' label options; see \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#tooltip-option}
+#' @param opacity Tooltip container opacity. Ranges from 0 to 1. Default value is \code{1} (different from leaflet.js \code{0.9}); see \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#tooltip-opacity}
 #' @param textsize Change the text size of a single tooltip
 #' @param textOnly Display only the text, no regular surrounding box.
 #' @param style list of css style to be added to the tooltip
 #' @param zoomAnimation deprecated. See \url{https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#api-changes-5}
-#' @param sticky If true, the tooltip will follow the mouse instead of being fixed at the feature center. Default value is \code{TRUE} (different from leaflet.js \code{FALSE}); see \url{https://leafletjs.com/reference-1.3.4.html#tooltip-sticky}
+#' @param sticky If true, the tooltip will follow the mouse instead of being fixed at the feature center. Default value is \code{TRUE} (different from leaflet.js \code{FALSE}); see \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#tooltip-sticky}
 #' @describeIn map-options Options for labels
 #' @export
 labelOptions <- function(
@@ -1024,7 +1024,7 @@ b64EncodePackedIcons <- function(packedIcons) {
 #' @param clickable DEPRECATED! Use the \code{interactive} option.
 #' @param
 #'   draggable,keyboard,title,alt,zIndexOffset,riseOnHover,riseOffset
-#'   marker options; see \url{https://leafletjs.com/reference-1.3.4.html#marker-option}
+#'   marker options; see \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#marker-option}
 #' @describeIn map-options Options for markers
 #' @export
 markerOptions <- function(
@@ -1057,7 +1057,7 @@ markerOptions <- function(
 #'   spiderfy it so you can see all of its markers
 #' @param removeOutsideVisibleBounds clusters and markers too far from the
 #'   viewport are removed from the map for performance
-#' @param spiderLegPolylineOptions Allows you to specify PolylineOptions (\url{https://leafletjs.com/reference-1.3.4.html#polyline-option}) to style spider legs. By default, they are { weight: 1.5, color: "#222", opacity: 0.5 }
+#' @param spiderLegPolylineOptions Allows you to specify PolylineOptions (\url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#polyline-option}) to style spider legs. By default, they are { weight: 1.5, color: "#222", opacity: 0.5 }
 #' @param freezeAtZoom Allows you to freeze cluster expansion to a zoom level.
 #' Can be a zoom level e.g. 10, 12 or "max" or "maxKeepSpiderify"
 #' See \url{https://github.com/ghybs/Leaflet.MarkerCluster.Freezable#api-reference}
@@ -1431,7 +1431,7 @@ clearGeoJSON <- function(map) {
 #' Add UI controls to switch layers on and off
 #'
 #' Uses Leaflet's built-in
-#' \href{https://leafletjs.com/reference-1.3.4.html#control-layers}{layers control}
+#' \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#control-layers}{layers control}
 #' feature to allow users to choose one of several base layers, and to choose
 #' any number of overlay layers to view.
 #'

R/leaflet.R

@@ -146,7 +146,7 @@ mapOptions <- function(map, zoomToLimits = c("always", "first", "never")) {
 #' @param preferCanvas Whether leaflet.js Paths should be rendered on a Canvas renderer.
 #' @param ... other options used for leaflet.js map creation.
 #' @describeIn leaflet Options for map creation
-#' @seealso See \url{https://leafletjs.com/reference-1.3.4.html#map-option} for details and more options.
+#' @seealso See \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#map-option} for details and more options.
 #' @export
 leafletOptions <- function(
   minZoom = NULL,

R/mapPane.R

@@ -9,7 +9,7 @@
 #' over the order of the layers, e.g. points always on top of polygons.
 #' If two layers are provided to the same pane, overlay will be determined by
 #' order of adding. See examples below.
-#' See \url{https://leafletjs.com/reference-1.3.4.html#map-pane} for details.
+#' See \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#map-pane} for details.
 #'
 #' If the error "Cannot read property 'appendChild' of undefined" occurs, make
 #' sure the pane being used for used for display has already been added to the map.

R/methods.R

@@ -6,8 +6,8 @@
 #' @param lat The latitude of the map center
 #' @param zoom the zoom level
 #' @param options a list of zoom/pan options (see
-#'   \url{https://leafletjs.com/reference-1.3.4.html#zoom/pan-options})
-#' @references \url{https://leafletjs.com/reference-1.3.4.html#map-methods-for-modifying-map-state}
+#'   \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#zoom/pan-options})
+#' @references \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#map-methods-for-modifying-map-state}
 #' @return The modified map widget.
 #' @describeIn map-methods Set the view of the map (center and zoom level)
 #' @export

R/plugin-graticule.R

@@ -16,7 +16,7 @@ leafletGraticuleDependencies <- function() {
 #' @param map a map widget object
 #' @param interval The spacing in map units between horizontal and vertical lines.
 #' @param sphere boolean. Default FALSE
-#' @param style path options for the generated lines. See \url{https://leafletjs.com/reference-1.3.4.html#path-option}
+#' @param style path options for the generated lines. See \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#path-option}
 #' @param layerId the layer id
 #' @param group the name of the group this layer belongs to.
 #' @param options the path options for the graticule layer

R/plugin-measure.R

@@ -14,7 +14,7 @@ leafletMeasureDependencies <- function() {
 #' Add a measure control to the map.
 #'
 #' @param map a map widget object
-#' @param position standard \href{https://leafletjs.com/reference-1.3.4.html#control-positions}{Leaflet control position options}.
+#' @param position standard \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#control-positions}{Leaflet control position options}.
 #' @param primaryLengthUnit,secondaryLengthUnit units used to display length
 #'           results. secondaryLengthUnit is optional.
 #'           Valid values are \code{"feet"}, \code{"meters"}, \code{"miles"}, and \code{"kilometers"}.
@@ -29,7 +29,7 @@ leafletMeasureDependencies <- function() {
 #'           Value should be a color represented as a hexadecimal string.
 #' @param popupOptions \code{list} of options applied to the popup
 #'           of the resulting measure feature.
-#'           Properties may be any \href{https://leafletjs.com/reference-1.3.4.html#popup-option}{standard Leaflet popup options}.
+#'           Properties may be any \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#popup-option}{standard Leaflet popup options}.
 #' @param captureZIndex Z-index of the marker used to capture measure clicks.
 #'           Set this value higher than the z-index of all other map layers to
 #'           disable click events on other layers while a measurement is active.

R/plugin-minimap.R

@@ -46,10 +46,10 @@ leafletMiniMapDependencies <- function() {
 #'    Especially useful when 'zoomLevelFixed' is set.
 #' @param minimized Sets whether the minimap should start in a minimized position.
 #' @param aimingRectOptions Sets the style of the aiming rectangle by passing in
-#'    a Path.Options (\url{https://leafletjs.com/reference-1.3.4.html#path-options}) object.
+#'    a Path.Options (\url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#path-options}) object.
 #'    (Clickable will always be overridden and set to false.)
 #' @param shadowRectOptions Sets the style of the aiming shadow rectangle by passing in
-#'    a Path.Options (\url{https://leafletjs.com/reference-1.3.4.html#path-option}) object.
+#'    a Path.Options (\url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#path-option}) object.
 #'    (Clickable will always be overridden and set to false.)
 #' @param strings Overrides the default strings allowing for translation.
 #' @param tiles URL for tiles or one of the pre-defined providers.

R/plugin-providers.R

@@ -46,7 +46,7 @@ addProviderTiles <- function(
 #' @param
 #' errorTileUrl,noWrap,opacity,zIndex,updateWhenIdle,detectRetina
 #' the tile layer options; see
-#' \url{https://leafletjs.com/reference-1.3.4.html#tilelayer}
+#' \url{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#tilelayer}
 #' @param ... named parameters to add to the options
 #' @rdname addProviderTiles
 #' @export

R/scalebar.R

@@ -1,7 +1,7 @@
 #' Add or remove a scale bar
 #'
 #' Uses Leaflet's built-in
-#' \href{https://leafletjs.com/reference-1.3.4.html#control-scale}{scale bar}
+#' \href{https://web.archive.org/web/20220702182250/https://leafletjs.com/reference-1.3.4.html#control-scale}{scale bar}
 #' feature to add a scale bar.
 #'
 #' @param map the map to add the scale bar to