Merge pull request #42 from anthonynorth/main

Proj >=  6 hard dependency

.github/workflows/R-CMD-check-autotools.yaml

@@ -21,8 +21,6 @@ jobs:
           - {os: ubuntu-latest,   r: 'release', PROJ_VERSION: '8.2.1'}
           - {os: ubuntu-latest,   r: 'release', PROJ_VERSION: '7.2.1'}
           - {os: ubuntu-latest,   r: 'release', PROJ_VERSION: '6.3.1'}
-          - {os: ubuntu-latest,   r: 'release', PROJ_VERSION: '5.2.0'}
-          - {os: ubuntu-latest,   r: 'release', PROJ_VERSION: '4.9.3'}
 
 
     env:

DESCRIPTION

@@ -1,29 +1,31 @@
 Package: PROJ
 Title: Generic Coordinate System Transformations Using 'PROJ'
 Version: 0.4.5
-Authors@R: 
+Authors@R:
     c(person(given = "Michael D.",
            family = "Sumner",
            role = c("aut", "cre"),
            email = "[email protected]",
-           comment = c(ORCID = "0000-0002-2471-7511")), 
-    person("Jeroen", "Ooms", role = c("ctb"), 
-           comment = "provided PROJ library support on Windows, and assistance with Windows configuration"), 
-    person("Simon", "Urbanek", role = c("cph", "ctb"), 
-           comment = "wrote original code versions for PROJ version 6"), 
-    person("Dewey", "Dunnington", role = c("ctb"), 
+           comment = c(ORCID = "0000-0002-2471-7511")),
+    person("Jeroen", "Ooms", role = c("ctb"),
+           comment = "provided PROJ library support on Windows, and assistance with Windows configuration"),
+    person("Simon", "Urbanek", role = c("cph", "ctb"),
+           comment = "wrote original code versions for PROJ version 6"),
+    person("Dewey", "Dunnington", role = c("ctb"),
            comment = "key code contributions"))
 Description: A wrapper around the generic coordinate transformation software 'PROJ'
-  that transforms coordinates from one coordinate reference system ('CRS') 
-  to another. This includes cartographic projections as well as geodetic transformations.  The intention is for this 
-  package to be used by user-packages such as 'reproj', and that the older 'PROJ.4' and version 5 
-  pathways be provided by the 'proj4' package. 
+  that transforms coordinates from one coordinate reference system ('CRS')
+  to another. This includes cartographic projections as well as geodetic transformations.  The intention is for this
+  package to be used by user-packages such as 'reproj', and that the older 'PROJ.4' and version 5
+  pathways be provided by the 'proj4' package.
 Depends: R (>= 3.0.2)
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-Suggests: 
+Imports:
+    lifecycle
+Suggests:
     testthat (>= 2.1.0),
     spelling,
     knitr,

NAMESPACE

@@ -4,4 +4,5 @@ export(ok_proj6)
 export(proj_crs_text)
 export(proj_trans)
 export(proj_version)
+importFrom(lifecycle,deprecated)
 useDynLib(PROJ, .registration = TRUE)

NEWS.md

