diff --git a/R/google_map_layer_rectangle.R b/R/google_map_layer_rectangle.R index 99171878..9f1967a2 100644 --- a/R/google_map_layer_rectangle.R +++ b/R/google_map_layer_rectangle.R @@ -89,7 +89,7 @@ add_rectangles <- function(map, legend = F, legend_options = NULL, load_interval = 0, - focus_layer + focus_layer = FALSE ){ objArgs <- match.call(expand.dots = F) diff --git a/man/add_rectangles.Rd b/man/add_rectangles.Rd index 5761ade3..069ce300 100644 --- a/man/add_rectangles.Rd +++ b/man/add_rectangles.Rd @@ -10,7 +10,7 @@ add_rectangles(map, data = get_map_data(map), north, east, south, west, fill_opacity = NULL, mouse_over = NULL, mouse_over_group = NULL, info_window = NULL, layer_id = NULL, update_map_view = TRUE, z_index = NULL, digits = 4, palette = NULL, legend = F, - legend_options = NULL, load_interval = 0, focus_layer) + legend_options = NULL, load_interval = 0, focus_layer = FALSE) } \arguments{ \item{map}{a googleway map object created from \code{google_map()}} diff --git a/tests/testthat/test-google_dependencies.R b/tests/testthat/test-google_dependencies.R index b0c101e0..323b881b 100644 --- a/tests/testthat/test-google_dependencies.R +++ b/tests/testthat/test-google_dependencies.R @@ -7,109 +7,82 @@ test_that("dependencies load", { m <- google_map(key = "abc", data = tram_stops) %>% add_circles() - expect_true( - "circles" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("circles" %in% sapply(m$dependencies, function(x) x[['name']])) ## DRAGDROP m <- google_map(key = "abc") %>% add_dragdrop() - expect_true( - "geojson" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("geojson" %in% sapply(m$dependencies, function(x) x[['name']])) ## DRAWING m <- google_map(key = "abc", data = tram_stops) %>% add_drawing() - expect_true( - "drawing" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("drawing" %in% sapply(m$dependencies, function(x) x[['name']])) ## FUSION ## DRAGDROP m <- google_map(key = "abc") %>% add_fusion(query = "{}") - expect_true( - "fusion" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("fusion" %in% sapply(m$dependencies, function(x) x[['name']])) ## GEOJSON m <- google_map(key = "abc") %>% add_geojson(data = geo_melbourne) - expect_true( - "geojson" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("geojson" %in% sapply(m$dependencies, function(x) x[['name']])) ## HEATMAP ## DRAGDROP m <- google_map(key = "abc", data = tram_stops) %>% add_heatmap() - expect_true( - "heatmap" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("heatmap" %in% sapply(m$dependencies, function(x) x[['name']])) ## KML m <- google_map(key = "abc") %>% add_kml(kml_url = "http://www.symbolix.com.au") - expect_true( - "kml" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("kml" %in% sapply(m$dependencies, function(x) x[['name']])) ## MARKERS m <- google_map(key = "abc", data = tram_stops) %>% add_markers() - expect_true( - "markers" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("markers" %in% sapply(m$dependencies, function(x) x[['name']])) ## MARKERCLUSTERER m <- google_map(key = "abc", data = tram_stops) %>% add_markers() - expect_true( - "markers" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("markers" %in% sapply(m$dependencies, function(x) x[['name']])) ## OVERLAY m <- google_map(key = "abc", data = tram_stops) %>% add_overlay(north = 0, east = 0, south = 0, west = 0, overlay_url = "http://www.symbolix.com.au") - expect_true( - "overlay" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("overlay" %in% sapply(m$dependencies, function(x) x[['name']])) ## POLYONS m <- google_map(key = "abc") %>% add_polygons(data = melbourne, polyline = "polyline") - expect_true( - "polygons" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("polygons" %in% sapply(m$dependencies, function(x) x[['name']])) ## POLYLINES m <- google_map(key = "abc", data = tram_route) %>% add_polylines(lat = "shape_pt_lat", lon = "shape_pt_lon") - expect_true( - "polylines" %in% sapply(m$dependencies, function(x) x[['name']]) - ) + expect_true("polylines" %in% sapply(m$dependencies, function(x) x[['name']])) ## RECTANGLES m <- google_map(key = "abc", data = tram_stops) %>% add_rectangles() - expect_true( - "rectangles" %in% sapply(m$dependencies, function(x) x[['name']]) - ) - + expect_true("rectangles" %in% sapply(m$dependencies, function(x) x[['name']])) }) diff --git a/tests/testthat/test-google_map_layers.R b/tests/testthat/test-google_map_layers.R index 6c10d3e0..448cc51f 100644 --- a/tests/testthat/test-google_map_layers.R +++ b/tests/testthat/test-google_map_layers.R @@ -222,17 +222,12 @@ test_that("map layer parameter checks work", { g <- google_map(key = 'abc') %>% add_drawing() - expect_true( - sum(class(g) == c("google_map", "htmlwidget")) == 2 - ) + expect_true(sum(class(g) == c("google_map", "htmlwidget")) == 2) g <- google_map(key = 'abc') %>% clear_drawing() - expect_true( - sum(class(g) == c("google_map", "htmlwidget")) == 2 - ) - + expect_true(sum(class(g) == c("google_map", "htmlwidget")) == 2) ## Rectangles df <- data.frame(north = 33.685, south = 33.671, east = -116.234, west = -116.251)