Merge branch 'main' into pointx

Author: edzer

.Rbuildignore

@@ -22,3 +22,4 @@ NOTES
 ^tic\.R$
 vignettes.awk
 ^\.gitattributes$
+_pkgdown.yml

.github/workflows/tic-db.yml

@@ -69,18 +69,18 @@ jobs:
       # set date/week for use in cache creation
       # https://github.community/t5/GitHub-Actions/How-to-set-and-access-a-Workflow-variable/m-p/42970
       # - cache R packages daily
-      - name: "[Cache] Prepare daily timestamp for cache"
-        if: runner.os != 'Windows'
-        id: date
-        run: echo "::set-output name=date::$(date '+%d-%m')"
-
-      - name: "[Cache] Cache R packages"
-        if: runner.os != 'Windows'
-        uses: pat-s/always-upload-cache@v2
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{steps.date.outputs.date}}
-          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-${{steps.date.outputs.date}}
+#     - name: "[Cache] Prepare daily timestamp for cache"
+#       if: runner.os != 'Windows'
+#       id: date
+#       run: echo "::set-output name=date::$(date '+%d-%m')"
+
+#     - name: "[Cache] Cache R packages"
+#       if: runner.os != 'Windows'
+#       uses: pat-s/always-upload-cache@v2
+#       with:
+#         path: ${{ env.R_LIBS_USER }}
+#         key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{steps.date.outputs.date}}
+#         restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-${{steps.date.outputs.date}}
 
       - name: "[Stage] [Linux] Install required system libs"
         if: runner.os == 'Linux'

NEWS.md

@@ -1,5 +1,11 @@
 # version 1.0-13
 
