permit GDAL < 3.7.0 by unzipping zipped gpkg

r-spatial · Sep 10, 2024 · 25fd95b · 25fd95b
1 parent 28983fb
commit 25fd95b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/man/bhicv.Rd b/man/bhicv.Rd
@@ -31,7 +31,7 @@ if (GDAL37) {
     bh <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     bh <- st_read(target)
 }

diff --git a/man/mstree.Rd b/man/mstree.Rd
@@ -52,7 +52,7 @@ if (GDAL37) {
     bh <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     bh <- st_read(target)
 }

diff --git a/man/read.gwt2nb.Rd b/man/read.gwt2nb.Rd
@@ -93,7 +93,7 @@ if (GDAL37) {
     cal <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     cal <- st_read(target)
 }

diff --git a/man/skater.Rd b/man/skater.Rd
@@ -79,7 +79,7 @@ if (GDAL37) {
     bh <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     bh <- st_read(target)
 }

diff --git a/vignettes/subgraphs.Rmd b/vignettes/subgraphs.Rmd
@@ -59,7 +59,7 @@ if (GDAL37) {
     w50m <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     w50m <- st_read(target)
 }
@@ -177,7 +177,7 @@ if (GDAL37) {
     sc50m <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     sc50m <- st_read(target)
 }
@@ -375,7 +375,7 @@ if (GDAL37) {
     tokyo <- st_read(zipfile)
 } else {
     td <- tempdir()
-    bn <- sub(".zip", "", basename(file))
+    bn <- sub(".zip", "", basename(file), fixed=TRUE)
     target <- unzip(zipfile, files=bn, exdir=td)
     tokyo <- st_read(target)
 }