updating to v8.0.0 for #239

DESCRIPTION

@@ -26,7 +26,7 @@ Imports:
     magrittr,
     Rcpp,
     shiny
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 Suggests: 
     covr,
     jsonlite,
@@ -49,5 +49,3 @@ Remotes:
     github::SymbolixAU/jsonify,
     github::SymbolixAU/spatialwidget,
     github::dcooley/sfheaders
-
-

NEWS.md

@@ -1,5 +1,8 @@
 # mapdeck 0.3
 
+
+* v8.* of Deck.gl
+	- Arc layer supports 3D positions
 * `show_view_state` option to overlay the current View State [issue238](https://github.com/SymbolixAU/mapdeck/issues/238)
 * performance improvements for dates and factors [issue235](https://github.com/SymbolixAU/mapdeck/issues/235)
 * `add_bitmap()` to add a bitmap / image to the map

R/map_data.R

@@ -59,17 +59,41 @@ resolve_od_data.data.frame <- function( data, l, origin, destination ) {
 		stop("mapdeck - origin and destination columns required")
 	}
 
-	if( length(origin) != 2 | length(destination) != 2 ) {
-		stop("mapdeck - origin and destination columns should both contain lon & lat values")
+	if( length( origin ) == 2 ) {
+		l[["start_lon"]] <- origin[1]
+		l[["start_lat"]] <- origin[2]
+		l[["start_elev"]] <- 0
+	} else if ( length( origin ) == 3 ) {
+		l[["start_lon"]] <- origin[1]
+		l[["start_lat"]] <- origin[2]
+		l[["start_elev"]] <- origin[3]
+	} else {
+		stop("mapdeck - origin and destination columns should contain lon & lat, and optionally elevation columns")
+	}
+
+	if( length( destination ) == 2 ) {
+		l[["end_lon"]] <- destination[1]
+		l[["end_lat"]] <- destination[2]
+		l[["end_elev"]] <- 0
+	} else if ( length( destination ) == 3 ) {
+		l[["end_lon"]] <- destination[1]
+		l[["end_lat"]] <- destination[2]
+		l[["end_elev"]] <- destination[3]
+	} else {
+		stop("mapdeck - origin and destination columns should contain lon & lat, and optionally elevation columns")
 	}
 
+	# if( length(origin) != 2 | length(destination) != 2 ) {
+	# 	stop("mapdeck - origin and destination columns should both contain lon & lat values")
+	# }
+
 	l[["data_type"]] <- "df"
 	l[["bbox"]] <- get_od_box( data, l )
 
-	l[["start_lon"]] <- origin[1]
-	l[["start_lat"]] <- origin[2]
-	l[["end_lon"]] <- destination[1]
-	l[["end_lat"]] <- destination[2]
+	# l[["start_lon"]] <- origin[1]
+	# l[["start_lat"]] <- origin[2]
+	# l[["end_lon"]] <- destination[1]
+	# l[["end_lat"]] <- destination[2]
 
 	l[["origin"]] <- NULL
 	l[["destination"]] <- NULL

R/map_layer_arc.R

@@ -286,7 +286,7 @@ add_arc <- function(
 		geometry_column <- c( "origin", "destination" )
 		shape <- rcpp_od_geojson( data, l, geometry_column, digits, "arc" )
   } else if ( tp == "df" ) {
-  	geometry_column <- list( origin = c("start_lon", "start_lat"), destination = c("end_lon", "end_lat") )
+  	geometry_column <- list( origin = c("start_lon", "start_lat", "start_elev"), destination = c("end_lon", "end_lat", "end_elev") )
   	shape <- rcpp_od_geojson_df( data, l, geometry_column, digits, "arc" )
   } else if ( tp == "sfencoded" ) {
   	geometry_column <- c("origin", "destination")

R/mapdeck_dependencies.R

@@ -158,7 +158,7 @@ deckgl_min_js <- function() {
 	list(
 		createHtmlDependency(
 			name = "deckgl",
-			version = "7.4.0",
+			version = "8.0.9",
 			src = system.file("htmlwidgets/lib/", package = "mapdeck"),
 			script = c("deckgl.min.js"),
 			all_files = FALSE

inst/htmlwidgets/lib/arc/arc.js

@@ -6,7 +6,7 @@ function add_arc_geo( map_id, map_type, arc_data, layer_id, auto_highlight, high
   	extensions.push( new BrushingExtension() );
   }
 
-  const arcLayer = new ArcLayer({
+  const arcLayer = new deck.ArcLayer({
   	map_id: map_id,
     id: 'arc-'+layer_id,
     data: arc_data,
@@ -48,7 +48,7 @@ function add_arc_polyline( map_id, map_type, arc_data, layer_id, auto_highlight,
   	extensions.push( new BrushingExtension() );
   }
 
-  const arcLayer = new ArcLayer({
+  const arcLayer = new deck.ArcLayer({
     map_id: map_id,
     id: 'arc-'+layer_id,
     data: arc_data,

inst/htmlwidgets/lib/bitmap/bitmap.js

@@ -2,7 +2,7 @@
 
 function add_bitmap(map_id, layer_id, image, bounds, desaturate, transparent_colour, tint_colour, bbox, focus_layer, update_view) {
 
-  const bitmapLayer = new BitmapLayer({
+  const bitmapLayer = new deck.BitmapLayer({
   	map_id: map_id,
   	id: "bitmap-"+layer_id,
   	image: image,

inst/htmlwidgets/lib/greatcircle/greatcircle.js

@@ -8,7 +8,7 @@ function add_greatcircle_geo( map_id, map_type, greatcircle_data, layer_id, auto
   	extensions.push( new BrushingExtension() );
   }
 
-  const greatcircleLayer = new GreatCircleLayer({
+  const greatcircleLayer = new deck.GreatCircleLayer({
   	map_id: map_id,
     id: 'greatcircle-'+layer_id,
     data: greatcircle_data,
@@ -53,7 +53,7 @@ function add_greatcircle_polyline( map_id, map_type, greatcircle_data, layer_id,
   	extensions.push( new BrushingExtension() );
   }
 
-  const greatcircleLayer = new GreatCircleLayer({
+  const greatcircleLayer = new deck.GreatCircleLayer({
     map_id: map_id,
     id: 'greatcircle-'+layer_id,
     data: greatcircle_data,

inst/htmlwidgets/lib/line/line.js

@@ -1,7 +1,7 @@
 
 function add_line_geo( map_id, map_type, line_data, layer_id, auto_highlight, highlight_colour, legend, bbox, update_view, focus_layer, js_transition ) {
 
-  const lineLayer = new LineLayer({
+  const lineLayer = new deck.LineLayer({
   	map_id: map_id,
     id: 'line-'+layer_id,
     data: line_data,
@@ -35,7 +35,7 @@ function add_line_geo( map_id, map_type, line_data, layer_id, auto_highlight, hi
 
 function add_line_polyline( map_id, map_type, line_data, layer_id, auto_highlight, highlight_colour, legend, bbox, update_view, focus_layer, js_transition ) {
 
-  const lineLayer = new LineLayer({
+  const lineLayer = new deck.LineLayer({
     map_id: map_id,
     id: 'line-'+layer_id,
     data: line_data,

inst/htmlwidgets/lib/mesh/mesh.js

@@ -35,7 +35,7 @@ function add_mesh( map_id, map_type, polygon_data, layer_id, light_settings, aut
   */
 
 
-  const meshLayer = new PolygonLayer({
+  const meshLayer = new deck.PolygonLayer({
   	map_id: map_id,
     id: 'polygon-'+layer_id,
     data: polygon_data,

inst/htmlwidgets/lib/path/path.js

@@ -3,7 +3,12 @@
 function add_path_geo( map_id, map_type, path_data, layer_id, auto_highlight, highlight_colour,
 legend, bbox, update_view, focus_layer, js_transition, billboard ) {
 
-  const pathLayer = new PathLayer({
+  var extensions = [];
+  extensions.push(
+  	new deck.PathStyleExtension({dash: true})
+  );
+
+  const pathLayer = new deck.PathLayer({
     map_id: map_id,
     id: 'path-'+layer_id,
     data: path_data,
@@ -23,7 +28,8 @@ legend, bbox, update_view, focus_layer, js_transition, billboard ) {
     onHover: md_update_tooltip,
     autoHighlight: auto_highlight,
     highlightColor: md_hexToRGBA( highlight_colour ),
-    transitions: js_transition || {}
+    transitions: js_transition || {},
+    extensions: extensions
   });
 
   if( map_type == "google_map") {
@@ -40,7 +46,12 @@ legend, bbox, update_view, focus_layer, js_transition, billboard ) {
 
 function add_path_polyline( map_id, map_type, path_data, layer_id, auto_highlight, highlight_colour, legend, bbox, update_view, focus_layer, js_transition, billboard ) {
 
-  const pathLayer = new PathLayer({
+  var extensions = [];
+  extensions.push(
+  	new deck.PathStyleExtension({dash: true})
+  );
+
+  const pathLayer = new deck.PathLayer({
     map_id: map_id,
     id: 'path-'+layer_id,
     data: path_data,

inst/htmlwidgets/lib/polygon/polygon.js

@@ -1,7 +1,7 @@
 
 function add_polygon_geo( map_id, map_type, polygon_data, layer_id, light_settings, auto_highlight, highlight_colour, legend, bbox, update_view, focus_layer, js_transition, is_extruded, elevation_scale ) {
 
-  const polygonLayer = new PolygonLayer({
+  const polygonLayer = new deck.PolygonLayer({
   	map_id: map_id,
     id: 'polygon-'+layer_id,
     data: polygon_data,
@@ -41,7 +41,7 @@ function add_polygon_geo( map_id, map_type, polygon_data, layer_id, light_settin
 
 function add_polygon_polyline( map_id, map_type, polygon_data, layer_id, light_settings, auto_highlight, highlight_colour, legend, bbox, update_view, focus_layer, js_transition, is_extruded, elevation_scale ) {
 
-  const polygonLayer = new PolygonLayer({
+  const polygonLayer = new deck.PolygonLayer({
     map_id: map_id,
     id: 'polygon-'+layer_id,
     data: polygon_data,

inst/htmlwidgets/lib/scatterplot/scatterplot.js

@@ -8,7 +8,7 @@ function add_scatterplot_geo( map_id, map_type, scatter_data, layer_id, auto_hig
   	extensions.push( new BrushingExtension() );
   }
 
-  const scatterLayer = new ScatterplotLayer({
+  const scatterLayer = new deck.ScatterplotLayer({
     map_id: map_id,
     id: 'scatterplot-'+layer_id,
     data: scatter_data,
@@ -56,7 +56,7 @@ function add_scatterplot_polyline( map_id, map_type, scatter_data, layer_id, aut
   if ( brush_radius > 0 ) {
   	extensions.push( new BrushingExtension() );
   }
-  const scatterLayer = new ScatterplotLayer({
+  const scatterLayer = new deck.ScatterplotLayer({
     map_id: map_id,
     id: 'scatterplot-'+layer_id,
     data: scatter_data,

inst/htmlwidgets/lib/text/text.js

@@ -7,7 +7,7 @@ function add_text_geo( map_id, map_type, text_data, layer_id, auto_highlight, hi
   	extensions.push( new BrushingExtension() );
   }
 
-  const textLayer = new TextLayer({
+  const textLayer = new deck.TextLayer({
   	map_id: map_id,
     id: 'text-'+layer_id,
     data: text_data,
@@ -58,7 +58,7 @@ function add_text_polyline( map_id, map_type, text_data, layer_id, auto_highligh
   	extensions.push( new BrushingExtension() );
   }
 
-  const textLayer = new TextLayer({
+  const textLayer = new deck.TextLayer({
     map_id: map_id,
     id: 'text-'+layer_id,
     data: text_data,

inst/htmlwidgets/lib/trips/trips.js

@@ -2,7 +2,7 @@
 function add_trips_geo( map_id, map_type, trips_data, opacity, layer_id,
 trail_length, start_time, end_time, animation_speed, legend ) {
 
-  var tripsLayer = new TripsLayer({
+  var tripsLayer = new deck.TripsLayer({
     id: 'trips-'+layer_id,
     data: trips_data,
     parameters: {
@@ -45,7 +45,7 @@ trail_length, start_time, end_time, animation_speed, legend) {
 
     var time = ((timestamp % loopTime) / loopTime) * loopLength;
 
-		var tripsLayer = new TripsLayer({
+		var tripsLayer = new deck.TripsLayer({
 		    id: 'trips-'+layer_id,
 		    data: trips_data,
 		    parameters: {

inst/htmlwidgets/mapdeck.js

@@ -54,9 +54,10 @@ HTMLWidgets.widget({
        	 const deckgl = new deck.DeckGL({
        	 	  map: false,
 			      container: el.id,
-			      //initialViewState: window[el.id + 'INITIAL_VIEW_STATE'],
-			      viewState: window[el.id + 'INITIAL_VIEW_STATE'],
+			      initialViewState: window[el.id + 'INITIAL_VIEW_STATE'],
+			      //viewState: window[el.id + 'INITIAL_VIEW_STATE'], // no longer supported - deck.gl v8.0.0
 			      layers: [],
+			      controller: true
 			      //onLayerHover: setTooltip
 			   });
 			   window[el.id + 'map'] = deckgl;
@@ -66,10 +67,10 @@ HTMLWidgets.widget({
           	//map: mapboxgl,
 			      container: el.id,
 			      mapStyle: x.style,
-			      //initialViewState: window[el.id + 'INITIAL_VIEW_STATE'],
-			      viewState: window[el.id + 'INITIAL_VIEW_STATE'],
+			      initialViewState: window[el.id + 'INITIAL_VIEW_STATE'],
+			      //viewState: window[el.id + 'INITIAL_VIEW_STATE'],
 			      layers: [],
-			      //controller: myController
+			      controller: true,
 			      //onLayerHover: setTooltip
 			      onViewStateChange: ({viewState, interactionState}) => {
 

inst/htmlwidgets/mapdeck_functions.js

@@ -159,11 +159,11 @@ function md_update_layer( map_id, layer_id, layer ) {
   }
 
   // ## issue 137
-  var vs = window[ map_id + 'map'].viewState;
+  //var vs = window[ map_id + 'map'].viewState;
 
   window[map_id + 'map'].setProps({
-  	layers: [...window[map_id + 'layers'] ],
-  	viewState: vs
+  	layers: [...window[map_id + 'layers'] ]
+  	//viewState: vs                           // issue 239 - viewState no longer supported in deck.gl v8.0.8
   });
 }
 

inst/htmlwidgets/mapdeck_location.js

@@ -8,6 +8,8 @@ function md_change_location( map_id, map_type, location, zoom, pitch, bearing, d
   	window[map_id + 'map'].setZoom( zoom );
   } else {
 
+  	console.log( window[ map_id + 'map' ].viewState );
+
 	  if ( window[ map_id + 'map'].viewState["default-view"] !== undefined ) {
 	  	currentLon = location === null ? window[ map_id + 'map'].viewState["default-view"].longitude : location[0];
 	  	currentLat = location === null ? window[ map_id + 'map'].viewState["default-view"].latitude : location[1];
@@ -22,6 +24,8 @@ function md_change_location( map_id, map_type, location, zoom, pitch, bearing, d
 	    currentZoom = zoom === null ? window[ map_id + 'map'].viewState.zoom : zoom;
 	  }
 
+	  console.log( currentLon );
+
 		window[map_id + 'map'].setProps({
 	    viewState: {
 	      longitude: currentLon,
@@ -30,9 +34,11 @@ function md_change_location( map_id, map_type, location, zoom, pitch, bearing, d
 	      pitch: currentPitch,
 	      bearing: currentBearing,
 	      transitionInterpolator: transition === "fly" ? new deck.FlyToInterpolator() : new deck.LinearInterpolator(),
-	      transitionDuration: duration
-	    },
+	      transitionDuration: duration,
+	      controller: true
+	    }
 	  });
+
   }
 }