CRAN check tidying

.Rbuildignore

@@ -23,3 +23,4 @@ vignettes.awk
 _pkgdown.yml
 docs
 pkgdown
+^changes*txt

R/read.R

@@ -79,13 +79,13 @@ set_utf8 = function(x) {
 #' data sources) directly from zip files can be done by prepending the path 
 #' with \code{/vsizip/}. This is part of the GDAL Virtual File Systems interface
 #' that also supports .gz, curl, and other operations, including chaining; see
-#' \url{https://gdal.org/user/virtual_file_systems.html} for a complete
+#' \url{https://gdal.org/en/latest/user/virtual_file_systems.html} for a complete
 #' description and examples.
 #'
 #' For \code{query} with a character \code{dsn} the query text is handed to
 #' 'ExecuteSQL' on the GDAL/OGR data set and will result in the creation of a
 #' new layer (and \code{layer} is ignored). See 'OGRSQL'
-#' \url{https://gdal.org/user/ogr_sql_dialect.html} for details. Please note that the
+#' \url{https://gdal.org/en/latest/user/ogr_sql_dialect.html} for details. Please note that the
 #' 'FID' special field is driver-dependent, and may be either 0-based (e.g. ESRI
 #' Shapefile), 1-based (e.g. MapInfo) or arbitrary (e.g. OSM). Other features of
 #' OGRSQL are also likely to be driver dependent. The available layer names may
@@ -405,7 +405,7 @@ abbreviate_shapefile_names = function(x) {
 #'   is missing, the \code{basename} of \code{dsn} is taken.
 #' @param driver character; name of driver to be used; if missing and \code{dsn} is not a Database Connection, a driver name is guessed from \code{dsn};
 #' \code{st_drivers()} returns the drivers that are available with their properties; links to full driver documentation
-#' are found at \url{https://gdal.org/drivers/vector/index.html}
+#' are found at \url{https://gdal.org/en/latest/drivers/vector/index.html}
 #' @param ... other arguments passed to \link[DBI]{dbWriteTable} when \code{dsn} is a
 #' Database Connection
 #' @param dataset_options character; driver dependent dataset creation options;
@@ -625,7 +625,7 @@ write_sf <- function(..., quiet = TRUE, append = FALSE, delete_layer = !append)
 #'   readable, and which may be written. The field `vsi` refers to the driver's
 #'   capability to read/create datasets through the VSI*L API. [See GDAL website
 #'   for additional details on driver
-#'   support](https://gdal.org/drivers/vector/index.html).
+#'   support](https://gdal.org/en/latest/drivers/vector/index.html)
 #' @return A `data.frame` with driver metadata.
 #' @export
 #' @md

tests/spatstat.R

@@ -1,7 +1,6 @@
 suppressPackageStartupMessages(library(sf))
 ## IGNORE_RDIFF_BEGIN
 if (require(spatstat.random, quietly = TRUE)) {
-## IGNORE_RDIFF_END
 
 data(chicago)
 st_as_sf(chicago)
@@ -110,3 +109,4 @@ as.psp(sf, marks = 5:1)
 (y = st_as_sfc(as.psp(sf)))
 all.equal(st_geometry(x), y)
 }
+## IGNORE_RDIFF_END

tests/spatstat.Rout.save

@@ -16,6 +16,7 @@ Type 'demo()' for some demos, 'help()' for on-line help, or
 Type 'q()' to quit R.
 
 > suppressPackageStartupMessages(library(sf))
+> ## IGNORE_RDIFF_BEGIN
 > if (require(spatstat.random, quietly = TRUE)) {
 + 
 + data(chicago)
@@ -163,7 +164,8 @@ Error : Only projected coordinates may be converted to spatstat class objects
 Warning message:
 In st_as_sfc.owin(spatstat.geom::as.owin(x)) :
   The spatstat object has an measurement unit multiplier != 1. Consider rescaling before converting.
+> ## IGNORE_RDIFF_END
 > 
 > proc.time()
    user  system elapsed 
-  1.815   1.456   1.762 
+  1.768   1.389   1.788 

vignettes/sf1.Rmd

@@ -492,7 +492,7 @@ write_sf(nc, "nc.shp") # silently overwrites
 The `dsn` and `layer` arguments to `st_read()` and `st_write()`
 denote a data source name and optionally a layer name.  Their exact
 interpretation as well as the options they support vary per driver,
-the [GDAL driver documentation](https://gdal.org/drivers/vector/index.html)
+the [GDAL driver documentation](https://gdal.org/en/latest/drivers/vector/index.html)
 is best consulted for this.  For instance, a PostGIS table in
 database `postgis` might be read by:
 

vignettes/sf2.Rmd

@@ -217,7 +217,7 @@ st_write(st_as_sf(meuse), "PG:dbname=postgis", "meuse",
 
 In case the table exists and the option is not specified, the driver
 will give an error. Driver-specific options are documented in the
-driver manual of [gdal](https://gdal.org/drivers/vector/index.html).
+driver manual of [gdal](https://gdal.org/en/latest/drivers/vector/index.html).
 Multiple options can be given by multiple strings in `options`.
 
 For `st_read()`, there is only `options`; for `st_write()`, one needs