+* fix many lintr suggestions, thanks go Michael Chirico (#2181 - #2191)
+
+* `gdal_utils()` adds `"ogrinfo"` utility (requires GDAL >= 3.7.0); #2160
+
+* `st_as_sf()` catches errors when setting invalid crs values, raised by Jon Skøien
+
 * add `rename_with.sf()` method; #1472
 
 * use GEOS' overlayNG routines for (GEOS) Intersection, Difference, Union and SymDifference; #2143

R/RcppExports.R

@@ -117,6 +117,10 @@ CPL_gdalinfo <- function(obj, options, oo, co) {
     .Call(`_sf_CPL_gdalinfo`, obj, options, oo, co)
 }
 
+CPL_ogrinfo <- function(obj, options, oo, co) {
+    .Call(`_sf_CPL_ogrinfo`, obj, options, oo, co)
+}
+
 CPL_gdaladdo <- function(obj, method, overviews, bands, oo, co, clean = FALSE, read_only = FALSE) {
     .Call(`_sf_CPL_gdaladdo`, obj, method, overviews, bands, oo, co, clean, read_only)
 }
@@ -329,8 +333,8 @@ CPL_proj_info <- function(type) {
     .Call(`_sf_CPL_proj_info`, type)
 }
 
-CPL_xy2sfc <- function(cc, dim, to_points, which) {
-    .Call(`_sf_CPL_xy2sfc`, cc, dim, to_points, which)
+CPL_xy2sfc <- function(cc, dim, to_points, which, cc_has_NAs) {
+    .Call(`_sf_CPL_xy2sfc`, cc, dim, to_points, which, cc_has_NAs)
 }
 
 sfc_is_null <- function(sfc) {
@@ -399,5 +403,5 @@ CPL_get_m_range <- function(sf, depth) {
 
 # Register entry points for exported C++ functions
 methods::setLoadAction(function(ns) {
-    .Call(`_sf_RcppExport_registerCCallable`)
+    .Call('_sf_RcppExport_registerCCallable', PACKAGE = 'sf')
 })

R/agr.R

@@ -92,5 +92,5 @@ summarize_agr = function(x) {
 
 all_constant = function(x) {
 	x = attr(x, "agr")
-	!(any(is.na(x)) || any(!(x %in% c("identity", "constant"))))
+	!anyNA(x) && all(x %in% c("identity", "constant"))
 }

R/bbox.R

@@ -5,7 +5,7 @@
 is.na.bbox = function(x) identical(x, NA_bbox_)
 
 bb_wrap = function(bb) {
-	stopifnot(is.numeric(bb) && length(bb) == 4)
+	stopifnot(is.numeric(bb), length(bb) == 4)
 	structure(as.double(bb), names = c("xmin", "ymin", "xmax", "ymax"), class = "bbox")
 }
 

R/break_antimeridian.R

@@ -31,7 +31,7 @@
 #' }
 st_break_antimeridian = function(x, lon_0=0, tol=0.0001, ...) {
 	ll = st_is_longlat(x)
-	if (!ll | is.na(ll))
+	if (!isTRUE(ll))
 		stop("'st_break_antimeridian' requires non-projected geographic coordinates",
 			 call. = FALSE)
 
@@ -100,7 +100,7 @@ st_within_pm180 <- function(x, tol=0.0001) {
         xcrs = st_crs(x)
         xnames = names(x)
 	xnames = xnames[grep(attr(x, "sf_column"), xnames, invert=TRUE)]
-	x$st_within_pm180_ID = as.character(1:nrow(x))
+	x$st_within_pm180_ID = as.character(seq_len(nrow(x)))
         s2_status = sf_use_s2()
 	sf_use_s2(FALSE) # avoid s2 because we need a planar bounding box
 	bb0 = st_bbox(x)

R/crs.R

@@ -61,7 +61,10 @@ st_crs.sf = function(x, ...) st_crs(st_geometry(x), ...)
 #' @name st_crs
 #' @export
 st_crs.numeric = function(x, ...) {
-    make_crs(paste0("EPSG:", x))
+	if (is.na(x))
+		NA_crs_
+	else
+    	make_crs(paste0("EPSG:", x))
 }
 
 
@@ -332,7 +335,7 @@ crs_parameters = function(x) {
 epsg = function(x) {
 	if (is.na(x))
 		NA_integer_
-	else if (grepl("^EPSG:", x[["input"]]))
+	else if (startsWith(x[["input"]], "EPSG:"))
 		as.integer(gsub("^EPSG:(\\d+)\\b.*$", "\\1", x[["input"]]))
 	else
 		crs_parameters(x)[["epsg"]]

R/db.R

@@ -192,7 +192,7 @@ schema_table <- function(conn, table, public = "public") {
 	else if (length(table) > 2)
 		stop("table cannot be longer than 2 (schema, table)", call. = FALSE)
 
-	if (any(is.na(table)))
+	if (anyNA(table))
 		stop("table and schema cannot be NA", call. = FALSE)
 
 	return(table)
@@ -242,7 +242,7 @@ db_find_srid = function(conn, crs_local = st_crs(srid), srid = epsg(crs_local),
     }
     crs_found <- st_crs(db_crs[["srtext"]])
     crs_found[["input"]] <- build_epsg(srid)
-    if(validate && crs_found != crs_local & !is.na(crs_local)) {
+    if(validate && crs_found != crs_local && !is.na(crs_local)) {
     	# TODO: pretty print db_spatial_ref
         warning("Local crs different from database crs. You can inspect the ",
                 "database crs using `dbReadtable(conn, \"spatial_ref_sys\")` ",

R/gdal_utils.R

@@ -23,7 +23,7 @@ resampling_method = function(option = "near") {
 
 #' Native interface to gdal utils
 #' @name gdal_utils
-#' @param util character; one of \code{info}, \code{warp}, \code{rasterize}, \code{translate}, \code{vectortranslate} (for ogr2ogr), \code{buildvrt}, \code{demprocessing}, \code{nearblack}, \code{grid}, \code{mdiminfo} and \code{mdimtranslate} (the last two requiring GDAL 3.1)
+#' @param util character; one of \code{info}, \code{warp}, \code{rasterize}, \code{translate}, \code{vectortranslate} (for ogr2ogr), \code{buildvrt}, \code{demprocessing}, \code{nearblack}, \code{grid}, \code{mdiminfo} and \code{mdimtranslate} (the last two requiring GDAL 3.1), \code{ogrinfo} (requiring GDAL 3.7)
 #' @param source character; name of input layer(s); for \code{warp}, \code{buidvrt} or \code{mdimtranslate} this can be more than one
 #' @param destination character; name of output layer
 #' @param options character; options for the utility
@@ -38,7 +38,7 @@ resampling_method = function(option = "near") {
 #'
 #' if (sf_extSoftVersion()["GDAL"] > "2.1.0") {
 #' # info utils can be used to list information about about a raster
-#' # dataset. More info: https://gdal.org/programs/gdalinfo.html
+#' # dataset. More info: https://gdal.org/programs/ngdalinfo.html
 #' in_file <- system.file("tif/geomatrix.tif", package = "sf")
 #' gdal_utils("info", in_file, options = c("-mm", "-proj4"))
 #'
@@ -73,7 +73,8 @@ resampling_method = function(option = "near") {
 #' st_read(in_file)
 #' }
 gdal_utils = function(util = "info", source, destination, options = character(0),
-		quiet = !(util %in% c("info", "mdiminfo")) || ("-multi" %in% options),
+		quiet = !(util %in% c("info", "gdalinfo", "ogrinfo", "vectorinfo", 
+							  "mdiminfo")) || ("-multi" %in% options),
 		processing = character(0), colorfilename = character(0),
 		config_options = character(0)) {
 
@@ -101,7 +102,8 @@ gdal_utils = function(util = "info", source, destination, options = character(0)
 	quiet = as.logical(quiet)
 
 	ret = switch(util,
-			info = CPL_gdalinfo(if (missing(source)) character(0) else source, options, oo, config_options),
+			gdalinfo =, info = CPL_gdalinfo(if (missing(source)) character(0) else source, options, oo, config_options),
+			vectorinfo =, ogrinfo = CPL_ogrinfo(if (missing(source)) character(0) else source, options, oo, config_options),
 			warp = CPL_gdalwarp(source, destination, options, oo, doo, config_options, quiet, "-overwrite" %in% options),
 			warper = CPL_gdal_warper(source, destination, as.integer(resampling_method(options)),
 				oo, doo, config_options, quiet), # nocov
@@ -112,7 +114,7 @@ gdal_utils = function(util = "info", source, destination, options = character(0)
 			}, # nocov end
 			translate = CPL_gdaltranslate(source, destination, options, oo, config_options, quiet),
 			vectortranslate = CPL_gdalvectortranslate(source, destination, options, oo, doo, config_options, quiet),
-			buildvrt = CPL_gdalbuildvrt(source, destination, options, oo, config_options, quiet),
+			buildvrt = CPL_gdalbuildvrt(if (missing(source)) character(0) else source, destination, options, oo, config_options, quiet),
 			demprocessing = CPL_gdaldemprocessing(source, destination, options, processing, colorfilename, oo, config_options, quiet),
 			nearblack = CPL_gdalnearblack(source, destination, options, oo, config_options, doo, quiet),
 			grid = CPL_gdalgrid(source, destination, options, oo, config_options, quiet),
@@ -121,7 +123,7 @@ gdal_utils = function(util = "info", source, destination, options = character(0)
 			stop(paste("unknown util value for gdal_utils:", util))
 		)
 
-	if (util %in% c("info", "mdiminfo")) {
+	if (util %in% c("info", "gdalinfo", "ogrinfo", "vectorinfo", "mdiminfo")) {
 		if (! quiet)
 			cat(ret)
 		invisible(ret)