close #199

SymbolixAU · Jun 14, 2019 · 754a36c · 754a36c
1 parent 136f762
commit 754a36c
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 2 deletions.
diff --git a/R/map_layer_trips.R b/R/map_layer_trips.R
@@ -30,7 +30,7 @@ mapdeckTripsDependency <- function() {
 #' \donttest{
 #'
 #'
-#' library(gpxsf)
+#' library(gpx)
 #' gpx <- system.file("gpx/city_trail.gpx", package = "gpx")
 #' sf <- gpx::gpx_sf( gpx, time = "counter" )
 #'

diff --git a/inst/htmlwidgets/lib/greatcircle/greatcircle.js b/inst/htmlwidgets/lib/greatcircle/greatcircle.js
@@ -5,6 +5,9 @@ function add_greatcircle_geo( map_id, map_type, greatcircle_data, layer_id, auto
     id: 'greatcircle-'+layer_id,
     data: greatcircle_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
     getWidth: d => d.properties.stroke_width,
     getSourcePosition: d => md_get_origin_coordinates( d ),
     getTargetPosition: d => md_get_destination_coordinates( d ),
@@ -39,6 +42,9 @@ function add_greatcircle_polyline( map_id, map_type, greatcircle_data, layer_id,
     id: 'greatcircle-'+layer_id,
     data: greatcircle_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
     getWidth: d => d.stroke_width,
     getSourcePosition: d => md_decode_points( d.origin ),
     getTargetPosition: d => md_decode_points( d.destination ),

diff --git a/inst/htmlwidgets/lib/line/line.js b/inst/htmlwidgets/lib/line/line.js
@@ -6,6 +6,9 @@ function add_line_geo( map_id, map_type, line_data, layer_id, auto_highlight, hi
     id: 'line-'+layer_id,
     data: line_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
     getWidth: d => d.properties.stroke_width,
     getSourcePosition: d => md_get_origin_coordinates( d ),
     getTargetPosition: d => md_get_destination_coordinates( d ),
@@ -37,6 +40,9 @@ function add_line_polyline( map_id, map_type, line_data, layer_id, auto_highligh
     id: 'line-'+layer_id,
     data: line_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
     getWidth: d => d.stroke_width,
     getSourcePosition: d => md_decode_points( d.origin ),
     getTargetPosition: d => md_decode_points( d.destination ),

diff --git a/inst/htmlwidgets/lib/markers/markers.js b/inst/htmlwidgets/lib/markers/markers.js
diff --git a/inst/htmlwidgets/lib/scatterplot/scatterplot.js b/inst/htmlwidgets/lib/scatterplot/scatterplot.js
@@ -14,6 +14,9 @@ function add_scatterplot_geo( map_id, map_type, scatter_data, layer_id, auto_hig
     lineWidthMinPixels: 0,
     stroked: true,  // TODO( make conditional IFF stroke provided?)
     filled: true,
+    parameters: {
+	    depthTest: false
+	  },
     getRadius: d => d.properties.radius,
     getPosition: d => md_get_point_coordinates( d ),
     getFillColor: d => md_hexToRGBA( d.properties.fill_colour ),
@@ -53,6 +56,9 @@ function add_scatterplot_polyline( map_id, map_type, scatter_data, layer_id, aut
     lineWidthMinPixels: 0,
     stroked: true,
     filled: true,
+    parameters: {
+	    depthTest: false
+	  },
     getRadius: d => d.radius,
     getPosition: d => md_decode_points( d.polyline ),
     getFillColor: d => md_hexToRGBA( d.fill_colour ),

diff --git a/inst/htmlwidgets/lib/scatterplot_brush/scatterplot_brush.js b/inst/htmlwidgets/lib/scatterplot_brush/scatterplot_brush.js
@@ -198,6 +198,9 @@ function add_scatterplot_brush_geo( map_id, map_type, scatter_data, layer_id, au
     radiusMaxPixels: radius_max_pixels || Number.MAX_SAFE_INTEGER,
     stroked: true,  // TODO( make conditional IFF stroke provided?)
     filled: true,
+    parameters: {
+	    depthTest: false
+	  },
     getRadius: d => d.properties.radius,
     getPosition: d => md_get_point_coordinates( d ),
     getFillColor: d => md_hexToRGBA( d.properties.fill_colour ),

diff --git a/inst/htmlwidgets/lib/text/text.js b/inst/htmlwidgets/lib/text/text.js
@@ -6,6 +6,9 @@ function add_text_geo( map_id, map_type, text_data, layer_id, auto_highlight, hi
     id: 'text-'+layer_id,
     data: text_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
 
     getPosition: d => md_get_point_coordinates( d ),
     getColor: d => md_hexToRGBA( d.properties.fill_colour ),
@@ -46,6 +49,10 @@ function add_text_polyline( map_id, map_type, text_data, layer_id, auto_highligh
     id: 'text-'+layer_id,
     data: text_data,
     pickable: true,
+    parameters: {
+	    depthTest: false
+	  },
+
     getPosition: d => md_decode_points( d.polyline ),
     getColor: d => md_hexToRGBA( d.fill_colour ),
     getText: d => d.text,

diff --git a/inst/htmlwidgets/lib/trips/trips.js b/inst/htmlwidgets/lib/trips/trips.js
@@ -7,6 +7,10 @@ trail_length, start_time, end_time, animation_speed, legend ) {
   var tripsLayer = new TripsLayer({
     id: 'trips-'+layer_id,
     data: trips_data,
+    parameters: {
+	    depthTest: false
+	  },
+
     getPath: d => md_trip_coordinates( d.geometry.geometry.coordinates ),
     getTimestamps: d => md_trip_timestamp( d.geometry.geometry.coordinates, start_time ),
     getColor: d => md_hexToRGBA( d.properties.stroke_colour ),
@@ -46,6 +50,10 @@ trail_length, start_time, end_time, animation_speed, legend ) {
 		var tripsLayer = new TripsLayer({
 		    id: 'trips-'+layer_id,
 		    data: trips_data,
+		    parameters: {
+			    depthTest: false
+			  },
+
 		    getPath: d => md_trip_coordinates( d.geometry.geometry.coordinates ),
 		    getTimestamps: d => md_trip_timestamp( d.geometry.geometry.coordinates, start_time ),
 		    getColor: d => md_hexToRGBA( d.properties.stroke_colour ),

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