use compareVersion() everywhere

fixes #2512

Author: edzer

R/crs.R

@@ -187,8 +187,8 @@ make_crs = function(x) {
 		x
 	else if (is.character(x)) {
 		if (grepl("+init=epsg:", x) &&
-				sf_extSoftVersion()[["proj.4"]] >= "6.0.0" &&
-				sf_extSoftVersion()[["proj.4"]] < "6.3.1") { # nocov start FIXME:
+				compareVersion(sf_extSoftVersion()[["proj.4"]], "6.0.0") >= 0 &&
+				compareVersion(sf_extSoftVersion()[["proj.4"]], "6.3.1") < 0) { # nocov start FIXME:
 			x = strsplit(x, " ")[[1]]
 			if (length(x) > 1)
 				warning(paste("the following proj4string elements are ignored:",
@@ -361,7 +361,7 @@ st_as_text.crs = function(x, ..., projjson = FALSE, pretty = FALSE) {
 	if (is.na(x))
 		NA_character_
 	else if (projjson) {
-		if (sf_extSoftVersion()["GDAL"] < "3.1.0" || sf_extSoftVersion()["proj.4"] < "6.2.0")
+		if (compareVersion(sf_extSoftVersion()["GDAL"], "3.1.0") == -1 || compareVersion(sf_extSoftVersion()["proj.4"], "6.2.0") == -1)
 			stop("ProjJson requires GDAL >= 3.1.0 and PROJ >= 6.2.0")
 		crs_parameters(x)$ProjJson
 	} else { # wkt:
@@ -504,7 +504,7 @@ st_crs.Spatial = function(x, ...) {
 #' st_axis_order() # query default: FALSE means interpret pt as (longitude latitude)
 #' st_transform(pt, 3857)[[1]]
 #' old_value = FALSE
-#' if (sf_extSoftVersion()["GDAL"] >= "2.5.0")
+#' if (compareVersion(sf_extSoftVersion()["GDAL"], "2.5.0") >= 0)
 #'    (old_value = st_axis_order(TRUE))
 #' # now interpret pt as (latitude longitude), as EPSG:4326 prescribes:
 #' st_axis_order() # query current value

R/gdal_utils.R

@@ -37,7 +37,7 @@ resampling_method = function(option = "near") {
 #' @seealso \link{gdal_addo} for adding overlays to a raster file; \link{st_layers} to query geometry type(s) and crs from layers in a (vector) data source
 #' @examples
 #'
-#' if (sf_extSoftVersion()["GDAL"] > "2.1.0") {
+#' if (compareVersion(sf_extSoftVersion()["GDAL"], "2.1.0") == 1) {
 #' # info utils can be used to list information about a raster
 #' # dataset. More info: https://gdal.org/programs/gdalinfo.html
 #' in_file <- system.file("tif/geomatrix.tif", package = "sf")

R/proj.R

@@ -58,7 +58,7 @@ sf_project = function(from = character(0), to = character(0), pts, keep = FALSE,
 		stop("'keep' must be single-length non-NA logical value")
 	proj_from_crs = function(x) {
 		if (inherits(x, "crs")) {
-			x = if (sf_extSoftVersion()["proj.4"] >= "6.0.0")
+			x = if (compareVersion(sf_extSoftVersion()["proj.4"], "6.0.0") >= 0)
 				x$wkt
 			else
 				x$proj4string

R/sample.R

@@ -52,13 +52,13 @@ st_sample = function(x, size, ...) UseMethod("st_sample")
 #' plot(p2, add = TRUE, pch = 2)
 #' x = st_sfc(st_polygon(list(rbind(c(0,0),c(90,0),c(90,90),c(0,90),c(0,0)))), crs = st_crs(4326))
 #' plot(x, axes = TRUE, graticule = TRUE)
-#' if (sf_extSoftVersion()["proj.4"] >= "4.9.0")
+#' if (compareVersion(sf_extSoftVersion()["proj.4"], "4.9.0") >= 0)
 #'   plot(p <- st_sample(x, 1000), add = TRUE)
 #' if (require(lwgeom, quietly = TRUE)) { # for st_segmentize()
 #'   x2 = st_transform(st_segmentize(x, 1e4), st_crs("+proj=ortho +lat_0=30 +lon_0=45"))
 #'   g = st_transform(st_graticule(), st_crs("+proj=ortho +lat_0=30 +lon_0=45"))
 #'   plot(x2, graticule = g)
-#'   if (sf_extSoftVersion()["proj.4"] >= "4.9.0") {
+#'   if (compareVersion(sf_extSoftVersion()["proj.4"], "4.9.0") >= 0) {
 #'     p2 = st_transform(p, st_crs("+proj=ortho +lat_0=30 +lon_0=45"))
 #'     plot(p2, add = TRUE)
 #'   }
@@ -72,7 +72,7 @@ st_sample = function(x, size, ...) UseMethod("st_sample")
 #' x = st_sfc(st_polygon(list(rbind(c(-180,-90),c(180,-90),c(180,90),c(-180,90),c(-180,-90)))),
 #'	 crs=st_crs(4326))
 #' # FIXME:
-#' #if (sf_extSoftVersion()["proj.4"] >= "4.9.0") {
+#' #if (compareVersion(sf_extSoftVersion()["proj.4"], "4.9.0") >= 0) {
 #' #  p = st_sample(x, 1000)
 #' #  st_sample(p, 3)
 #' #}

R/transform.R

@@ -89,7 +89,7 @@ st_transform = function(x, crs, ...) UseMethod("st_transform")
 #' @export
 #' @examples
 #' st_transform(st_sf(a=2:1, geom=sfc), "EPSG:3857")
-#' if (sf_extSoftVersion()["GDAL"] >= "3.0.0") {
+#' if (compareVersion(sf_extSoftVersion()["GDAL"], "3.0.0") >= 0) {
 #'   st_transform(sfc, pipeline =
 #' 	  "+proj=pipeline +step +proj=axisswap +order=2,1") # reverse axes
 #'   st_transform(sfc, pipeline =
@@ -170,7 +170,7 @@ st_transform.sfg = function(x, crs = st_crs(x), ...) {
 #' @param densify integer, number of points for discretizing lines between bounding box corner points; see Details
 #' @details the method for `bbox` objects densifies lines for geographic coordinates along Cartesian lines, not great circle arcs
 st_transform.bbox = function(x, crs, ..., densify = 21) {
-        if (sf_extSoftVersion()["GDAL"] >= "3.4.0")
+        if (compareVersion(sf_extSoftVersion()["GDAL"], "3.4.0") >= 0)
 		st_bbox(CPL_transform_bounds(x, st_crs(crs), densify), crs = crs)
 	else
 		stop("method not available for GDAL: ", sf_extSoftVersion()["GDAL"])