Use [[ for sf_extSoftVersion() access

Author: olivroy

tests/sfc.R

@@ -200,7 +200,7 @@ p <- st_sample(x, 10)
 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") # lwgeom breaks on this
+# if (sf_extSoftVersion()[["proj.4"]] >= "4.9.0") # lwgeom breaks on this
 #   (p <- st_sample(x, 10))
 pt = st_multipoint(matrix(1:20,,2))
 st_sample(p, 3)

tests/testthat/test_crs.R

@@ -41,18 +41,18 @@ test_that("sf_proj_info works", {
 })
 
 test_that("sf_proj_info works for datum files", {
-  skip_if_not(sf_extSoftVersion()[["proj.4"]] < "6.0.0")
+  skip_if(sf_extSoftVersion()[["proj.4"]] >= "6.0.0")
   expect_silent(x <- sf_proj_info("have_datum_files"))
 })
 
 test_that("$.crs works", {
-  skip_if_not(sf_extSoftVersion()[["proj.4"]] < "6.0.0")
+  skip_if(sf_extSoftVersion()[["proj.4"]] >= "6.0.0")
   expect_false(is.null(st_crs("+init=epsg:3857")$epsg))
   expect_type(st_crs("+init=epsg:3857")$proj4string, "character")
 })
 
 test_that("$.crs works with +units", {
-  skip_if_not(sf_extSoftVersion()[["proj.4"]] < "6.0.0")
+  skip_if(sf_extSoftVersion()[["proj.4"]] >= "6.0.0")
   expect_type(st_crs("+init=epsg:3857 +units=m")$b, "double") 
   expect_type(st_crs("+init=epsg:3857 +units=m")$units, "character")
 })

tests/testthat/test_gdal.R

@@ -12,15 +12,15 @@ test_that("st_transform works", {
   #attr(s2.tr, "crs")$proj4string = ""
   st_crs(s1.tr) = NA_crs_
 #  st_crs(s2.tr) = NA_crs_
-#  if (sf_extSoftVersion()["proj.4"] < "5.0.0") # FIXME:
+#  if (sf_extSoftVersion()[["proj.4"]] < "5.0.0") # FIXME:
 #    expect_equal(s1.tr, s2.tr)
 
   toCrs = 3857
   s1.tr = st_transform(s, toCrs)
   #attr(s1.tr, "crs")$proj4string = ""
   st_crs(s1.tr) = NA_crs_
 #  st_crs(s2.tr) = NA_crs_
-#  if (sf_extSoftVersion()["proj.4"] < "5.0.0") # FIXME:
+#  if (sf_extSoftVersion()[["proj.4"]] < "5.0.0") # FIXME:
 #    expect_equal(s1.tr, s2.tr)
 
   expect_silent({
@@ -42,8 +42,8 @@ test_that("st_wrap_dateline works", {
 })
 
 test_that('gdal_subdatasets works', {
-  skip_if_not(sf_extSoftVersion()[["GDAL"]] >= "2.1.0")
-  skip_if_not(sf_extSoftVersion()[["GDAL"]] < "2.5.0") # FIXME:
+  skip_if(sf_extSoftVersion()[["GDAL"]] < "2.1.0")
+  skip_if(sf_extSoftVersion()[["GDAL"]] >= "2.5.0") # FIXME:
   skip_on_os("mac") # FIXME:
   fname = system.file("nc/cropped.nc", package = "sf")
   sd2 = gdal_subdatasets(fname)[[2]]

tests/testthat/test_geos.R

@@ -172,7 +172,7 @@ test_that("st_difference works with partially overlapping geometries", {
 	pl3 = st_polygon(list(matrix(c(0, 1.25, 2, 1.25, 1, 2.5, 0, 1.25), byrow = TRUE, ncol = 2)))
 	in1 = st_sfc(list(pl1, pl2, pl3))
 	in2 = st_sf(order = c("A", "B", "C"), geometry = st_sfc(list(pl1, pl2, pl3), crs = 4326), agr = "constant")
-	if (package_version(gsub("[a-zA-Z]", "", sf_extSoftVersion()["GEOS"])) < "3.9.0") {
+	if (package_version(gsub("[a-zA-Z]", "", sf_extSoftVersion()[["GEOS"]])) < "3.9.0") {
 		correct_geom = st_sfc(list(
 		st_polygon(list(matrix(c(0, 2, 1, 0, 0, 0, 1, 0), ncol = 2))),
 		st_polygon(list(matrix(c(0.5, 0, 1, 2, 1.5, 1, 0.5, 0.5, 0.5, 1.5, 0.5, 0.5, 1, 0.5), ncol = 2))),

tests/testthat/test_sp.R

@@ -24,7 +24,7 @@ test_that("we can convert points & lines to and from sp objects", {
 
 test_that("we can convert SpatialPolygons objects without SF comments to sfc and back", {
   skip_if_not_installed("sp")
-  # skip_if_not(package_version(sf_extSoftVersion()["GEOS"]) >= "3.11.0"); #2079
+  # skip_if_not(package_version(sf_extSoftVersion()[["GEOS"]]) >= "3.11.0"); #2079
   library(sp)
 # nested holes https://github.com/r-spatial/evolution/issues/9
   p1 <- Polygon(cbind(x=c(0, 0, 10, 10, 0), y=c(0, 10, 10, 0, 0)), hole=FALSE) # I

tests/testthat/test_write.R

@@ -122,7 +122,7 @@ test_that("FID feature ID gets written and read", {
   tf <- paste0(tempfile(), ".geojson")
   write_sf(nc, tf, fid_column_name = "f_id")
   nc2 = read_sf(tf, fid_column_name = "f_id")
-  if (sf_extSoftVersion()["GDAL"] >= "2.3.2")
+  if (sf_extSoftVersion()[["GDAL"]] >= "2.3.2")
   	expect_equal(nc$f_id, nc2$f_id)
 })
 

tests/testthat/test_zm_range.R

@@ -120,7 +120,7 @@ test_that("zmrange works on more compliated examples", {
 
 test_that("transform includes zm in output", {
 
-	skip_if_not(sf_extSoftVersion()["GDAL"] > "2.1.0")
+	skip_if(sf_extSoftVersion()[["GDAL"]] <= "2.1.0")
 
 	p1 = st_point(c(7,52,52))
 	p2 = st_point(c(-30,20,20))