screengrid colour range - closes #11

SymbolixAU · Aug 8, 2018 · c514b51 · c514b51
1 parent 4ad7e38
commit c514b51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/R/map_layer_screengrid.R b/R/map_layer_screengrid.R
@@ -55,6 +55,7 @@ add_screengrid <- function(
 	lat = NULL,
 	polyline = NULL,
 	weight = NULL,
+	colour_range = viridisLite::viridis(6),
 	opacity = 0.8,
 	cell_size = 50,
 	layer_id,
@@ -121,7 +122,7 @@ add_screengrid <- function(
 	shape <- jsonlite::toJSON(shape, digits = digits)
 
 	map <- addDependency(map, mapdeckScreengridDependency())
-	invoke_method(map, "add_screengrid", shape, layer_id, opacity, cell_size )
+	invoke_method(map, "add_screengrid", shape, layer_id, opacity, cell_size, colour_range )
 }
 
 

diff --git a/inst/htmlwidgets/lib/screengrid/screengrid.js b/inst/htmlwidgets/lib/screengrid/screengrid.js
@@ -1,12 +1,12 @@
 
-function add_screengrid( map_id, screengrid_data, layer_id, opacity, cell_size ) {
+function add_screengrid( map_id, screengrid_data, layer_id, opacity, cell_size, colour_range ) {
 
   const screengridLayer = new deck.ScreenGridLayer({
     id: 'screengrid-'+layer_id,  // TODO
     data: screengrid_data,
     opacity: opacity,
     cellSizePixels: cell_size,
-    //colorRange: to_rgba( colour_range ),
+    colorRange: to_rgba( colour_range ),
     getPosition: d => decode_points( d.polyline ),
     getWeight: d => d.weight,
     onClick: info => layer_click( map_id, "screengrid", info )

diff --git a/man/add_screengrid.Rd b/man/add_screengrid.Rd