fixes to some functions for integrating new turfjs

using turf 4.7.3 now
fix tests for turf 4.7.3

R/as.feature.R

@@ -40,7 +40,7 @@
 #' }'
 #' as.feature(line)
 #'
-#' # returns self if no match - note "Points" is not a geojson type
+#' # returns self if no match - note "Points" is not a GeoJSON type
 #' pt <- '{"type":"Points","coordinates":[-75.343,39.984]}'
 #' as.feature(pt)
 as.feature <- function(x, ...) {

R/isolines.R

@@ -19,7 +19,8 @@
 #' @family interpolation
 #' @return A [data-FeatureCollection] of isolines
 #' ([data-LineString] features).
-#' @examples
+#' @details Warning: this function seems to be broken, not sure why
+#' @examples \dontrun{
 #' # pts <- lawn_random(n = 100, bbox = c(0, 30, 20, 50))
 #' pts <- lawn_point_grid(c(0, 30, 20, 50), 100, 'miles')
 #' pts$features$properties <-
@@ -28,10 +29,9 @@
 #' breaks <- c(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 #' lawn_isolines(points = pts, breaks, z = 'temperature')
 #'
-#' @examples \dontrun{
 #' lawn_isolines(pts, breaks, 'temperature') %>% view
 #' }
-lawn_isolines <- function(points, breaks, z, propertiesToAllIsolines = NULL,
+lawn_isolines <- function(points, breaks, z, propertiesToAllIsolines = c(),
                           propertiesPerIsoline = list(), resolution = NULL,
                           lint = FALSE) {
   calls <- names(sapply(match.call(), deparse))[-1]

R/lawn_feature.R

@@ -22,7 +22,7 @@
 #' )
 #' lapply(pts, lawn_feature)
 #' }
-lawn_feature <- function(geometry, properties = list(), lint = FALSE) {
+lawn_feature <- function(geometry, properties = c(), lint = FALSE) {
   lawnlint(geometry, lint)
   ct$eval(sprintf("var feet = turf.feature(%s, %s);",
                   convert(geometry), convert(properties)))

R/onLoad.R

@@ -5,7 +5,7 @@ ht <- NULL
 
 .onLoad <- function(libname, pkgname){
   ct <<- V8::v8();
-  ct$source(system.file("js/turf452.js", package = pkgname))
+  ct$source(system.file("js/turf473.js", package = pkgname))
   ct$source(system.file("js/turf-meta.js", package = pkgname))
   ct$source(system.file("js/turf-invariant.js", package = pkgname))
   ct$source(system.file("js/cloner.js", package = pkgname))

tests/testthat/test-bbox_polygon.R

@@ -34,7 +34,7 @@ test_that("lawn_bbox_polygon works", {
 
 test_that("lawn_bbox_polygon fails correctly", {
   expect_error(lawn_bbox_polygon(), "argument \"bbox\" is missing, with no default")
-  expect_true(is.na(lawn_bbox_polygon(1)$geometry$coordinates[,,1][1]))
+  expect_error(lawn_bbox_polygon(1), "Coordinates must contain numbers")
   expect_error(lawn_bbox_polygon(c("1", 2, 3, 4)), "All values must be numeric")
   expect_error(lawn_bbox_polygon(c("a", "b", "c", "d")), "All values must be numeric")
 })

tests/testthat/test-erase.R

@@ -82,7 +82,7 @@ test_that("lawn_erase fails correctly", {
   expect_error(lawn_erase(), "argument \"poly1\" is missing, with no default")
   expect_error(lawn_erase("A", "B"), "A is not defined")
   expect_error(lawn_erase(poly1, "{}"),
-               "<geojson> must be a Feature or Geometry Object")
+               "geojson must be a valid Feature or Geometry Object")
   expect_error(lawn_erase(poly1, "{}", lint = TRUE),
                "member required")
   expect_error(lawn_erase(poly1, "{}", lint = TRUE), "\"type\" member required")

tests/testthat/test-intersect.R

@@ -49,10 +49,14 @@ test_that("works returns correct classes", {
 })
 
 test_that("fails correctly", {
-  expect_error(lawn_intersect(), "argument \"poly1\" is missing, with no default")
+  expect_error(lawn_intersect(),
+               "argument \"poly1\" is missing, with no default")
   expect_error(lawn_intersect(lawn_data$points_average, lawn_data$points_count),
                "has no method 'intersection'")
-  expect_error(lawn_intersect(poly1, sub("Polygon", "polygon", poly2)), "Unknown GeoJSON type: polygon")
-  expect_error(lawn_intersect(poly1, sub("Feature", "feature", poly2)), "Unknown GeoJSON type: feature")
-  expect_error(lawn_intersect(poly1, sub("coordinates", "cordinates", poly2)), "Cannot read property '0' of undefined")
+  expect_error(lawn_intersect(poly1, sub("Polygon", "polygon", poly2)),
+               "Unknown Geometry Type")
+  expect_error(lawn_intersect(poly1, sub("Feature", "feature", poly2)),
+               "Unknown Geometry Type")
+  expect_error(lawn_intersect(poly1, sub("coordinates", "cordinates", poly2)),
+               "Cannot read property 'length' of undefined")
 })

tests/testthat/test-point_on_line.R

@@ -34,6 +34,8 @@ test_that("lawn_point_on_line works", {
 })
 
 test_that("lawn_point_on_line fails correctly", {
-  expect_error(lawn_point_on_line(), "argument \"line\" is missing, with no default")
-  expect_error(lawn_point_on_line(5, TRUE), "input must be a LineString Feature or Geometry")
+  expect_error(lawn_point_on_line(),
+               "argument \"line\" is missing, with no default")
+  expect_error(lawn_point_on_line(5, TRUE),
+               "lines must be LineString or MultiLineString")
 })

tests/testthat/test-simplify.R

@@ -175,7 +175,7 @@ test_that("lawn_simplify fails correctly", {
   # missing arguments
   expect_error(lawn_simplify(), "argument \"feature\" is missing, with no default")
   # wrong input object
-  expect_error(lawn_simplify("{}"), "Cannot read property")
+  expect_error(lawn_simplify("{}"), "unknown GeoJSON type")
   # can't pass in a character string to tolerance
   expect_error(lawn_simplify(feature, "a"), "tolerance must be")
   # can't pass in a non-logical to high_quality

tests/testthat/test-transform_scale.R

@@ -43,7 +43,7 @@ test_that("lawn_transform_scale fails correctly", {
   expect_error(lawn_transform_scale(), "argument \"x\" is missing, with no default")
   expect_error(lawn_transform_scale(5), "argument \"factor\" is missing, with no default")
   expect_error(lawn_transform_scale(x, 5, "asdfasf"), "invalid origin")
-  expect_error(lawn_transform_scale(list(), 100), "Unknown Geometry Type")
+  expect_error(lawn_transform_scale(list(), 100), "unknown GeoJSON type")
 
   expect_error(lawn_transform_scale(x, "adf"), "adf is not defined")
   expect_error(lawn_transform_scale(x, 34, c(1, "ad")),