NULL method

dreamRs · Jun 5, 2018 · 1c49a7c · 1c49a7c
1 parent 4c274c9
commit 1c49a7c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/R/d3_map_proxy.R b/R/d3_map_proxy.R
@@ -28,16 +28,12 @@ d3_map_proxy <- function(shinyId, data = NULL, session = shiny::getDefaultReacti
     shinyId <- session$ns(shinyId)
   }
 
-  if (!is.null(data)) {
-    data <- extract_data(data)
-  }
-
   structure(
     list(
       session = session,
       id = shinyId,
       x = structure(
-        list(data = data)
+        list(data = extract_data(data))
       )
     ),
     class = "d3_map_proxy"
@@ -74,7 +70,9 @@ extract_data.sf <- function(x) {
   x[[colsf]] <- NULL
   return(x)
 }
-
+extract_data.NULL <- function(x) {
+  NULL
+}
 
 
 #' Update a continuous scale in Shiny