Resolve URL redirects

Author: cpsievert

DESCRIPTION

@@ -20,7 +20,7 @@ Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     person("Plotly Technologies Inc.", role = "cph"))
 License: MIT + file LICENSE
 Description: Create interactive web graphics from 'ggplot2' graphs and/or a custom interface to the (MIT-licensed) JavaScript library 'plotly.js' inspired by the grammar of graphics.
-URL: https://plotly-r.com, https://github.com/ropensci/plotly#readme, https://plot.ly/r
+URL: https://plotly-r.com, https://github.com/ropensci/plotly#readme, https://plotly.com/r
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 3.2.0),

NEWS.md

@@ -166,7 +166,7 @@ This is minor patch release with a few minor bug fixes and updates test expectat
 * The `name` attribute is now a "special `plot_ly()` argument" and behaves similar to `split` (it ensures a different trace for every unique value supplied). Although this leads to a breaking change (`name` was previously appended to an automatically generated trace name), it leads to a more flexible and transparent API. Those that wish to have the old behavior back should provide relevant mappings to the `name` attributes (e.g. `plot_ly(mtcars, x = ~wt, y = ~mpg, color = ~factor(vs), name = "a")` should become `plot_ly(mtcars, x = ~wt, y = ~mpg, color = ~factor(vs), name = ~paste(vs, "\na"))`)
 * The `color` argument now maps to `fillcolor`, making it much easier to use polygon fills to encode data values (e.g., choropleth maps). For backwards-compatibilty reasons, when `color` maps to `fillcolor`, `alpha` defaults to 0.5 (instead of 1). For an example, `plot_mapbox(mn_res, color = ~INDRESNAME)` or `plot_mapbox(mn_res, split = ~INDRESNAME, color = ~AREA, showlegend = FALSE, stroke = I("black"))`.
 * The `color` argument no longer automatically add `"markers"` to the `mode` attribute for scatter/scattergl trace types. Those who wish to have the old behavior back, should add `"markers"` to the `mode` explicity (e.g., change `plot_ly(economics, x = ~pce, y = ~pop, color = ~as.numeric(date), mode = "lines")` to `plot_ly(economics, x = ~pce, y = ~pop, color = ~as.numeric(date), mode = "lines+markers")`).
