clear if data is 0 rows - #252

R/map_layer_arc.R

@@ -235,6 +235,10 @@ add_arc <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_arc( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["origin"]] <- force(origin)
 	l[["destination"]] <- force(destination)

R/map_layer_column.R

@@ -111,6 +111,10 @@ add_column <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_column( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["polyline"]] <- force( polyline )
 	l[["lon"]] <- force( lon )

R/map_layer_geojson.R

@@ -290,6 +290,11 @@ add_geojson <- function(
 	l[["data_type"]] <- NULL
 
 	if( tp == "sf" ) {
+
+		if( nrow( data ) == 0 ) {
+			return( clear_geojson( map, layer_id ) )
+		}
+
 	  shape <- rcpp_geojson_geojson( data, l, "geometry", digits)
 	  jsfunc <- "add_geojson_sf"
 	} else if ( tp == "geojson" ) {

R/map_layer_greatcircle.R

@@ -120,6 +120,10 @@ add_greatcircle <- function(
 ) {
 	brush_radius = NULL
 
+	if( nrow( data ) == 0 ) {
+		return( clear_greatcircle( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["origin"]] <- force(origin)
 	l[["destination"]] <- force(destination)

R/map_layer_grid.R

@@ -126,6 +126,10 @@ add_grid <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_grid( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["lon"]] <- force( lon )
 	l[["lat"]] <- force( lat )

R/map_layer_heatmap.R

@@ -115,7 +115,9 @@ add_heatmap <- function(
 	transitions = NULL
 ) {
 
-	#experimental_layer("heatmap")
+	if( nrow( data ) == 0 ) {
+		return( clear_heatmap( map, layer_id ) )
+	}
 
 	l <- list()
 	l[["polyline"]] <- force( polyline )

R/map_layer_hexagon.R

@@ -158,6 +158,10 @@ add_hexagon <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_hexagon( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["polyline"]] <- force( polyline )
 	l[["lon"]] <- force( lon )

R/map_layer_line.R

@@ -120,6 +120,10 @@ add_line <- function(
 	transitions = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_line( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["origin"]] <- force( origin )
 	l[["destination"]] <- force( destination)

R/map_layer_mesh.R

@@ -188,6 +188,10 @@ add_mesh2 <- function(
 	#if( is.null( stroke_colour )) stroke_colour <- fill_colour
 	experimental_layer( "mesh" )
 
+	if( nrow( data ) == 0 ) {
+		return( clear_mesh( map, layer_id ) )
+	}
+
 	if(!inherits(data, "mesh3d")) {
 		stop("mapdeck - expecting mesh3d object")
 	}

R/map_layer_path.R

@@ -96,6 +96,10 @@ add_path <- function(
 	transitions = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_path( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["polyline"]] <- force( polyline )
 	l[["stroke_colour"]] <- force( stroke_colour)

R/map_layer_pointcloud.R

@@ -108,6 +108,10 @@ add_pointcloud <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_pointcloud( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["lon"]] <- force( lon )
 	l[["lat"]] <- force( lat )

R/map_layer_polygon.R

@@ -137,7 +137,9 @@ add_polygon <- function(
 	transitions = NULL
 ) {
 
-	#if( is.null( stroke_colour )) stroke_colour <- fill_colour
+	if( nrow( data ) == 0 ) {
+		return( clear_polygon( map, layer_id ) )
+	}
 
 	l <- list()
 	l[["polyline"]] <- force( polyline )

R/map_layer_scatterplot.R

@@ -145,6 +145,10 @@ add_scatterplot <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_scatterplot( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["lon"]] <- force(lon)
 	l[["lat"]] <- force(lat)

R/map_layer_screengrid.R

@@ -90,6 +90,11 @@ add_screengrid <- function(
 	focus_layer = FALSE,
 	digits = 6
 ) {
+
+	if( nrow( data ) == 0 ) {
+		return( clear_screengrid( map, layer_id ) )
+	}
+
 	brush_radius = NULL
 	l <- list()
 	l[["polyline"]] <- force( polyline )

R/map_layer_text.R

@@ -111,6 +111,10 @@ add_text <- function(
 	brush_radius = NULL
 ) {
 
+	if( nrow( data ) == 0 ) {
+		return( clear_text( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["lon"]] <- force( lon )
 	l[["lat"]] <- force( lat )

R/map_layer_trips.R

@@ -73,6 +73,10 @@ add_trips <- function(
 
 	experimental_layer("trips")
 
+	if( nrow( data ) == 0 ) {
+		return( clear_trips( map, layer_id ) )
+	}
+
 	l <- list()
 	l[["stroke_colour"]] <- force( stroke_colour )
 	l[["stroke_width"]] <- force( stroke_width )