diff --git a/man/add_arc.Rd b/man/add_arc.Rd index 68bf907c..41a48185 100644 --- a/man/add_arc.Rd +++ b/man/add_arc.Rd @@ -4,17 +4,6 @@ \alias{add_arc} \title{Add arc} \usage{ -<<<<<<< HEAD -add_arc(map, data = get_map_data(map), layer_id = NULL, origin, - destination, id = NULL, stroke_from = NULL, - stroke_from_opacity = NULL, stroke_to = NULL, - stroke_to_opacity = NULL, stroke_width = NULL, tilt = NULL, - height = NULL, tooltip = NULL, auto_highlight = FALSE, - highlight_colour = "#AAFFFFFF", legend = F, legend_options = NULL, - legend_format = NULL, palette = "viridis", na_colour = "#808080FF", - update_view = TRUE, focus_layer = FALSE, transitions = NULL, - digits = 6, brush_radius = NULL, ...) -======= add_arc( map, data = get_map_data(map), @@ -41,9 +30,9 @@ add_arc( focus_layer = FALSE, transitions = NULL, digits = 6, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} diff --git a/man/add_column.Rd b/man/add_column.Rd index fdc2cead..4f09bd1d 100644 --- a/man/add_column.Rd +++ b/man/add_column.Rd @@ -4,18 +4,6 @@ \alias{add_column} \title{Add column} \usage{ -<<<<<<< HEAD -add_column(map, data = get_map_data(map), polyline = NULL, - lon = NULL, lat = NULL, fill_colour = NULL, fill_opacity = NULL, - stroke_colour = NULL, stroke_opacity = NULL, stroke_width = NULL, - radius = 1000, elevation = NULL, elevation_scale = 1, - coverage = 1, angle = 0, disk_resolution = 20, tooltip = NULL, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - layer_id = NULL, id = NULL, palette = "viridis", - na_colour = "#808080FF", legend = FALSE, legend_options = NULL, - legend_format = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, transitions = NULL, brush_radius = NULL, ...) -======= add_column( map, data = get_map_data(map), @@ -47,9 +35,9 @@ add_column( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -133,13 +121,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The ColumnLayer can be used to render a heatmap of vertical cylinders. It renders diff --git a/man/add_geojson.Rd b/man/add_geojson.Rd index 2183c2df..31e9890d 100644 --- a/man/add_geojson.Rd +++ b/man/add_geojson.Rd @@ -4,21 +4,6 @@ \alias{add_geojson} \title{Add Geojson} \usage{ -<<<<<<< HEAD -add_geojson(map, data = get_map_data(map), layer_id = NULL, - stroke_colour = NULL, stroke_opacity = NULL, stroke_width = NULL, - dash_size = NULL, dash_gap = NULL, fill_colour = NULL, - fill_opacity = NULL, radius = NULL, elevation = NULL, - extruded = FALSE, light_settings = list(), legend = F, - legend_options = NULL, legend_format = NULL, - auto_highlight = FALSE, tooltip = NULL, - highlight_colour = "#AAFFFFFF", palette = "viridis", - na_colour = "#808080FF", line_width_units = c("metres", "pixels"), - line_width_scale = 1, line_width_min_pixels = 0, - elevation_scale = 1, point_radius_scale = 1, - point_radius_min_pixels = 1, update_view = TRUE, - focus_layer = FALSE, digits = 6, transitions = NULL, ...) -======= add_geojson( map, data = get_map_data(map), @@ -51,9 +36,9 @@ add_geojson( update_view = TRUE, focus_layer = FALSE, digits = 6, - transitions = NULL + transitions = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} diff --git a/man/add_greatcircle.Rd b/man/add_greatcircle.Rd index f80bccb6..1e763c4c 100644 --- a/man/add_greatcircle.Rd +++ b/man/add_greatcircle.Rd @@ -4,17 +4,6 @@ \alias{add_greatcircle} \title{Add greatcircle} \usage{ -<<<<<<< HEAD -add_greatcircle(map, data = get_map_data(map), layer_id = NULL, origin, - destination, id = NULL, stroke_from = NULL, - stroke_from_opacity = NULL, stroke_to = NULL, - stroke_to_opacity = NULL, stroke_width = NULL, - wrap_longitude = FALSE, tooltip = NULL, auto_highlight = FALSE, - highlight_colour = "#AAFFFFFF", legend = F, legend_options = NULL, - legend_format = NULL, palette = "viridis", na_colour = "#808080FF", - update_view = TRUE, focus_layer = FALSE, transitions = NULL, - digits = 6, ...) -======= add_greatcircle( map, data = get_map_data(map), @@ -39,9 +28,10 @@ add_greatcircle( update_view = TRUE, focus_layer = FALSE, transitions = NULL, - digits = 6 + digits = 6, + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -109,11 +99,13 @@ palette for different colour options (where available), \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{digits}{number of digits for rounding coordinates} ->>>>>>> origin + +\item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, +the arcs will only show if the origin or destination are within the radius of the mouse. +If NULL, all arcs are displayed} + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ Renders flat arcs along the great circle joining pairs diff --git a/man/add_grid.Rd b/man/add_grid.Rd index 055371a4..06be33be 100644 --- a/man/add_grid.Rd +++ b/man/add_grid.Rd @@ -4,17 +4,6 @@ \alias{add_grid} \title{Add Grid} \usage{ -<<<<<<< HEAD -add_grid(map, data = get_map_data(map), lon = NULL, lat = NULL, - polyline = NULL, cell_size = 1000, extruded = TRUE, - elevation = NULL, elevation_function = c("sum", "mean", "min", - "max"), colour = NULL, colour_function = c("sum", "mean", "min", - "max"), elevation_scale = 1, colour_range = NULL, legend = FALSE, - legend_options = NULL, auto_highlight = FALSE, - highlight_colour = "#AAFFFFFF", layer_id = NULL, - update_view = TRUE, focus_layer = FALSE, digits = 6, - transitions = NULL, brush_radius = NULL, ...) -======= add_grid( map, data = get_map_data(map), @@ -38,9 +27,9 @@ add_grid( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} diff --git a/man/add_heatmap.Rd b/man/add_heatmap.Rd index 179d5c30..f5d21948 100644 --- a/man/add_heatmap.Rd +++ b/man/add_heatmap.Rd @@ -4,13 +4,6 @@ \alias{add_heatmap} \title{Add Heatmap} \usage{ -<<<<<<< HEAD -add_heatmap(map, data = get_map_data(map), lon = NULL, lat = NULL, - polyline = NULL, weight = NULL, colour_range = NULL, - radius_pixels = 30, intensity = 1, threshold = 0.05, - layer_id = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, transitions = NULL, ...) -======= add_heatmap( map, data = get_map_data(map), @@ -26,9 +19,9 @@ add_heatmap( update_view = TRUE, focus_layer = FALSE, digits = 6, - transitions = NULL + transitions = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} diff --git a/man/add_hexagon.Rd b/man/add_hexagon.Rd index 9251872a..19c98907 100644 --- a/man/add_hexagon.Rd +++ b/man/add_hexagon.Rd @@ -4,16 +4,6 @@ \alias{add_hexagon} \title{Add hexagon} \usage{ -<<<<<<< HEAD -add_hexagon(map, data = get_map_data(map), polyline = NULL, - lon = NULL, lat = NULL, layer_id = NULL, radius = 1000, - elevation = NULL, elevation_function = c("sum", "mean", "min", - "max"), colour = NULL, colour_function = c("sum", "mean", "min", - "max"), legend = FALSE, legend_options = NULL, elevation_scale = 1, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - colour_range = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, transitions = NULL, brush_radius = NULL, ...) -======= add_hexagon( map, data = get_map_data(map), @@ -36,9 +26,9 @@ add_hexagon( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} diff --git a/man/add_line.Rd b/man/add_line.Rd index 3564caa7..a256e2b9 100644 --- a/man/add_line.Rd +++ b/man/add_line.Rd @@ -4,15 +4,6 @@ \alias{add_line} \title{Add line} \usage{ -<<<<<<< HEAD -add_line(map, data = get_map_data(map), layer_id = NULL, origin, - destination, id = NULL, stroke_colour = NULL, stroke_width = NULL, - stroke_opacity = NULL, tooltip = NULL, auto_highlight = FALSE, - highlight_colour = "#AAFFFFFF", palette = "viridis", - na_colour = "#808080FF", legend = FALSE, legend_options = NULL, - legend_format = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, transitions = NULL, ...) -======= add_line( map, data = get_map_data(map), @@ -35,9 +26,9 @@ add_line( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -95,13 +86,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Line Layer renders raised lines joining pairs of source and target coordinates diff --git a/man/add_path.Rd b/man/add_path.Rd index 39a25fb8..179332f2 100644 --- a/man/add_path.Rd +++ b/man/add_path.Rd @@ -4,16 +4,6 @@ \alias{add_path} \title{Add Path} \usage{ -<<<<<<< HEAD -add_path(map, data = get_map_data(map), polyline = NULL, - stroke_colour = NULL, stroke_width = NULL, stroke_opacity = NULL, - dash_size = NULL, dash_gap = NULL, tooltip = NULL, - billboard = FALSE, layer_id = NULL, id = NULL, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - palette = "viridis", na_colour = "#808080FF", legend = FALSE, - legend_options = NULL, legend_format = NULL, update_view = TRUE, - focus_layer = FALSE, digits = 6, transitions = NULL, ...) -======= add_path( map, data = get_map_data(map), @@ -43,9 +33,9 @@ add_path( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -124,13 +114,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Path Layer takes in lists of coordinate points and renders them as diff --git a/man/add_pointcloud.Rd b/man/add_pointcloud.Rd index edcd7b6d..1560330a 100644 --- a/man/add_pointcloud.Rd +++ b/man/add_pointcloud.Rd @@ -4,17 +4,6 @@ \alias{add_pointcloud} \title{Add Pointcloud} \usage{ -<<<<<<< HEAD -add_pointcloud(map, data = get_map_data(map), lon = NULL, lat = NULL, - elevation = NULL, polyline = NULL, radius = 10, - fill_colour = NULL, fill_opacity = NULL, tooltip = NULL, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - light_settings = list(), layer_id = NULL, id = NULL, - palette = "viridis", na_colour = "#808080FF", legend = FALSE, - legend_options = NULL, legend_format = NULL, update_view = TRUE, - focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL, ...) -======= add_pointcloud( map, data = get_map_data(map), @@ -40,9 +29,9 @@ add_pointcloud( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -105,13 +94,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Pointcloud Layer takes in coordinate points and renders them as circles diff --git a/man/add_polygon.Rd b/man/add_polygon.Rd index 0be737f3..bf53073f 100644 --- a/man/add_polygon.Rd +++ b/man/add_polygon.Rd @@ -4,17 +4,6 @@ \alias{add_polygon} \title{Add Polygon} \usage{ -<<<<<<< HEAD -add_polygon(map, data = get_map_data(map), polyline = NULL, - stroke_colour = NULL, stroke_width = NULL, stroke_opacity = NULL, - fill_colour = NULL, fill_opacity = NULL, elevation = NULL, - tooltip = NULL, auto_highlight = FALSE, elevation_scale = 1, - highlight_colour = "#AAFFFFFF", light_settings = list(), - layer_id = NULL, id = NULL, palette = "viridis", - na_colour = "#808080FF", legend = FALSE, legend_options = NULL, - legend_format = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, transitions = NULL, ...) -======= add_polygon( map, data = get_map_data(map), @@ -41,9 +30,9 @@ add_polygon( focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL + brush_radius = NULL, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -114,13 +103,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Polygon Layer renders filled and/or stroked polygons. diff --git a/man/add_scatterplot.Rd b/man/add_scatterplot.Rd index 8e9cc6bf..8b057703 100644 --- a/man/add_scatterplot.Rd +++ b/man/add_scatterplot.Rd @@ -4,18 +4,6 @@ \alias{add_scatterplot} \title{Add Scatterplot} \usage{ -<<<<<<< HEAD -add_scatterplot(map, data = get_map_data(map), lon = NULL, - lat = NULL, polyline = NULL, radius = NULL, - radius_min_pixels = 1, radius_max_pixels = NULL, - fill_colour = NULL, fill_opacity = NULL, stroke_colour = NULL, - stroke_width = NULL, stroke_opacity = NULL, tooltip = NULL, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - layer_id = NULL, id = NULL, palette = "viridis", - na_colour = "#808080FF", legend = FALSE, legend_options = NULL, - legend_format = NULL, digits = 6, update_view = TRUE, - focus_layer = FALSE, transitions = NULL, brush_radius = NULL, ...) -======= add_scatterplot( map, data = get_map_data(map), @@ -45,9 +33,9 @@ add_scatterplot( focus_layer = FALSE, transitions = NULL, brush_radius = NULL, - collision_filter = FALSE + collision_filter = FALSE, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -124,13 +112,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Scatterplot Layer takes in coordinate points and renders them as circles diff --git a/man/add_screengrid.Rd b/man/add_screengrid.Rd index f6b4b801..2e3bf244 100644 --- a/man/add_screengrid.Rd +++ b/man/add_screengrid.Rd @@ -4,13 +4,6 @@ \alias{add_screengrid} \title{Add Screengrid} \usage{ -<<<<<<< HEAD -add_screengrid(map, data = get_map_data(map), lon = NULL, lat = NULL, - polyline = NULL, weight = NULL, aggregation = c("sum", "mean", - "min", "max"), colour_range = NULL, opacity = 0.8, cell_size = 50, - layer_id = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6, ...) -======= add_screengrid( map, data = get_map_data(map), @@ -25,9 +18,9 @@ add_screengrid( layer_id = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6 + digits = 6, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -60,11 +53,9 @@ to conflict and not plot correctly} \item{focus_layer}{logical indicating if the map should update the bounds to only include this layer} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{digits}{number of digits for rounding coordinates} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Screen Grid Layer takes in an array of latitude and longitude coordinated points, diff --git a/man/add_text.Rd b/man/add_text.Rd index 7cf17021..89afb699 100644 --- a/man/add_text.Rd +++ b/man/add_text.Rd @@ -4,19 +4,6 @@ \alias{add_text} \title{Add Text} \usage{ -<<<<<<< HEAD -add_text(map, data = get_map_data(map), text, lon = NULL, lat = NULL, - polyline = NULL, fill_colour = NULL, fill_opacity = NULL, - size = NULL, angle = NULL, anchor = NULL, - alignment_baseline = NULL, billboard = TRUE, - font_family = "Monaco, monospace", font_weight = "normal", - tooltip = NULL, layer_id = NULL, id = NULL, - auto_highlight = FALSE, highlight_colour = "#AAFFFFFF", - palette = "viridis", na_colour = "#808080FF", legend = FALSE, - legend_options = NULL, legend_format = NULL, update_view = TRUE, - focus_layer = FALSE, digits = 6, transitions = NULL, - brush_radius = NULL, ...) -======= add_text( map, data = get_map_data(map), @@ -48,9 +35,9 @@ add_text( digits = 6, transitions = NULL, brush_radius = NULL, - collision_filter = FALSE + collision_filter = FALSE, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -129,13 +116,11 @@ a named list indicating which colour attributes should be included in the legend \item{transitions}{list specifying the duration of transitions.} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{brush_radius}{radius of the brush in metres. Default NULL. If supplied, the arcs will only show if the origin or destination are within the radius of the mouse. If NULL, all arcs are displayed} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Text Layer renders text labels on the map diff --git a/man/add_trips.Rd b/man/add_trips.Rd index d6188d8f..557b2030 100644 --- a/man/add_trips.Rd +++ b/man/add_trips.Rd @@ -4,14 +4,6 @@ \alias{add_trips} \title{Add Trips} \usage{ -<<<<<<< HEAD -add_trips(map, data = get_map_data(map), stroke_colour = NULL, - stroke_width = NULL, opacity = 0.3, palette = "viridis", - trail_length = 180, start_time = get_m_range_start(data), - end_time = get_m_range_end(data), animation_speed = 30, - layer_id = NULL, legend = FALSE, legend_options = NULL, - legend_format = NULL, digits = 6, ...) -======= add_trips( map, data = get_map_data(map), @@ -33,9 +25,9 @@ add_trips( legend_format = NULL, update_view = TRUE, focus_layer = FALSE, - digits = 6 + digits = 6, + ... ) ->>>>>>> origin } \arguments{ \item{map}{a mapdeck map object} @@ -86,15 +78,13 @@ a named list indicating which colour attributes should be included in the legend \item{legend_format}{A list containing functions to apply to legend values. See section legend} -<<<<<<< HEAD -\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} -======= \item{update_view}{logical indicating if the map should update the bounds to include this layer} \item{focus_layer}{logical indicating if the map should update the bounds to only include this layer} \item{digits}{number of digits for rounding coordinates} ->>>>>>> origin + +\item{...}{\code{clear_legend} and \code{clear_view} arguments passed to 'clear_()' functions} } \description{ The Trips Layer takes an sf object with Z (elevation) and M (time) attributes and renders diff --git a/man/clear.Rd b/man/clear.Rd index a13d55e7..34063f6a 100644 --- a/man/clear.Rd +++ b/man/clear.Rd @@ -31,117 +31,68 @@ \alias{clear_trips} \title{Clear Animated Arc} \usage{ -<<<<<<< HEAD -clear_arc(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) -======= clear_animated_arc(map, layer_id = NULL, update_view = TRUE) ->>>>>>> origin -clear_line(map, layer_id = NULL, update_view = TRUE) +clear_line(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -<<<<<<< HEAD -clear_column(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_geojson(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_greatcircle(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_grid(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_heatmap(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_hexagon(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_line(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_mesh(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_path(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_pointcloud(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_polygon(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_scatterplot(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_screengrid(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_text(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) - -clear_title(map, layer_id = NULL) - -clear_trips(map, layer_id = NULL, clear_legend = TRUE, - clear_view = TRUE) -======= -clear_arc(map, layer_id = NULL, update_view = TRUE) +clear_arc(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) clear_bitmap(map, layer_id = NULL, update_view = TRUE) -clear_column(map, layer_id = NULL, update_view = TRUE) +clear_column(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_geojson(map, layer_id = NULL, update_view = TRUE) +clear_geojson(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_greatcircle(map, layer_id = NULL, update_view = TRUE) +clear_greatcircle( + map, + layer_id = NULL, + update_view = TRUE, + clear_legend = TRUE +) -clear_grid(map, layer_id = NULL, update_view = TRUE) +clear_grid(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) clear_h3_hexagon(map, layer_id = NULL) -clear_heatmap(map, layer_id = NULL, update_view = TRUE) +clear_heatmap(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_hexagon(map, layer_id = NULL, update_view = TRUE) +clear_hexagon(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_line(map, layer_id = NULL, update_view = TRUE) +clear_line(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_mesh(map, layer_id = NULL, update_view = TRUE) +clear_mesh(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_path(map, layer_id = NULL, update_view = TRUE) +clear_path(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_pointcloud(map, layer_id = NULL, update_view = TRUE) +clear_pointcloud(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_polygon(map, layer_id = NULL, update_view = TRUE) +clear_polygon(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) -clear_scatterplot(map, layer_id = NULL, update_view = TRUE) +clear_scatterplot( + map, + layer_id = NULL, + update_view = TRUE, + clear_legend = TRUE +) -clear_screengrid(map, layer_id = NULL, update_view = TRUE) +clear_screengrid(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) clear_terrain(map, layer_id = NULL, update_view = TRUE) -clear_text(map, layer_id = NULL, update_view = TRUE) +clear_text(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) clear_title(map, layer_id = NULL) -clear_trips(map, layer_id = NULL, update_view = TRUE) ->>>>>>> origin +clear_trips(map, layer_id = NULL, update_view = TRUE, clear_legend = TRUE) } \arguments{ \item{map}{a mapdeck map object} \item{layer_id}{the layer_id of the layer you want to clear} -<<<<<<< HEAD -\item{clear_legend}{logical indicating if the legend should be removed} - -\item{clear_view}{logical indicating if the view should update (TRUE) or not (FALSE) -when the data is cleared} -======= \item{update_view}{logical indicating if the map should update the bounds after removing the layer} ->>>>>>> origin + +\item{clear_legend}{logical indicating if the legend should be removed} } \description{ Clears elements from a map