diff --git a/R/antpath.R b/R/antpath.R index b409926d..66d6ca84 100644 --- a/R/antpath.R +++ b/R/antpath.R @@ -1,7 +1,7 @@ antpathDependency <- function() { list( htmltools::htmlDependency( - "lfx-antpath", version = "2.1.0", + "lfx-antpath", version = "1.0.0", src = system.file("htmlwidgets/lfx-antpath", package = "leaflet.extras2"), script = c("lfx-ant-path.js", "lfx-ant-path-bindings.js") diff --git a/R/easyprint.R b/R/easyprint.R index 9d9f41f6..e794b173 100644 --- a/R/easyprint.R +++ b/R/easyprint.R @@ -1,7 +1,7 @@ easyprintDependency <- function() { list( htmltools::htmlDependency( - "lfx-easyprint", version = "2.1.0", + "lfx-easyprint", version = "1.0.0", src = system.file("htmlwidgets/lfx-easyprint", package = "leaflet.extras2"), script = c("lfx-easyprint.js", "lfx-easyprint-bindings.js") @@ -92,23 +92,22 @@ removeEasyprint <- function(map) { #' Create a list of further options for the easyprint plugin. #' @param title Sets the text which appears as the tooltip of the print/export button #' @param position Positions the print button -#' @param sizeModes Options available include CurrentSize, A4Portrait, -#' A4Landscape or a custom size object. -#' @param defaultSizeTitles button tooltips for the default page sizes -#' @param exportOnly If set to true the map is exported to a png file +#' @param sizeModes Options available include \code{CurrentSize}, \code{A4Portrait}, +#' \code{A4Landscape} or a custom size object +#' @param defaultSizeTitles Button tooltips for the default page sizes +#' @param exportOnly If set to \code{TRUE} the map is exported to a .png file #' @param tileLayer A tile layer that you can wait for to draw (helpful when resizing) #' @param tileWait How long to wait for the tiles to draw (helpful when resizing) #' @param filename Name of the file if \code{exportOnly} option is \code{TRUE} -#' @param hidden Set to true if you don't want to display the toolbar. +#' @param hidden Set to \code{TRUE} if you don't want to display the toolbar. #' Instead you can create your own buttons or fire print events programmatically. -#' You still need to call addTo(map) to set the leaflet map context. #' @param hideControlContainer Hides the leaflet controls like the zoom buttons -#' and the attribution on the print out. +#' and the attribution on the print out #' @param hideClasses Hides classes on the print out. Use a list of strings as #' follow : list('div1', 'div2') #' @param customWindowTitle A title for the print window which will get -#' added the printed paper. -#' @param spinnerBgColor A valid css colour for the spinner background color. +#' added the printed paper +#' @param spinnerBgColor A valid css colour for the spinner background color #' @param customSpinnerClass A class for a custom css spinner to use while #' waiting for the print. #' @family EasyPrint Functions diff --git a/R/gibs.R b/R/gibs.R index 139d3216..2ab919a9 100644 --- a/R/gibs.R +++ b/R/gibs.R @@ -1,7 +1,7 @@ gibsDependency <- function() { list( htmltools::htmlDependency( - "lfx-gibs", version = "2.1.0", + "lfx-gibs", version = "1.0.0", src = system.file("htmlwidgets/lfx-gibs", package = "leaflet.extras2"), script = c( "GIBSLayer.js", diff --git a/R/hexbin.R b/R/hexbin.R index 2b529c66..87c6240c 100644 --- a/R/hexbin.R +++ b/R/hexbin.R @@ -1,7 +1,7 @@ hexbinDependency <- function() { list( htmltools::htmlDependency( - "lfx-hexbin", version = "2.1.0", + "lfx-hexbin", version = "1.0.0", src = system.file("htmlwidgets/lfx-hexbin", package = "leaflet.extras2"), script = c( "d3.js", diff --git a/R/history.R b/R/history.R index b1b8d5bd..a89a20c0 100644 --- a/R/history.R +++ b/R/history.R @@ -7,7 +7,7 @@ historyDependency <- function() { stylesheet = c("css/all.min.css", "css/v4-shims.min.css") ), htmlDependency( - "lfx-history", version = "2.1.0", + "lfx-history", version = "1.0.0", src = system.file("htmlwidgets/lfx-history", package = "leaflet.extras2"), script = c("zoomCenter.js", "lfx-history.js", diff --git a/R/openweather.R b/R/openweather.R index dc5cc1c0..57d9f2a2 100644 --- a/R/openweather.R +++ b/R/openweather.R @@ -1,7 +1,7 @@ openweatherDependency <- function() { list( htmltools::htmlDependency( - "lfx-openweather", version = "2.1.0", + "lfx-openweather", version = "1.0.0", src = system.file("htmlwidgets/lfx-openweather", package = "leaflet.extras2"), script = c( "leaflet-openweathermap.js", diff --git a/R/playback.R b/R/playback.R index a789b52a..3ef6d2fa 100644 --- a/R/playback.R +++ b/R/playback.R @@ -14,7 +14,7 @@ playbackDependencies <- function() { #' The \href{https://github.com/hallahan/LeafletPlayback}{LeafletPlayback plugin} #' provides the ability to replay GPS Points in the form of #' POINT Simple Features. Rather than simply animating a marker along a -#' polyline, the speed of the animation is synchroized to a clock. The playback +#' polyline, the speed of the animation is synchronized to a clock. The playback #' functionality is similar to a video player; you can start and stop playback or #' change the playback speed. #' @param map a map widget @@ -23,7 +23,7 @@ playbackDependencies <- function() { #' a specific form. See the Details for further information. #' @param time The column name of the time column. Default is \code{"time"}. #' @param icon an icon which can be created with \code{\link[leaflet]{makeIcon}} -#' @param pathOpts style the CircleMarker with +#' @param pathOpts style the CircleMarkers with #' \code{\link[leaflet]{pathOptions}} #' @param options List of additional options. See \code{\link{playbackOptions}} #' @details If data is a JSON string, it must have the following form: diff --git a/R/wms.R b/R/wms.R index d27db8d5..26b2f029 100644 --- a/R/wms.R +++ b/R/wms.R @@ -1,7 +1,7 @@ wmsDependency <- function() { list( htmltools::htmlDependency( - "lfx-wms", version = "2.1.0", + "lfx-wms", version = "1.0.0", src = system.file("htmlwidgets/lfx-wms", package = "leaflet.extras2"), script = c("leaflet.wms.js", "leaflet.wms-bindings.js") diff --git a/cran-comments.md b/cran-comments.md new file mode 100644 index 00000000..95c52ffc --- /dev/null +++ b/cran-comments.md @@ -0,0 +1,16 @@ +## Test environments +* local R installation, R 3.6.1 +* ubuntu 16.04 (on travis-ci), R 3.6.1 +* win-builder (devel) + +## R CMD check results + +0 errors | 0 warnings | 1 note + +* This is a new release. + +- Added @return to all functions +- Documentation has been revised and expanded +- Included 2 new plugins (history/heightgraph) +- Changed all html-dependency versions to match package-version +- Changed all @seealso URL's to @references