diff --git a/R/read.R b/R/read.R index 26d407457..80fde11f0 100644 --- a/R/read.R +++ b/R/read.R @@ -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")) diff --git a/man/st_write.Rd b/man/st_write.Rd index b28ee2e10..7d8455705 100644 --- a/man/st_write.Rd +++ b/man/st_write.Rd @@ -136,5 +136,5 @@ if (require(sp, quietly = TRUE)) { } } \seealso{ -\link{st_drivers}, \link{dbWriteTable} +\link{st_drivers}, \link[DBI]{dbWriteTable} } diff --git a/tests/aggregate.R b/tests/aggregate.R index 723f8f238..b74240e14 100644 --- a/tests/aggregate.R +++ b/tests/aggregate.R @@ -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)))) diff --git a/tests/aggregate.Rout.save b/tests/aggregate.Rout.save index 1eb10078d..ae9cea372 100644 --- a/tests/aggregate.Rout.save +++ b/tests/aggregate.Rout.save @@ -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. @@ -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)))) @@ -109,4 +111,4 @@ CRS: NA > > proc.time() user system elapsed - 0.803 1.204 0.503 + 0.603 1.335 0.528 diff --git a/tests/sfc.R b/tests/sfc.R index a0e082972..855160f8f 100644 --- a/tests/sfc.R +++ b/tests/sfc.R @@ -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)))) diff --git a/tests/sfc.Rout.save b/tests/sfc.Rout.save index 6134b2f4f..8e65da67d 100644 --- a/tests/sfc.Rout.save +++ b/tests/sfc.Rout.save @@ -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)))) @@ -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 diff --git a/tests/spatstat.R b/tests/spatstat.R index e4ffd930a..d9fa1dfff 100644 --- a/tests/spatstat.R +++ b/tests/spatstat.R @@ -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)