-* The `size` argument now informs a default [error_[x/y].width](https://plot.ly/r/reference/#scatter-error_x-width) (and `span` informs [error_[x/y].thickness](https://plot.ly/r/reference/#scatter-error_x-thickness)). Note you can override the default by specifying directly (e.g. `plot_ly(x = 1:10, y = 1:10, size = I(10), error_x = list(value = 5, width = 0))`).
+* The `size` argument now informs a default [error_[x/y].width](https://plotly.com/r/reference/#scatter-error_x-width) (and `span` informs [error_[x/y].thickness](https://plotly.com/r/reference/#scatter-error_x-thickness)). Note you can override the default by specifying directly (e.g. `plot_ly(x = 1:10, y = 1:10, size = I(10), error_x = list(value = 5, width = 0))`).
 * `layout.showlegend` now defaults to `TRUE` for a *single* pie trace. This is a more sensible default and matches pure plotly.js behavior.
 
 ### Other changes relevant for all **plotly** objects
@@ -253,7 +253,7 @@ This is minor patch release with a few minor bug fixes and updates test expectat
 * Added a `frame` argument to `plot_ly()` for creating animations. Also added the `animation_opts()`, `animation_slider()`, and `animation_button()` functions for configuring animation defaults.
 * Added a new interface to [v2 of the REST API](https://api.plot.ly/v2). This new interface makes the  `plotly_POST()` and `get_figure()` functions obsolete (use `api_create()` and `api_download_plot()` instead), and thus, are now deprecated, but remain around for backwards-compatibility. For more details, see `help(api)`.
 * Added support for conversion of more **ggplot2** geoms via `ggplotly()`: `GeomCol`, `GeomRug`, `GeomCrossbar`, `GeomQuantile`, `GeomSpoke`, `GeomDotplot`, `GeomRasterAnn` (i.e., `annotation_raster()`), and `GeomAnnotationMap` (i.e., `annotation_map()`).
-* Added a new function `raster2uri()` which makes it easier to embed raster objects as [images](https://plot.ly/r/reference/#layout-images) via data URIs. For examples, see `help(raster2uri)`.
+* Added a new function `raster2uri()` which makes it easier to embed raster objects as [images](https://plotly.com/r/reference/#layout-images) via data URIs. For examples, see `help(raster2uri)`.
 * `ggplotly()` gains a new argument, `dynamicTicks`, which allows axis ticks to update upon zoom/pan interactions (fixes #485).
 * Sensible sizing and positioning defaults are now provided for subplots multiple colorbars.
 * R linebreaks are translated to HTML linebreaks (i.e., '\n' translates to '<br />') (fixes #851).
@@ -359,7 +359,7 @@ limits.
 ## CHANGES
 
 * The `add_scattergeo()` and `add_choropleth()` functions have been deprecated in favor of `plot_geo()`. 
-* The `add_area(...)` function changed it's meaning from `add_lines(..., fill = 'tozeroy')` to a wrapper around the area trace <https://plot.ly/r/reference/#area>. This is more consistent with the naming conventions already in place for other `add_()` functions.
+* The `add_area(...)` function changed it's meaning from `add_lines(..., fill = 'tozeroy')` to a wrapper around the area trace <https://plotly.com/r/reference/#area>. This is more consistent with the naming conventions already in place for other `add_()` functions.
 * `add_ribbons()` now shows points (instead of fill) on hover.
 
 # 4.4.5 -- 19 September 2016

R/add.R

@@ -35,9 +35,9 @@ add_data <- function(p, data = NULL) {
 #' @seealso [plot_ly()]
 #' @references \url{https://plotly-r.com/overview.html}
 #' 
-#' \url{https://plot.ly/r}
+#' \url{https://plotly.com/r}
 #' 
-#' \url{https://plot.ly/r/reference/} 
+#' \url{https://plotly.com/r/reference/} 
 #' @author Carson Sievert
 #' @export
 #' @rdname add_trace

R/deprecated.R

@@ -48,7 +48,7 @@ get_figure <- function(username, id) {
 #' 
 #' @description This function is now deprecated. It used to provide a way to store plotly 
 #' account credentials, but that can now be done with environment variables. 
-#' For more details and examples, see \url{https://plot.ly/r/getting-started/}.
+#' For more details and examples, see \url{https://plotly.com/r/getting-started/}.
 #' 
 #' If you're here looking for an intro/overview of the package, see the 
 #' \href{https://github.com/ropensci/plotly/#getting-started}{readme}

R/group2NA.R

@@ -7,7 +7,7 @@
 #' (i.e., color, fill, etc), it is more efficient to draw them as a single trace 
 #' with missing values that separate the groups (instead of multiple traces), 
 #' In this case, one should also take care to make sure 
-#' \href{https://plot.ly/r/reference/#scatter-connectgaps}{connectgaps} 
+#' \href{https://plotly.com/r/reference/#scatter-connectgaps}{connectgaps} 
 #' is set to `FALSE`.
 #' 
 #' @param data a data frame.
@@ -72,7 +72,7 @@ group2NA <- function(data, groupNames = "group", nested = NULL, ordered = NULL,
   data.table::setorderv(dt, cols = c(nested, groupNames, ordered))
 
   # when connectgaps=FALSE, inserting NAs ensures each "group" 
-  # will be visually distinct https://plot.ly/r/reference/#scatter-connectgaps
+  # will be visually distinct https://plotly.com/r/reference/#scatter-connectgaps
   # also, retracing is useful for creating polygon(s) via scatter trace(s)
   keyVars <- c(nested, groupNames)
   keyNum <- length(keyVars) + 1

R/helpers.R

@@ -2,7 +2,7 @@
 #' 
 #' @param p a plotly object
 #' @param ... arguments are documented here 
-#' \url{https://plot.ly/r/reference/#scatter-marker-colorbar}.
+#' \url{https://plotly.com/r/reference/#scatter-marker-colorbar}.
 #' @param limits numeric vector of length 2. Set the extent of the colorbar scale.
 #' @param which colorbar to modify? Should only be relevant for subplots with 
 #' multiple colorbars.
@@ -13,7 +13,7 @@
 #' p <- plot_ly(mtcars, x = ~wt, y = ~mpg, color = ~cyl)
 #' 
 #' # pass any colorbar attribute -- 
-#' # https://plot.ly/r/reference/#scatter-marker-colorbar
+#' # https://plotly.com/r/reference/#scatter-marker-colorbar
 #' colorbar(p, len = 0.5)
 #' 
 #' # Expand the limits of the colorbar
@@ -188,7 +188,7 @@ plotly_empty <- function(...) {
 #' Encode a raster object as a data URI
 #' 
 #' Encode a raster object as a data URI, which is suitable for 
-#' use with `layout()` \href{https://plot.ly/r/reference/#layout-images}{images}.
+#' use with `layout()` \href{https://plotly.com/r/reference/#layout-images}{images}.
 #' This is especially convenient for embedding raster images on a plot in 
 #' a self-contained fashion (i.e., so they don't depend on external URL links).
 #' 

R/layout.R

@@ -2,7 +2,7 @@
 #' 
 #' @param p A plotly object.
 #' @param ... Arguments to the layout object. For documentation,
-#' see \url{https://plot.ly/r/reference/#Layout_and_layout_style_objects}
+#' see \url{https://plotly.com/r/reference/#Layout_and_layout_style_objects}
 #' @param data A data frame to associate with this layout (optional). If not 
 #' provided, arguments are evaluated using the data frame in [plot_ly()].
 #' @author Carson Sievert
@@ -49,7 +49,7 @@ layout.plotly <- function(p, ..., data = NULL) {
 #' @param start a start date/value.
 #' @param end an end date/value.
 #' @param ... these arguments are documented here 
-#' \url{https://plot.ly/r/reference/#layout-xaxis-rangeslider}
+#' \url{https://plotly.com/r/reference/#layout-xaxis-rangeslider}
 #' @export
 #' @author Carson Sievert
 #' @examples 
@@ -109,7 +109,7 @@ rangeslider <- function(p, start = NULL, end = NULL, ...) {
 #' config(plot_ly(), displaylogo = FALSE, collaborate = FALSE)
 #' 
 #' # enable mathjax
-#' # see more examples at https://plot.ly/r/LaTeX/
+#' # see more examples at https://plotly.com/r/LaTeX/
 #' plot_ly(x = c(1, 2, 3, 4), y = c(1, 4, 9, 16)) %>%
 #'   layout(title = TeX("\\text{Some mathjax: }\\alpha+\\beta x")) %>%
 #'   config(mathjax = "cdn")

R/plotly.R

@@ -27,45 +27,45 @@
 #' only have one name, this argument acts very much like `split` in that it 
 #' creates one trace for every unique value.
 #' @param color Values mapped to relevant 'fill-color' attribute(s) 
-#' (e.g. [fillcolor](https://plot.ly/r/reference#scatter-fillcolor), 
-#' [marker.color](https://plot.ly/r/reference#scatter-marker-color), 
-#' [textfont.color](https://plot.ly/r/reference/#scatter-textfont-color), etc.).
+#' (e.g. [fillcolor](https://plotly.com/r/reference#scatter-fillcolor), 
+#' [marker.color](https://plotly.com/r/reference#scatter-marker-color), 
+#' [textfont.color](https://plotly.com/r/reference/#scatter-textfont-color), etc.).
 #' The mapping from data values to color codes may be controlled using
 #' `colors` and `alpha`, or avoided altogether via [I()] (e.g., `color = I("red")`). 
 #' Any color understood by [grDevices::col2rgb()] may be used in this way. 
 #' @param colors Either a colorbrewer2.org palette name (e.g. "YlOrRd" or "Blues"), 
 #' or a vector of colors to interpolate in hexadecimal "#RRGGBB" format, 
 #' or a color interpolation function like `colorRamp()`.
 #' @param stroke Similar to `color`, but values are mapped to relevant 'stroke-color' attribute(s)
-#' (e.g., [marker.line.color](https://plot.ly/r/reference#scatter-marker-line-color)
-#'  and [line.color](https://plot.ly/r/reference#scatter-line-color)
+#' (e.g., [marker.line.color](https://plotly.com/r/reference#scatter-marker-line-color)
+#'  and [line.color](https://plotly.com/r/reference#scatter-line-color)
 #' for filled polygons). If not specified, `stroke` inherits from `color`.
 #' @param strokes Similar to `colors`, but controls the `stroke` mapping.
 #' @param alpha A number between 0 and 1 specifying the alpha channel applied to `color`.
-#' Defaults to 0.5 when mapping to [fillcolor](https://plot.ly/r/reference#scatter-fillcolor) and 1 otherwise.
+#' Defaults to 0.5 when mapping to [fillcolor](https://plotly.com/r/reference#scatter-fillcolor) and 1 otherwise.
 #' @param alpha_stroke Similar to `alpha`, but applied to `stroke`.
-#' @param symbol (Discrete) values mapped to [marker.symbol](https://plot.ly/r/reference#scatter-marker-symbol).
+#' @param symbol (Discrete) values mapped to [marker.symbol](https://plotly.com/r/reference#scatter-marker-symbol).
 #' The mapping from data values to symbols may be controlled using
 #' `symbols`, or avoided altogether via [I()] (e.g., `symbol = I("pentagon")`). 
-#' Any [pch] value or [symbol name](https://plot.ly/r/reference#scatter-marker-symbol) may be used in this way.
-#' @param symbols A character vector of [pch] values or [symbol names](https://plot.ly/r/reference#scatter-marker-symbol).
-#' @param linetype (Discrete) values mapped to [line.dash](https://plot.ly/r/reference#scatter-line-dash).
+#' Any [pch] value or [symbol name](https://plotly.com/r/reference#scatter-marker-symbol) may be used in this way.
+#' @param symbols A character vector of [pch] values or [symbol names](https://plotly.com/r/reference#scatter-marker-symbol).
+#' @param linetype (Discrete) values mapped to [line.dash](https://plotly.com/r/reference#scatter-line-dash).
 #' The mapping from data values to symbols may be controlled using
 #' `linetypes`, or avoided altogether via [I()] (e.g., `linetype = I("dash")`). 
-#' Any `lty` (see [par]) value or [dash name](https://plot.ly/r/reference#scatter-line-dash) may be used in this way.
-#' @param linetypes A character vector of `lty` values or [dash names](https://plot.ly/r/reference#scatter-line-dash)
+#' Any `lty` (see [par]) value or [dash name](https://plotly.com/r/reference#scatter-line-dash) may be used in this way.
+#' @param linetypes A character vector of `lty` values or [dash names](https://plotly.com/r/reference#scatter-line-dash)
 #' @param size (Numeric) values mapped to relevant 'fill-size' attribute(s) 
-#' (e.g., [marker.size](https://plot.ly/r/reference#scatter-marker-size), 
-#' [textfont.size](https://plot.ly/r/reference#scatter-textfont-size),
-#' and [error_x.width](https://plot.ly/r/reference#scatter-error_x-width)).
+#' (e.g., [marker.size](https://plotly.com/r/reference#scatter-marker-size), 
+#' [textfont.size](https://plotly.com/r/reference#scatter-textfont-size),
+#' and [error_x.width](https://plotly.com/r/reference#scatter-error_x-width)).
 #' The mapping from data values to symbols may be controlled using
 #' `sizes`, or avoided altogether via [I()] (e.g., `size = I(30)`). 
 #' @param sizes A numeric vector of length 2 used to scale `size` to pixels.
 #' @param span (Numeric) values mapped to relevant 'stroke-size' attribute(s) 
 #' (e.g., 
-#' [marker.line.width](https://plot.ly/r/reference#scatter-marker-line-width),
-#' [line.width](https://plot.ly/r/reference#scatter-line-width) for filled polygons,
-#' and [error_x.thickness](https://plot.ly/r/reference#scatter-error_x-thickness))
+#' [marker.line.width](https://plotly.com/r/reference#scatter-marker-line-width),
+#' [line.width](https://plotly.com/r/reference#scatter-line-width) for filled polygons,
+#' and [error_x.thickness](https://plotly.com/r/reference#scatter-error_x-thickness))
 #' The mapping from data values to symbols may be controlled using
 #' `spans`, or avoided altogether via [I()] (e.g., `span = I(30)`). 
 #' @param spans A numeric vector of length 2 used to scale `span` to pixels.
@@ -114,7 +114,7 @@
 #'  add_lines(y = ~uempmed) %>%
 #'  add_lines(y = ~psavert, color = I("red"))
 #' 
-#' # Attributes are documented in the figure reference -> https://plot.ly/r/reference
+#' # Attributes are documented in the figure reference -> https://plotly.com/r/reference
 #' # You might notice plot_ly() has named arguments that aren't in this figure
 #' # reference. These arguments make it easier to map abstract data values to
 #' # visual attributes.
@@ -218,7 +218,7 @@ plot_ly <- function(data = data.frame(), ..., type = NULL, name,
 #' 
 #' @param data A data frame (optional).
 #' @param ... arguments passed along to [plot_ly()]. They should be
-#' valid scattermapbox attributes - \url{https://plot.ly/r/reference/#scattermapbox}.
+#' valid scattermapbox attributes - \url{https://plotly.com/r/reference/#scattermapbox}.
 #' Note that x/y can also be used in place of lat/lon.
 #' @export
 #' @author Carson Sievert
@@ -243,7 +243,7 @@ plot_ly <- function(data = data.frame(), ..., type = NULL, name,
 plot_mapbox <- function(data = data.frame(), ...) {
   p <- config(plot_ly(data, ...), mapboxAccessToken = mapbox_token())
   # not only do we use this for is_mapbox(), but also setting the layout attr
-  # https://plot.ly/r/reference/#layout-mapbox
+  # https://plotly.com/r/reference/#layout-mapbox
   p$x$layout$mapType <- "mapbox"
   geo2cartesian(p)
 }
@@ -287,7 +287,7 @@ plot_geo <- function(data = data.frame(), ..., offline = FALSE) {
     )
   }
   # not only do we use this for is_geo(), but also setting the layout attr
-  # https://plot.ly/r/reference/#layout-geo
+  # https://plotly.com/r/reference/#layout-geo
   p$x$layout$mapType <- "geo"
   geo2cartesian(p)
 }

R/signup.R

@@ -13,7 +13,7 @@
 #'  \item api_key key to use with the api
 #'  \item tmp_pw temporary password to access your plotly account
 #' }
-#' @references https://plot.ly/rest/
+#' @references https://plotly.com/rest/
 #' @export
 #' @examples \dontrun{
 #' # You need a plotly username and API key to communicate with the plotly API.

R/subplots.R

@@ -86,7 +86,7 @@ subplot <- function(..., nrows = 1, widths = NULL, heights = NULL, margin = 0.02
   # Are any traces referencing "axislike" layout attributes that are missing?
   # If so, move those traces to a "new plot", and inherit layout attributes,
   # which makes this sort of thing possible:
-  # https://plot.ly/r/map-subplots-and-small-multiples/
+  # https://plotly.com/r/map-subplots-and-small-multiples/
   plots <- list()
   for (i in seq_along(plotz)) {
     p <- plots[[i]] <- plotz[[i]]

R/utils.R

@@ -585,7 +585,7 @@ verify_type <- function(trace) {
     message(
       "No ", trace$type, " mode specifed:\n",
       "  Setting the mode to markers\n",
-      "  Read more about this attribute -> https://plot.ly/r/reference/#scatter-mode"
+      "  Read more about this attribute -> https://plotly.com/r/reference/#scatter-mode"
     )
     trace$mode <- "markers"
   }
@@ -596,7 +596,7 @@ relay_type <- function(type) {
   message(
     "No trace type specified:\n", 
     "  Based on info supplied, a '", type, "' trace seems appropriate.\n",
-    "  Read more about this trace type -> https://plot.ly/r/reference/#", type
+    "  Read more about this trace type -> https://plotly.com/r/reference/#", type
   )
   type
 }