arguments, na_colour and deprecating function palette

DESCRIPTION

@@ -26,14 +26,11 @@ Imports:
     jsonify (>= 0.1.1),
     magrittr,
     Rcpp,
-    scales,
     shiny,
-    spatialwidget,
-    viridisLite
+    spatialwidget
 RoxygenNote: 6.1.0
 Suggests: 
     covr,
-    geojsonsf,
     knitr,
     rmarkdown,
     sf,

R/legend.R

@@ -2,7 +2,10 @@
 #'
 #' Clears the legend for a given layer_id
 #'
-#' @inheritParams add_arc
+#' @param map_id the id of the map you want to clear the legend from.
+#' @param layer_id single value specifying an id for the layer. Use this value to
+#' distinguish between shape layers of the same type. Layers with the same id are likely
+#' to conflict and not plot correctly
 #'
 #' @export
 clear_legend <- function( map_id, layer_id ) {

R/map_data.R

@@ -208,9 +208,11 @@ resolve_data.default <- function( data ) stop("This type of data is not supporte
 
 
 resolve_palette <- function( l, palette ) {
-	#if ( is.matrix( palette ) ) {
+	if ( is.function( palette ) ) {
+		warning("Function palettes have been deprecated, reverting to the viridis palette. See the palette arguemnt in the help file for valid arguments")
+	} else {
 		l[['palette']] <- palette
-	#}
+	}
 	return( l )
 }
 

R/map_layer_arc.R

@@ -79,7 +79,9 @@ mapdeckArcDependency <- function() {
 #'   , tooltip = "info"
 #'   , auto_highlight = TRUE
 #'   , legend = T
-#'   , legend_options = list(stroke_from = list( title = "Origin airport" ), css = "max-height: 100px;")
+#'   , legend_options = list(
+#'     stroke_from = list( title = "Origin airport" ),
+#'     css = "max-height: 100px;")
 #'  )
 #'
 #' ## Using a 2-sfc-column sf object
@@ -152,6 +154,7 @@ add_arc <- function(
 	l[["stroke_width"]] <- force(stroke_width)
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

R/map_layer_hexagon.R

@@ -30,7 +30,8 @@ mapdeckHexagonDependency <- function() {
 #' key <- 'abc'
 #'
 #' df <- read.csv(paste0(
-#' 'https://raw.githubusercontent.com/uber-common/deck.gl-data/master/examples/3d-heatmap/heatmap-data.csv'
+#' 'https://raw.githubusercontent.com/uber-common/deck.gl-data/master/examples/'
+#' , '3d-heatmap/heatmap-data.csv'
 #' ))
 #'
 #' df <- df[!is.na(df$lng), ]

R/map_layer_line.R

@@ -87,6 +87,7 @@ add_line <- function(
 	auto_highlight = FALSE,
 	highlight_colour = "#AAFFFFFF",
 	palette = "viridis",
+	na_colour = "#808080FF",
 	legend = FALSE,
 	legend_options = NULL
 ) {
@@ -106,6 +107,7 @@ add_line <- function(
 	l[["stroke_opacity"]] <- force( stroke_opacity )
 	l[["tooltip"]] <- force( tooltip )
 	l[["id"]] <- force( id )
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

R/map_layer_path.R

@@ -82,6 +82,7 @@ add_path <- function(
 	l[["stroke_opacity"]] <- force( stroke_opacity )
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	# l[["legend"]] <- force( legend )
 	# l[["legend_options"]] <- force( legend_options )

R/map_layer_pointcloud.R

@@ -96,6 +96,7 @@ add_pointcloud <- function(
 	l[["fill_opacity"]] <- force( fill_opacity )
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

R/map_layer_polygon.R

@@ -18,9 +18,6 @@ mapdeckPolygonDependency <- function() {
 #' @inheritParams add_arc
 #'
 #' @param polyline column of \code{data} containing the polylines
-#' @param geometry string specifying the `sfc` column of an SF object. If NULL and
-#' \code{data} is an `sf` object the \code{geometry} will be automatically assinged
-#' from \code{ sf::st_geometry( data ) }
 #' @param fill_colour column of \code{data} or hex colour for the fill colour
 #' @param fill_opacity value between 1 and 255. Either a string specifying the
 #' column of \code{data} containing the fill opacity of each shape, or a value
@@ -81,7 +78,6 @@ add_polygon <- function(
 	map,
 	data = get_map_data(map),
 	polyline = NULL,
-	#geometry = NULL,
 	stroke_colour = NULL,
 	stroke_width = NULL,
 	fill_colour = NULL,
@@ -116,6 +112,7 @@ add_polygon <- function(
 	l[["elevation"]] <- force( elevation )
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

R/map_layer_scatterplot.R

@@ -110,6 +110,7 @@ add_scatterplot <- function(
 	l[["fill_opacity"]] <- force(fill_opacity)
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

R/map_layer_text.R

@@ -68,6 +68,7 @@ add_text <- function(
 	auto_highlight = FALSE,
 	highlight_colour = "#AAFFFFFF",
 	palette = "viridis",
+	na_colour = "#808080FF",
 	legend = FALSE,
 	legend_options = NULL
 ) {
@@ -91,6 +92,7 @@ add_text <- function(
 	l[["alignment_baseline"]] <- force( alignment_baseline )
 	l[["tooltip"]] <- force(tooltip)
 	l[["id"]] <- force(id)
+	l[["na_colour"]] <- force(na_colour)
 
 	l <- resolve_palette( l, palette )
 	l <- resolve_legend( l, legend )

tests/testthat/test-map_layer_parameters.R

@@ -18,8 +18,8 @@ test_that("check numeric works", {
 
 test_that("check palette works", {
 	expect_error(mapdeck:::checkPalette('a'))
-	expect_silent(mapdeck:::checkPalette(viridisLite::plasma))
-	expect_error(mapdeck:::checkPalette(list(viridisLite::plasma)))
+	# expect_silent(mapdeck:::checkPalette(viridisLite::plasma))
+	# expect_error(mapdeck:::checkPalette(list(viridisLite::plasma)))
 })