patches for #29 and #27

.Rbuildignore

@@ -4,3 +4,4 @@
 ^\.travis\.yml$
 ^codecov\.yml$
 ^cran-comments\.md$
+^javascript$

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mapdeck
 Type: Package
 Title: Interactive Maps Using 'Mapbox GL JS' and 'Deck.gl'
-Version: 0.1.1
+Version: 0.1.0
 Date: 2018-08-11
 Authors@R: c(
     person("David", "Cooley", ,"dcooley@symbolix.com.au", role = c("aut", "cre"))

R/map_layer_arc.R

@@ -36,7 +36,7 @@ mapdeckArcDependency <- function() {
 #' @param palette a function which generates hex colours
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_geojson.R

@@ -42,7 +42,7 @@ mapdeckGeojsonDependency <- function() {
 #'
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_grid.R

@@ -25,7 +25,7 @@ mapdeckGridDependency <- function() {
 #' @param elevation_scale cell elevation multiplier
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'
 #'

R/map_layer_line.R

@@ -21,7 +21,7 @@ mapdeckLineDependency <- function() {
 #' @param stroke_colour variable or hex colour to use as the ending stroke colour
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_path.R

@@ -22,7 +22,7 @@ mapdeckPathDependency <- function() {
 #' between 1 and 255 to be applied to all the shapes
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_pointcloud.R

@@ -23,7 +23,7 @@ mapdeckPointcloudDependency <- function() {
 #' @param light_settings list of light setting parameters. See \link{light_settings}
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'
 #'

R/map_layer_polygon.R

@@ -28,7 +28,7 @@ mapdeckPolygonDependency <- function() {
 #' @param tooltip variable of \code{data} containing text or HTML to render as a tooltip
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_scatterplot.R

@@ -22,7 +22,7 @@ mapdeckScatterplotDependency <- function() {
 #'
 #' @examples
 #'
-#'\dontrun{
+#' \donttest{
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'
 #'

R/map_layer_screengrid.R

@@ -24,7 +24,7 @@ mapdeckScreengridDependency <- function() {
 #' @param cell_size size of grid squares in pixels
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_layer_text.R

@@ -27,7 +27,7 @@ mapdeckTextDependency <- function() {
 #'
 #' @examples
 #'
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/map_styles.R

@@ -5,7 +5,7 @@
 #' @param style one of streets, outdoors, light, dark, satellite, satellite-streets
 #'
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' ## You need a valid access token from Mapbox
 #' key <- 'abc'

R/mapdeck_package.R

@@ -9,7 +9,7 @@
 #' @export
 #' @param lhs,rhs A google map and a layer to add to it
 #' @examples
-#' \dontrun{
+#' \donttest{
 #'
 #' key <- "your_api_key"
 #' mapdeck_map(key = key) %>%

cran-comments.md

@@ -1,7 +1,8 @@
 ## Comments
 
+* Updated all examples from `\dontrun` to `\donttest`
 * Updated description with details about Mapbox GL and Deck gl
-* All examples are `dontrun` because they all require internet connection
+* All examples are `donttest` because they all require internet connection
 
 
 ## Test environments

inst/htmlwidgets/mapdeck.js

@@ -10,8 +10,8 @@ HTMLWidgets.widget({
 
       renderValue: function(x) {
 
-      	window.params = [];
-      	window.params.push({ 'map_id' : el.id });
+      	//window.params = [];
+      	//window.params.push({ 'map_id' : el.id });
 
       	window[el.id + 'layers'] = []; // keep track of layers for overlaying multiple
       	// needs to be an array because .props takes an array of layers