Merge pull request #91 from r-spatial/dewey-dev

Release checks

Author: paleolimbot

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: s2
 Title: Spherical Geometry Operators Using the S2 Geometry Library
-Version: 1.0.3.9000
+Version: 1.0.4
 Authors@R: c(
      person(given = "Dewey",
            family = "Dunnington",

NEWS.md

@@ -1,4 +1,6 @@
-# s2 (development version)
+# s2 1.0.4
+
+* Fixed errors that resulted from compilation on clang 12.2 (#88, #89).
 
 # s2 1.0.3
 

README.Rmd

@@ -22,8 +22,7 @@ knitr::opts_chunk$set(
 [![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.
-This package is a complete rewrite of an earlier CRAN package s2 with versions up 
+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. 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
@@ -56,14 +55,14 @@ s2_contains(
 )
 ```
 
-The [sf package](https://r-spatial.github.io/sf/) will soon support s2 natively, but s2 can also read well-known text and well-known binary:
+The [sf package](https://r-spatial.github.io/sf/) uses s2 for geographic coordinates with `sf::sf_use_s2(TRUE)`, and will become the default after sf version 1.0.0. The sf package also supports creating s2 vectors using `as_s2_geography()`:
 
 ```{r, warning=FALSE, message = FALSE}
 library(dplyr)
 library(sf)
 
 nc_s2 <- read_sf(system.file("shape/nc.shp", package = "sf")) %>% 
-  mutate(geometry = s2_geog_from_wkb(st_as_binary(geometry))) %>% 
+  mutate(geometry = as_s2_geography(geometry)) %>% 
   as_tibble() %>% 
   select(NAME, geometry)
 
@@ -107,5 +106,5 @@ nc_s2 %>%
 This project gratefully acknowledges financial [support](https://www.r-consortium.org/projects) from the
 
 <a href="https://www.r-consortium.org/projects/awarded-projects">
-<img src="http://pebesma.staff.ifgi.de/RConsortium_Horizontal_Pantone.png" width="300">
+<img src="man/figures/rc300.png" width="300" />
 </a>

README.md

@@ -56,32 +56,34 @@ s2_contains(
 #> [1] TRUE
 ```
 
-The [sf package](https://r-spatial.github.io/sf/) will soon support s2
-natively, but s2 can also read well-known text and well-known binary:
+The [sf package](https://r-spatial.github.io/sf/) uses s2 for geographic
+coordinates with `sf::sf_use_s2(TRUE)`, and will become the default
+after sf version 1.0.0. The sf package also supports creating s2 vectors
+using `as_s2_geography()`:
 
 ``` r
 library(dplyr)
 library(sf)
 
 nc_s2 <- read_sf(system.file("shape/nc.shp", package = "sf")) %>% 
-  mutate(geometry = s2_geog_from_wkb(st_as_binary(geometry))) %>% 
+  mutate(geometry = as_s2_geography(geometry)) %>% 
   as_tibble() %>% 
   select(NAME, geometry)
 
 nc_s2
 #> # A tibble: 100 x 2
 #>    NAME        geometry                                                         
 #>    <chr>       <s2_geography>                                                   
-#>  1 Ashe        <POLYGON ((-81.4529 36.2396, -81.431 36.2607, -81.4123 36.2673, …
-#>  2 Alleghany   <POLYGON ((-81.1767 36.4154, -81.1534 36.4247, -81.1384 36.4176,…
-#>  3 Surry       <POLYGON ((-80.453 36.2571, -80.4353 36.551, -80.6111 36.5573, -…
-#>  4 Currituck   <MULTIPOLYGON (((-75.9419 36.2943, -75.9575 36.2595, -75.9138 36…
-#>  5 Northampton <POLYGON ((-77.142 36.4171, -77.1393 36.4565, -77.1273 36.4707, …
-#>  6 Hertford    <POLYGON ((-76.7075 36.2661, -76.7413 36.3152, -76.9241 36.3924,…
-#>  7 Camden      <POLYGON ((-76.0173 36.3377, -76.0329 36.336, -76.044 36.3536, -…
-#>  8 Gates       <POLYGON ((-76.4604 36.3739, -76.5025 36.4523, -76.4983 36.5039,…
-#>  9 Warren      <POLYGON ((-78.1347 36.2366, -78.1096 36.2135, -78.0583 36.2113,…
-#> 10 Stokes      <POLYGON ((-80.0241 36.545, -80.0481 36.5471, -80.4353 36.551, -…
+#>  1 Ashe        <POLYGON ((-81.4528885 36.2395859, -81.4310379 36.2607193, -81.4…
+#>  2 Alleghany   <POLYGON ((-81.1766739 36.4154434, -81.1533661 36.4247398, -81.1…
+#>  3 Surry       <POLYGON ((-80.4530106 36.2570877, -80.4353104 36.5510445, -80.6…
+#>  4 Currituck   <MULTIPOLYGON (((-75.9419327 36.2943382, -75.9575119 36.2594528,…
+#>  5 Northampton <POLYGON ((-77.1419601 36.4170647, -77.1393204 36.4564781, -77.1…
+#>  6 Hertford    <POLYGON ((-76.7074966 36.2661324, -76.7413483 36.3151665, -76.9…
+#>  7 Camden      <POLYGON ((-76.0173492 36.3377304, -76.0328751 36.3359756, -76.0…
+#>  8 Gates       <POLYGON ((-76.46035 36.3738976, -76.5024643 36.4522858, -76.498…
+#>  9 Warren      <POLYGON ((-78.1347198 36.2365837, -78.1096268 36.2135086, -78.0…
+#> 10 Stokes      <POLYGON ((-80.0240555 36.5450249, -80.0480957 36.5471344, -80.4…
 #> # … with 90 more rows
 ```
 
@@ -96,16 +98,16 @@ nc_s2 %>%
 #> # A tibble: 100 x 4
 #>    NAME      geometry                                             area perimeter
 #>    <chr>     <s2_geography>                                      <dbl>     <dbl>
-#>  1 Ashe      <POLYGON ((-81.4529 36.2396, -81.431 36.2607, -…   1.14e9   141627.
-#>  2 Alleghany <POLYGON ((-81.1767 36.4154, -81.1534 36.4247, …   6.11e8   119876.
-#>  3 Surry     <POLYGON ((-80.453 36.2571, -80.4353 36.551, -8…   1.42e9   160458.
-#>  4 Currituck <MULTIPOLYGON (((-75.9419 36.2943, -75.9575 36.…   6.94e8   301644.
-#>  5 Northamp… <POLYGON ((-77.142 36.4171, -77.1393 36.4565, -…   1.52e9   211794.
-#>  6 Hertford  <POLYGON ((-76.7075 36.2661, -76.7413 36.3152, …   9.68e8   160780.
-#>  7 Camden    <POLYGON ((-76.0173 36.3377, -76.0329 36.336, -…   6.16e8   150430.
-#>  8 Gates     <POLYGON ((-76.4604 36.3739, -76.5025 36.4523, …   9.03e8   123170.
-#>  9 Warren    <POLYGON ((-78.1347 36.2366, -78.1096 36.2135, …   1.18e9   141073.
-#> 10 Stokes    <POLYGON ((-80.0241 36.545, -80.0481 36.5471, -…   1.23e9   140583.
+#>  1 Ashe      <POLYGON ((-81.4528885 36.2395859, -81.4310379 …   1.14e9   141627.
+#>  2 Alleghany <POLYGON ((-81.1766739 36.4154434, -81.1533661 …   6.11e8   119876.
+#>  3 Surry     <POLYGON ((-80.4530106 36.2570877, -80.4353104 …   1.42e9   160458.
+#>  4 Currituck <MULTIPOLYGON (((-75.9419327 36.2943382, -75.95…   6.94e8   301644.
+#>  5 Northamp… <POLYGON ((-77.1419601 36.4170647, -77.1393204 …   1.52e9   211794.
+#>  6 Hertford  <POLYGON ((-76.7074966 36.2661324, -76.7413483 …   9.68e8   160780.
+#>  7 Camden    <POLYGON ((-76.0173492 36.3377304, -76.0328751 …   6.16e8   150430.
+#>  8 Gates     <POLYGON ((-76.46035 36.3738976, -76.5024643 36…   9.03e8   123170.
+#>  9 Warren    <POLYGON ((-78.1347198 36.2365837, -78.1096268 …   1.18e9   141073.
+#> 10 Stokes    <POLYGON ((-80.0240555 36.5450249, -80.0480957 …   1.23e9   140583.
 #> # … with 90 more rows
 ```
 
@@ -117,7 +119,7 @@ nc_s2 %>%
 #> # A tibble: 1 x 2
 #>   NAME    geometry                                                              
 #>   <chr>   <s2_geography>                                                        
-#> 1 Catawba <POLYGON ((-80.9313 35.6196, -81.0036 35.6971, -81.0548 35.7134, -81.…
+#> 1 Catawba <POLYGON ((-80.9312744 35.6195908, -81.0035782 35.6970558, -81.054779…
 ```
 
 Use transformers to create new geometries:
@@ -128,16 +130,16 @@ nc_s2 %>%
 #> # A tibble: 100 x 2
 #>    NAME        geometry                                                         
 #>    <chr>       <s2_geography>                                                   
-#>  1 Ashe        <LINESTRING (-81.4529 36.2396, -81.431 36.2607, -81.4123 36.2673…
-#>  2 Alleghany   <LINESTRING (-81.1767 36.4154, -81.1534 36.4247, -81.1384 36.417…
-#>  3 Surry       <LINESTRING (-80.453 36.2571, -80.4353 36.551, -80.6111 36.5573,…
-#>  4 Currituck   <MULTILINESTRING ((-75.9419 36.2943, -75.9575 36.2595, -75.9138 …
-#>  5 Northampton <LINESTRING (-77.142 36.4171, -77.1393 36.4565, -77.1273 36.4707…
-#>  6 Hertford    <LINESTRING (-76.7075 36.2661, -76.7413 36.3152, -76.9241 36.392…
-#>  7 Camden      <LINESTRING (-76.0173 36.3377, -76.0329 36.336, -76.044 36.3536,…
-#>  8 Gates       <LINESTRING (-76.4604 36.3739, -76.5025 36.4523, -76.4983 36.503…
-#>  9 Warren      <LINESTRING (-78.1347 36.2366, -78.1096 36.2135, -78.0583 36.211…
-#> 10 Stokes      <LINESTRING (-80.0241 36.545, -80.0481 36.5471, -80.4353 36.551,…
+#>  1 Ashe        <LINESTRING (-81.4528885 36.2395859, -81.4310379 36.2607193, -81…
+#>  2 Alleghany   <LINESTRING (-81.1766739 36.4154434, -81.1533661 36.4247398, -81…
+#>  3 Surry       <LINESTRING (-80.4530106 36.2570877, -80.4353104 36.5510445, -80…
+#>  4 Currituck   <MULTILINESTRING ((-75.9419327 36.2943382, -75.9575119 36.259452…
+#>  5 Northampton <LINESTRING (-77.1419601 36.4170647, -77.1393204 36.4564781, -77…
+#>  6 Hertford    <LINESTRING (-76.7074966 36.2661324, -76.7413483 36.3151665, -76…
+#>  7 Camden      <LINESTRING (-76.0173492 36.3377304, -76.0328751 36.3359756, -76…
+#>  8 Gates       <LINESTRING (-76.46035 36.3738976, -76.5024643 36.4522858, -76.4…
+#>  9 Warren      <LINESTRING (-78.1347198 36.2365837, -78.1096268 36.2135086, -78…
+#> 10 Stokes      <LINESTRING (-80.0240555 36.5450249, -80.0480957 36.5471344, -80…
 #> # … with 90 more rows
 ```
 
@@ -175,5 +177,4 @@ This project gratefully acknowledges financial
 [support](https://www.r-consortium.org/projects) from the
 
 <a href="https://www.r-consortium.org/projects/awarded-projects">
-<img src="http://pebesma.staff.ifgi.de/RConsortium_Horizontal_Pantone.png" width="300">
-</a>
+<img src="man/figures/rc300.png" width="300" /> </a>