Merge pull request #62 from r-spatial/sync-wk

Don't use wk functions that will be removed, minor doc updates

Author: paleolimbot

DESCRIPTION

@@ -25,7 +25,7 @@ License: Apache License (== 2.0)
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.0.9000
+RoxygenNote: 7.1.1
 LinkingTo: 
     Rcpp,
     wk

NEWS.md

@@ -1,6 +1,9 @@
 # s2 (development version)
 
+* `s2_*_matrix()` predicates now efficiently use indexing to compute the 
+  results of many predicate comparisons (#61).
 
 # s2 1.0.0
 
-This version is a complete rewrite of the former s2 CRAN package, entirely backwards incompatible with previous versions.
+This version is a complete rewrite of the former s2 CRAN package, entirely 
+backwards incompatible with previous versions.

R/s2-latlng.R

@@ -58,30 +58,12 @@ as_s2_latlng.character <- function(x, ...) {
 
 #' @export
 as_s2_latlng.wk_wkt <- function(x, ...) {
-  meta <- wk::wkt_meta(x)
-  if (any(meta$type_id != 1)) {
-    stop("Can't import non-points as s2_latlng")
-  }
-
-  # need matching because empty points do not have a row in
-  # wk::wk*_coords()
-  coords <- wk::wkt_coords(x)
-  coords_match <- match(seq_along(x), coords$feature_id)
-  new_s2_xptr(s2_latlng_from_numeric(coords$y[coords_match], coords$x[coords_match]), "s2_latlng")
+  as_s2_latlng(as_s2_geography(x), ...)
 }
 
 #' @export
 as_s2_latlng.wk_wkb <- function(x, ...) {
-  meta <- wk::wkb_meta(x)
-  if (any(meta$type_id != 1)) {
-    stop("Can't import non-points as s2_latlng")
-  }
-
-  # need matching because empty points do not have a row in
-  # wk::wk*_coords()
-  coords <- wk::wkb_coords(x)
-  coords_match <- match(seq_along(x), coords$feature_id)
-  new_s2_xptr(s2_latlng_from_numeric(coords$y[coords_match], coords$x[coords_match]), "s2_latlng")
+  as_s2_latlng(as_s2_geography(x), ...)
 }
 
 #' @rdname s2_latlng
@@ -99,15 +81,13 @@ as.matrix.s2_latlng <- function(x, ...) {
 #' @importFrom wk as_wkb
 #' @export
 as_wkb.s2_latlng <- function(x, ..., endian = wk::wk_platform_endian()) {
-  df <- data_frame_from_s2_latlng(x)
-  wk::new_wk_wkb(wk::coords_point_translate_wkb(df$lng, df$lat, endian = endian))
+  as_wkb(as_s2_geography(x), ..., endian = endian)
 }
 
 #' @importFrom wk as_wkt
 #' @export
 as_wkt.s2_latlng <- function(x, ...,  precision = 16, trim = TRUE) {
-  df <- data_frame_from_s2_latlng(x)
-  wk::new_wk_wkt(wk::coords_point_translate_wkt(df$lng, df$lat, precision = precision, trim = trim))
+  as_wkt(as_s2_geography(x), ..., precision = precision, trim = trim)
 }
 
 #' @export

README.md

@@ -9,13 +9,17 @@
 experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
 ![R-CMD-check](https://github.com/r-spatial/s2/workflows/R-CMD-check/badge.svg)
 [![codecov](https://codecov.io/gh/r-spatial/s2/branch/master/graph/badge.svg)](https://codecov.io/gh/r-spatial/s2)
+[![CRAN](http://www.r-pkg.org/badges/version/s2)](https://cran.r-project.org/package=s2)
 <!-- badges: end -->
 
 The goal of s2 is to provide R bindings to Google’s
 [S2Geometry](https://s2geometry.io) library. The package exposes an API
 similar to Google’s [BigQuery Geography
 API](https://cloud.google.com/bigquery/docs/reference/standard-sql/geography_functions),
-whose functions also operate on spherical geometries.
+whose functions also operate on spherical geometries. This package is a
+complete rewrite of an earlier CRAN package s2 with versions up to
+0.4-2, for which the sources are found
+[here](https://github.com/spatstat/s2/).
 
 ## Installation
 

tests/testthat/test-s2-latlng.R

@@ -40,27 +40,27 @@ test_that("s2_latlng objects can be created from and converted back to R objects
 
 test_that("s2_latlng can be imported/exported to/from wkb and wkt", {
   wkb_point <- wk::as_wkb("POINT (-64 45)")
-  expect_identical(wk::as_wkb(s2_latlng(45, -64), endian = 1), wkb_point)
-  expect_identical(wk::as_wkt(s2_latlng(45, -64)), wk::wkt("POINT (-64 45)"))
+  expect_wkt_equal(wk::as_wkb(s2_latlng(45, -64), endian = 1), wkb_point)
+  expect_wkt_equal(wk::as_wkt(s2_latlng(45, -64)), wk::wkt("POINT (-64 45)"))
   expect_identical(wk::as_wkt(s2_latlng(NA, NA)), wk::wkt("POINT EMPTY"))
 
   expect_equal(
     as.data.frame(as_s2_latlng(wk::as_wkb(c("POINT EMPTY", "POINT (-64 45)")))),
     data.frame(lat = c(NA, 45), lng = c(NA, -64))
   )
 
-  expect_identical(
+  expect_equal(
     as.data.frame(as_s2_latlng(c("POINT EMPTY", "POINT (-64 45)"))),
     data.frame(lat = c(NA, 45), lng = c(NA, -64))
   )
 
-  expect_identical(
+  expect_equal(
     as.data.frame(as_s2_latlng(wk::wkt(c("POINT EMPTY", "POINT (-64 45)")))),
     data.frame(lat = c(NA, 45), lng = c(NA, -64))
   )
 
-  expect_error(as_s2_latlng(wk::wkt("LINESTRING EMPTY")), "Can't import non-points")
-  expect_error(as_s2_latlng(wk::as_wkb("LINESTRING EMPTY")), "Can't import non-points")
+  expect_error(as_s2_latlng(wk::wkt("LINESTRING EMPTY")), "non-point")
+  expect_error(as_s2_latlng(wk::as_wkb("LINESTRING EMPTY")), "non-point")
 })
 
 test_that("s2_latlng vectors can't have other types of objects concatenated or asssigned", {
@@ -81,7 +81,7 @@ test_that("s2_latlng can be imported from s2_geography", {
 test_that("s2_latlng can be imported from wkb", {
   wkb_point <- wk::as_wkb("POINT (-64 45)")
 
-  expect_identical(
+  expect_equal(
     as.data.frame(as_s2_latlng(wkb_point)),
     data.frame(lat = 45, lng = -64)
   )

tests/testthat/test-s2-transformers.R

@@ -311,12 +311,9 @@ test_that("s2_snap_to_grid() works", {
 })
 
 test_that("s2_buffer() works", {
-  ply <- s2_buffer_cells("POINT (0 0)", distance = 1, radius = 180 / pi)
-  box <- wk::wkb_ranges(wk::as_wkb(ply))
-  expect_near(box$xmin, -1, epsilon = 0.002)
-  expect_near(box$ymin, -1, epsilon = 0.002)
-  expect_near(box$xmax, 1, epsilon = 0.002)
-  expect_near(box$ymax, 1, epsilon = 0.002)
+  # create a hemisphere!
+  ply <- s2_buffer_cells("POINT (0 0)", distance = pi / 2, radius = 1)
+  expect_near(s2_area(ply, radius = 1), 4 * pi / 2, epsilon = 0.1)
 })
 
 test_that("real data survives the S2BooleanOperation", {