conflict

SymbolixAU · Sep 15, 2019 · 2f281b8 · 2f281b8
2 parents 9e6889b + 2864a15
commit 2f281b8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/R/map_layer_scatterplot.R b/R/map_layer_scatterplot.R
@@ -198,13 +198,13 @@ add_scatterplot <- function(
 	tp <- l[["data_type"]]
 	l[["data_type"]] <- NULL
 
-	if(!is.null(brush_radius)) {
-		jsfunc <- "add_scatterplot_brush_geo"
-		map <- addDependency(map, mapdeckScatterplotBrushDependency())
-	} else {
+	# if(!is.null(brush_radius)) {
+	# 	jsfunc <- "add_scatterplot_brush_geo"
+	# 	map <- addDependency(map, mapdeckScatterplotBrushDependency())
+	# } else {
 		jsfunc <- "add_scatterplot_geo"
 		map <- addDependency(map, mapdeckScatterplotDependency())
-	}
+	# }
 
 	if ( tp == "sf" ) {
 		geometry_column <- c( "geometry" )

diff --git a/inst/htmlwidgets/lib/deckgl.min.js b/inst/htmlwidgets/lib/deckgl.min.js
diff --git a/inst/htmlwidgets/lib/scatterplot/scatterplot.js b/inst/htmlwidgets/lib/scatterplot/scatterplot.js
@@ -15,7 +15,6 @@ function add_scatterplot_geo( map_id, map_type, scatter_data, layer_id, auto_hig
   const b = new deck.BrushingExtension();
   console.log( b );
 
-
 //  if ( brush_radius > 0 ) {
 //  	// add brushing extension
 //  	extensions.append( new BrushingExtension() );
@@ -47,10 +46,17 @@ function add_scatterplot_geo( map_id, map_type, scatter_data, layer_id, auto_hig
     onClick: info => md_layer_click( map_id, "scatterplot", info ),
     onHover: md_update_tooltip,
     transitions: js_transition || {},
+<<<<<<< HEAD
     brushingEnabled: true,
     brushingRadius: brush_radius,
     mousePosition: [0, 0],
     extensions: [  ]
+=======
+    //brushingEnabled: true,
+    //brushingRadius: brush_radius,
+    //mousePosition: [0, 0],
+    extensions: extensions
+>>>>>>> 2864a15abb152b17b6a74b884d281b8b84f3b344
   });
 
 	if( map_type == "google_map") {