Skip to content

Commit

Permalink
CRAN check output polish
Browse files Browse the repository at this point in the history
  • Loading branch information
edzer committed Sep 3, 2024
1 parent e5bce2e commit 45db040
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion R/read.R
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ abbreviate_shapefile_names = function(x) {
#' When deleting layers or data sources is not successful, no error is emitted.
#' \code{delete_dsn} and \code{delete_layer} should be
#' handled with care; the former may erase complete directories or databases.
#' @seealso \link{st_drivers}, \link{dbWriteTable}
#' @seealso \link{st_drivers}, \link[DBI]{dbWriteTable}
#' @return \code{obj}, invisibly
#' @examples
#' nc = st_read(system.file("shape/nc.shp", package="sf"))
Expand Down
2 changes: 1 addition & 1 deletion man/st_write.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/aggregate.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## IGNORE_RDIFF_BEGIN
library(sf)
## IGNORE_RDIFF_END
# aggregate
pl1 = st_polygon(list(rbind(c(0,0),c(1,0),c(1,1),c(0,0))))
pl2 = st_polygon(list(rbind(c(0,0),c(1,1),c(0,1),c(0,0))))
Expand Down
10 changes: 6 additions & 4 deletions tests/aggregate.Rout.save
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

R version 4.3.3 (2024-02-29) -- "Angel Food Cake"
R version 4.4.1 (2024-06-14) -- "Race for Your Life"
Copyright (C) 2024 The R Foundation for Statistical Computing
Platform: x86_64-pc-linux-gnu (64-bit)
Platform: x86_64-pc-linux-gnu

R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
Expand All @@ -15,8 +15,10 @@ Type 'demo()' for some demos, 'help()' for on-line help, or
'help.start()' for an HTML browser interface to help.
Type 'q()' to quit R.

> ## IGNORE_RDIFF_BEGIN
> library(sf)
Linking to GEOS 3.12.1, GDAL 3.8.4, PROJ 9.3.1; sf_use_s2() is TRUE
Linking to GEOS 3.12.1, GDAL 3.8.4, PROJ 9.4.0; sf_use_s2() is TRUE
> ## IGNORE_RDIFF_END
> # aggregate
> pl1 = st_polygon(list(rbind(c(0,0),c(1,0),c(1,1),c(0,0))))
> pl2 = st_polygon(list(rbind(c(0,0),c(1,1),c(0,1),c(0,0))))
Expand Down Expand Up @@ -109,4 +111,4 @@ CRS: NA
>
> proc.time()
user system elapsed
0.803 1.204 0.503
0.603 1.335 0.528
2 changes: 2 additions & 0 deletions tests/sfc.R
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ x = st_sfc(st_point(c(-90,35)), st_point(c(-80,36)),
crs = "+proj=longlat +datum=NAD27")
y = st_transform(x, 3857)

## IGNORE_RDIFF_BEGIN
sf_extSoftVersion()[1:3]
## IGNORE_RDIFF_END

# Ops.sfc:
ls = st_sfc(st_linestring(rbind(c(0,0),c(0,1))))
Expand Down
6 changes: 4 additions & 2 deletions tests/sfc.Rout.save
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,11 @@ use `st_zm(...)` to coerce to XY dimensions
+ crs = "+proj=longlat +datum=NAD27")
> y = st_transform(x, 3857)
>
> ## IGNORE_RDIFF_BEGIN
> sf_extSoftVersion()[1:3]
GEOS GDAL proj.4
"3.12.1" "3.8.4" "9.3.1"
"3.12.1" "3.8.4" "9.4.0"
> ## IGNORE_RDIFF_END
>
> # Ops.sfc:
> ls = st_sfc(st_linestring(rbind(c(0,0),c(0,1))))
Expand Down Expand Up @@ -1134,4 +1136,4 @@ Geodetic CRS: WGS 84
>
> proc.time()
user system elapsed
5.158 1.450 5.100
5.265 1.459 5.340
2 changes: 2 additions & 0 deletions tests/spatstat.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
suppressPackageStartupMessages(library(sf))
## IGNORE_RDIFF_BEGIN
if (require(spatstat.random, quietly = TRUE)) {
## IGNORE_RDIFF_END

data(chicago)
st_as_sf(chicago)
Expand Down

0 comments on commit 45db040

Please sign in to comment.