@@ -1,3 +1,8 @@
+# PROJ (development version)
+
+* PROJ >= 6 is now a hard dependency (#42)
+* Deprecate ok_proj6() (#42)
+
 # PROJ 0.4.5
 
 * New function `proj_version()`. 

R/PROJ-package.R

@@ -4,6 +4,7 @@
 # The following block is used by usethis to automatically manage
 # roxygen namespace tags. Modify with care!
 ## usethis namespace: start
+#' @importFrom lifecycle deprecated
 #' @useDynLib PROJ, .registration = TRUE
 ## usethis namespace: end
 NULL

R/ok_proj6.R

@@ -1,7 +1,11 @@
 #' Is 'PROJ library >= 6' available
 #'
+#' @description
+#' `r lifecycle::badge("deprecated")`
+#' 
 #' Test for availability of 'PROJ' system library version 6 or higher.
-#'
+#' 
+#' @details
 #' On unix-alikes, this function is run in `.onLoad()` to check that version 6 functionality is
 #' available. On Windows, the load process sets the data file location with the version 6 API, and that
 #' is used as a test instead.
@@ -17,19 +21,6 @@
 #' @examples
 #' ok_proj6()
 ok_proj6 <- function() {
-
-  mock_no_proj6 <- getOption("reproj.mock.noproj6")
-
-  if (!is.null(mock_no_proj6) && isTRUE(mock_no_proj6)) {
-    message("PROJ6 *is* available, but operating in mock-no-proj6 mode '?PROJ::ok_proj6'")
-    out <- FALSE
-  } else {
-    #test <- try(proj_trans(list(x = 0, y = 0),
-    ##                       source = "+proj=longlat +datum=WGS84",
-    #                       target = "+proj=laea"), silent = TRUE)
-    #out <-   !inherits(test, "try-error")
-    out <- !is.na(proj_version())
-  }
-
-  out
+  lifecycle::deprecate_warn("0.5", "ok_proj6")
+  TRUE
 }

R/proj_crs_text.R

@@ -20,17 +20,11 @@
 #' @return character string in requested format
 #'
 #' @examples
-#' if (ok_proj6()) {
 #' cat(proj_crs_text("OGC:CRS84", format = 0L))
 #' proj_crs_text("OGC:CRS84", format = 1L)
 #' south55 <- "+proj=utm +zone=55 +south +ellps=GRS80 +units=m +no_defs +type=crs"
 #' proj_crs_text(proj_crs_text(south55), 1L)
-#' }
 proj_crs_text <- function(source, format = 0L) {
-  if (!ok_proj6()) {
-    message("no PROJ lib available")
-   return(NA_character_)
-  }
   stopifnot(length(format) == 1L)
   stopifnot(format %in% c(0L, 1L, 2L))
   stopifnot(is.character(source))

R/proj_trans.R

@@ -21,16 +21,12 @@
 #' @references see the [PROJ library documentation](https://proj.org/development/reference/functions.html#coordinate-transformation)
 #' for details on the underlying functionality
 #' @examples
-#' if (ok_proj6()) {
-#'  proj_trans(cbind(147, -42), "+proj=laea", source = "OGC:CRS84")
-#'  proj_trans(cbind(147, -42), z_ = -2, "+proj=laea", source = "OGC:CRS84")
-#'  proj_trans(cbind(147, -42), z_ = -2, t_ = 1, "+proj=laea", source = "OGC:CRS84")
-#'  }
+#' proj_trans(cbind(147, -42), "+proj=laea", source = "OGC:CRS84")
+#' proj_trans(cbind(147, -42), z_ = -2, "+proj=laea", source = "OGC:CRS84")
+#' proj_trans(cbind(147, -42), z_ = -2, t_ = 1, "+proj=laea", source = "OGC:CRS84")
 #' @name proj_trans
 #' @export
 proj_trans <- function(x, target, ..., source = NULL, z_ = NULL, t_ = NULL) {
-
-  if (!ok_proj6()) stop("no PROJ lib available")
   if (missing(target) || !is.character(target)) stop("target must be a string")
   if (is.null(source) || !is.character(source)) stop("source must be provided as a string")
   if (is.list(x) || is.data.frame(x)) x <- cbind(x[[1L]], x[[2L]])

R/zzz.R

@@ -19,7 +19,6 @@ PROJ_load_proj <- function() {
   ## - windows because tools/winlibs.R
   ## - macos because   CRAN mac binary libs, and configure --with-data-copy=yes --with-proj-data=/usr/local/share/proj
 
-  if (!ok_proj6())  packageStartupMessage("no PROJ lib available, {PROJ} requires PROJ lib 6.3.1 or later")
   ##PROJ  data, only if the files are in package (will fix in gdalheaders)
   if (file.exists(system.file("proj/nad.lst", package = "PROJ"))) {
     prj = system.file("proj", package = "PROJ")[1L]

configure

@@ -3129,9 +3129,6 @@ if test x$use6 = xyes -a x${proj6api} = xno; then
 $as_echo "$as_me: Cannot find working proj.h headers and library.
 *** You may need to install libproj-dev or similar! ***
 " >&6;}
-else
-CPPFLAGS="-DUSE_PROJ6_API=1 ${CPPFLAGS}"
-
 fi
 
 

configure.ac

@@ -70,13 +70,9 @@ if test x$use6 = xyes -a x${proj6api} = xno; then
    AC_MSG_NOTICE([Cannot find working proj.h headers and library.
 *** You may need to install libproj-dev or similar! ***
 ])
-else
-CPPFLAGS="-DUSE_PROJ6_API=1 ${CPPFLAGS}"
-
 fi
 
 
-
 AC_ARG_VAR([PKG_CPPFLAGS],[custom C preprocessor flags for packages compilation])
 AC_ARG_VAR([PKG_LIBS],[custom libraries for package compilation])
 

src/C_proj_crs_text.c

@@ -3,8 +3,6 @@
 #include <R.h>
 #include <Rinternals.h>
 
-#ifdef USE_PROJ6_API
-
 #include <proj.h>
 
 SEXP C_proj_crs_text(SEXP crs_, SEXP format)
@@ -67,16 +65,3 @@ SEXP C_proj_crs_text(SEXP crs_, SEXP format)
 
   return(out);
 }
-
-
-#else
-
-SEXP C_proj_crs_text(SEXP crs_, SEXP format)
-{
- SEXP out = PROTECT(allocVector(STRSXP, 1));
- SET_STRING_ELT(out, 0, NA_STRING);
- UNPROTECT(1);
- return out;
-}
-
-#endif

src/C_proj_trans.c

@@ -1,9 +1,6 @@
 
 #include <Rinternals.h>
 
-
-#ifdef USE_PROJ6_API
-
 #include "proj.h"
 
 // this returns a list of 2 or 4, takes in a list of 2 or 4
@@ -154,20 +151,3 @@ SEXP C_proj_trans_xy(SEXP x_, SEXP y_, SEXP src_, SEXP tgt_)
   UNPROTECT(5);
   return vec;
 }
-
-#else
-
-SEXP C_proj_trans_list(SEXP x, SEXP src_, SEXP tgt_)
-{
-  SEXP vec = PROTECT(allocVector(VECSXP, 0));
-  UNPROTECT(1);
-  return vec;
-}
-SEXP C_proj_trans_xy(SEXP x_, SEXP y_, SEXP src_, SEXP tgt_)
-{
-  SEXP vec = PROTECT(allocVector(VECSXP, 0));
-  UNPROTECT(1);
-
-  return vec;
-}
-#endif

src/C_proj_version.c

@@ -1,8 +1,6 @@
 #include <R.h>
 #include <Rinternals.h>
 
-#ifdef USE_PROJ6_API
-
 #include <proj.h>
 
 #define STR_HELPER(x) #x
@@ -14,15 +12,3 @@ SEXP C_proj_version(void)
 {
   return Rf_mkString(PROJ_PROJ_VERSION);
 }
-
-#else
-
-SEXP C_proj_version(void)
-{
-  SEXP out = PROTECT(allocVector(STRSXP, 1));
-  SET_STRING_ELT(out, 0, NA_STRING);
-  UNPROTECT(1);
-  return out;
-}
-
-#endif

src/Makevars.ucrt

@@ -4,8 +4,6 @@
 LIBSHARPYUV = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libsharpyuv.a),-lsharpyuv),)
 PKG_LIBS = -lproj -lsqlite3 -lcurl -lbcrypt -ltiff -ljpeg -lrtmp -lssl -lssh2 -lgcrypt -lcrypto -lgdi32 -lz -lzstd -lwebp $(LIBSHARPYUV) -llzma -lgdi32 -lcrypt32 -lidn2 -lunistring -liconv -lgpg-error -lws2_32 -lwldap32 -lwinmm -lstdc++
 
-PKG_CPPFLAGS = -DUSE_PROJ6_API=1
-
 all: clean winlibs
 
 winlibs:

tests/testthat/test-PROJ.R

@@ -6,7 +6,6 @@ lat <- na.omit(w[,2])
 dst <- "+proj=laea +datum=WGS84 +lon_0=147 +lat_0=-42"
 
 test_that("PROJ works", {
-skip_if(!ok_proj6())
   src <- "+proj=longlat +datum=WGS84"
   expect_silent(xyz <- proj_trans(cbind(X = lon, Y = lat), z_ = rep(0, length(lon)), dst, source = src))
   expect_silent(lonlat <- proj_trans(cbind(X = xyz["x_"], Y = xyz["y_"]), z_ = rep(0, length(lon)),