Skip to content
This repository was archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
remove warning on geojson2wkt() when old format - allow both
Browse files Browse the repository at this point in the history
  • Loading branch information
@sckott
sckott committed Mar 29, 2018
1 parent 48314bd commit d2a3b54
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 91 deletions.
11 changes: 0 additions & 11 deletions R/geojson2wkt.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,6 @@ geojson2wkt.list <- function(obj, fmt = 16, third = "z", ...) {
}

if (
(
all(c('type', 'coordinates') %in% nms) ||
all(c('type', 'geometries') %in% nms)
) &&
!all(tolower(wkt_geojson_types) %in% nms)
) {
warning('using old format - move to new format - see ?geojson2wkt',
call. = FALSE)
} else if (
!all(c('type', 'coordinates') %in% nms) &&
any(tolower(wkt_geojson_types) %in% nms)
) {
Expand All @@ -337,8 +328,6 @@ geojson2wkt.list <- function(obj, fmt = 16, third = "z", ...) {
} else{
obj <- list(type = nms, coordinates = obj[[1]])
}
} else {
stop("bad input", call. = FALSE)
}

switch(
Expand Down
98 changes: 18 additions & 80 deletions tests/testthat/test-geojson2wkt.r
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ context("geojson2wkt")

test_that("convert point works", {
point <- list('type' = 'Point', 'coordinates' = c(116.4, 45.2))
a <- suppressWarnings(geojson2wkt(point))
a <- geojson2wkt(point)
expect_is(a, "character")
expect_match(a, "POINT")
expect_equal(a, "POINT (116.4000000000000057 45.2000000000000028)")
})

test_that("convert multipoint works", {
mp <- list(type = 'MultiPoint', coordinates=matrix(c(100, 101, 3.14, 3.101, 2.1, 2.18), ncol = 2))
b <- suppressWarnings(geojson2wkt(mp))
b <- geojson2wkt(mp)
expect_is(b, "character")
expect_match(b, "POINT")
expect_match(b, "MULTIPOINT")
Expand All @@ -21,11 +21,11 @@ test_that("convert linestring works", {
st <- list(type = 'LineString',
coordinates = matrix(c(0.0, 2.0, 4.0, 5.0,
0.0, 1.0, 2.0, 4.0), ncol = 2))
cc <- suppressWarnings(geojson2wkt(st))
cc <- geojson2wkt(st)
expect_is(cc, "character")
expect_match(cc, "LINESTRING")
expect_equal(suppressWarnings(geojson2wkt(st, 0)), "LINESTRING (0 0, 2 1, 4 2, 5 4)")
expect_equal(length(strsplit(suppressWarnings(geojson2wkt(st, 1)), "\\.")[[1]]), 9)
expect_equal(geojson2wkt(st, 0), "LINESTRING (0 0, 2 1, 4 2, 5 4)")
expect_equal(length(strsplit(geojson2wkt(st, 1), "\\.")[[1]]), 9)
})

test_that("convert multilinestring works", {
Expand All @@ -34,11 +34,11 @@ test_that("convert multilinestring works", {
matrix(c(0, -2, -4, -1, -3, -5), ncol = 2),
matrix(c(1.66, 10.9999, 10.9, 0, -31.5, 3.0, 1.1, 0), ncol = 2)
))
d <- suppressWarnings(geojson2wkt(multist))
d <- geojson2wkt(multist)
expect_is(d, "character")
expect_match(d, "LINESTRING")
expect_match(d, "MULTILINESTRING")
expect_equal(suppressWarnings(geojson2wkt(multist, 0)), "MULTILINESTRING ((0 -1, -2 -3, -4 -5), (1.6600 -31.5000, 10.9999 3.0000, 10.9000 1.1000, 0.0000 0.0000))")
expect_equal(geojson2wkt(multist, 0), "MULTILINESTRING ((0 -1, -2 -3, -4 -5), (1.6600 -31.5000, 10.9999 3.0000, 10.9000 1.1000, 0.0000 0.0000))")
})

test_that("convert polygon works", {
Expand All @@ -50,10 +50,10 @@ test_that("convert polygon works", {
ncol = 2)
)
)
e <- suppressWarnings(geojson2wkt(poly))
e <- geojson2wkt(poly)
expect_is(e, "character")
expect_match(e, "POLYGON")
expect_equal(suppressWarnings(geojson2wkt(poly, 0)), "POLYGON ((100.001 0.001, 101.100 0.001, 101.001 1.001, 100.001 0.001), (100.201 0.201, 100.801 0.201, 100.801 0.801, 100.201 0.201))")
expect_equal(geojson2wkt(poly, 0), "POLYGON ((100.001 0.001, 101.100 0.001, 101.001 1.001, 100.001 0.001), (100.201 0.201, 100.801 0.201, 100.801 0.801, 100.201 0.201))")
})

test_that("convert multipolygon works", {
Expand All @@ -69,7 +69,7 @@ test_that("convert multipolygon works", {
)
)
)
f <- suppressWarnings(geojson2wkt(mpoly2, fmt=0))
f <- geojson2wkt(mpoly2, fmt=0)
expect_is(f, "character")
expect_match(f, "POLYGON")
expect_match(f, "MULTIPOLYGON")
Expand All @@ -92,7 +92,7 @@ test_that("convert geometrycollection works", {
))
)
)
g <- suppressWarnings(geojson2wkt(gmcoll, fmt = 0))
g <- geojson2wkt(gmcoll, fmt = 0)
expect_is(g, "character")
expect_match(g, "GEOMETRYCOLLECTION")
expect_equal(g, "GEOMETRYCOLLECTION (POINT (0 1), LINESTRING (0 0, 2 1, 4 2, 5 4), POLYGON ((100.001 0.001, 101.100 0.001, 101.001 1.001, 100.001 0.001), (100.201 0.201, 100.801 0.201, 100.801 0.801, 100.201 0.201)))")
Expand All @@ -110,7 +110,7 @@ test_that("convert geometrycollection works", {
test_that("point - fails well", {
mp <- list(type = 'Point', coordinates = list(100.0, 3.101))
expect_error(
suppressWarnings(geojson2wkt(mp)),
geojson2wkt(mp),
"expecting a vector in 'coordinates', got a list")

mp <- list(Point = list(100.0, 3.101))
Expand All @@ -120,80 +120,18 @@ test_that("point - fails well", {
})


test_that("multipoint - throws warning with old format", {
mp <- list(
type = 'MultiPoint',
coordinates = matrix(c(100, 101, 3.14, 3.101, 2.1, 2.18), ncol = 2)
)
expect_is(suppressWarnings(geojson2wkt(mp)), "character")
expect_warning(geojson2wkt(mp), "using old format")
})

test_that("linestring - throws warning with old format", {
ll <- list(type = 'LineString',
coordinates = matrix(c(0.0, 2.0, 4.0, 5.0,
0.0, 1.0, 2.0, 4.0), ncol = 2))
expect_is(suppressWarnings(geojson2wkt(ll)), "character")
expect_warning(geojson2wkt(ll), "using old format")
})

test_that("multilinestring - throws warning with old format", {
ll <- list(type = 'MultiLineString',
coordinates = list(
matrix(c(0, -2, -4, -1, -3, -5), ncol = 2),
matrix(c(1.66, 10.9999, 10.9, 0, -31.5, 3.0, 1.1, 0), ncol = 2)
))
expect_is(suppressWarnings(geojson2wkt(ll)), "character")
expect_warning(geojson2wkt(ll), "using old format")
})

test_that("polygon - throws warning with old format", {
ll <- list(type = 'Polygon',
coordinates = list(
matrix(c(100.001, 101.1, 101.001, 100.001, 0.001, 0.001, 1.001, 0.001),
ncol = 2),
matrix(c(100.201, 100.801, 100.801, 100.201, 0.201, 0.201, 0.801, 0.201),
ncol = 2)
)
)
expect_is(suppressWarnings(geojson2wkt(ll)), "character")
expect_warning(geojson2wkt(ll), "using old format")
})

test_that("multipolygon - throws warning with old format", {
ll <- list(type = "MultiPolygon",
coordinates = list(
list(
matrix(c(100, 101, 101, 100, 0.001, 0.001, 1.001, 0.001), ncol = 2),
matrix(c(100.2, 100.8, 100.8, 100.2, 0.2, 0.2, 0.8, 0.2), ncol = 2)
),
list(
matrix(c(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 1.0), ncol = 3),
matrix(c(9.0, 10.0, 11.0, 12.0, 1.0, 2.0, 3.0, 4.0, 9.0), ncol = 3)
)
)
)
expect_is(suppressWarnings(geojson2wkt(ll)), "character")
expect_warning(geojson2wkt(ll), "using old format")
})







# tests for old format to make sure we're failing well on those
test_that("multipoint - fails well with bad input", {
mp <- list(type = 'MultiPoint', coordinates=list(c(100.0, 3.101), c(101.0, 2.1), c(3.14, 2.18)))
expect_error(suppressWarnings(geojson2wkt(mp)), "expecting a matrix in 'coordinates', got a list")
expect_error(geojson2wkt(mp), "expecting a matrix in 'coordinates', got a list")
})

test_that("linestring - fails well with bad input", {
st <- list(type = 'LineString',
coordinates = list(c(0.0, 0.0, 10.0), c(2.0, 1.0, 20.0),
c(4.0, 2.0, 30.0), c(5.0, 4.0, 40.0)))
expect_error(suppressWarnings(geojson2wkt(st)),
expect_error(geojson2wkt(st),
"expecting a matrix")
})

Expand All @@ -203,7 +141,7 @@ test_that("multilinestring - fails well with bad input", {
list(c(0.0, -1.0), c(-2.0, -3.0), c(-4.0, -5.0)),
list(c(1.66, -31023.5), c(10000.9999, 3.0), c(100.9, 1.1), c(0.0, 0.0))
))
expect_error(suppressWarnings(geojson2wkt(multist)), "expecting matrices for all 'coordinates' elements")
expect_error(geojson2wkt(multist), "expecting matrices for all 'coordinates' elements")
})

test_that("polygon - fails well with bad input", {
Expand All @@ -212,15 +150,15 @@ test_that("polygon - fails well with bad input", {
list(c(100.001, 0.001), c(101.12345, 0.001), c(101.001, 1.001), c(100.001, 0.001)),
list(c(100.201, 0.201), c(100.801, 0.201), c(100.801, 0.801), c(100.201, 0.201))
))
expect_error(suppressWarnings(geojson2wkt(poly)), "expecting matrices for all 'coordinates' elements")
expect_error(geojson2wkt(poly), "expecting matrices for all 'coordinates' elements")
})

test_that("multipolygon - fails well with bad input", {
mpoly2 <- list(type = "MultiPolygon",
coordinates = list(list(list(c(30, 20), c(45, 40), c(10, 40), c(30, 20))),
list(list(c(15, 5), c(40, 10), c(10, 20), c(5 ,10), c(15, 5))))
)
expect_error(suppressWarnings(geojson2wkt(mpoly2)), "")
expect_error(geojson2wkt(mpoly2), "")
})

test_that("geometrycollection - fails well with bad input", {
Expand All @@ -233,5 +171,5 @@ test_that("geometrycollection - fails well with bad input", {
)
)
)
expect_error(suppressWarnings(geojson2wkt(gmcoll)), "")
expect_error(geojson2wkt(gmcoll), "")
})

0 comments on commit d2a3b54

Please sign in to comment.