fix: sync GDAL/PROJ search path

Author: brownag

R/RcppExports.R

@@ -113,8 +113,8 @@ rgb2hex <- function(x) {
     .Call(`_terra_get_proj_search_paths`)
 }
 
-.set_proj_search_paths <- function(paths) {
-    .Call(`_terra_set_proj_search_paths`, paths)
+.set_proj_search_paths <- function(paths, with_proj = FALSE) {
+    .Call(`_terra_set_proj_search_paths`, paths, with_proj)
 }
 
 .PROJ_network <- function(enable, url) {

R/zzz.R

@@ -24,16 +24,18 @@
 
 .gdinit <- function() {
 	path = ""
-	sf <- system.file("", package="terra")
-	if (file.exists(file.path(sf, "proj/nad.lst"))) {
-		path <- system.file("proj", package="terra")
-		.gdalinit(path, file.path(sf, "gdal"))
-		if ( Sys.info()["sysname"] == "Windows" ) {
-			.set_proj_search_paths(path)
-		}
-	} else {
-		.gdalinit(path, file.path(sf, "gdal"))
+	proj_path <- system.file("proj", package="terra")
+	gdal_path <- system.file("gdal", package="terra")
+	
+	has_proj <- dir.exists(proj_path) && (file.exists(file.path(proj_path, "proj.db")) || file.exists(file.path(proj_path, "nad.lst")))
+	has_gdal <- dir.exists(gdal_path)
+	
+	if (has_proj) {
+		projPaths(proj_path, TRUE)
 	}
+	
+	.gdalinit(path, ifelse(has_gdal, gdal_path, ""))
+	
 	if (libVersion("gdal") == "3.6.0") {
 		message("Using GDAL version 3.6.0 which was retracted because it cannot write large GPKG files")
 	}

src/RcppExports.cpp

@@ -319,23 +319,24 @@ BEGIN_RCPP
 END_RCPP
 }
 // set_proj_search_paths
-bool set_proj_search_paths(std::vector<std::string> paths);
-RcppExport SEXP _terra_set_proj_search_paths(SEXP pathsSEXP) {
+bool set_proj_search_paths(std::vector<std::string> paths, bool with_proj);
+RcppExport SEXP _terra_set_proj_search_paths(SEXP pathsSEXP, SEXP with_projSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< std::vector<std::string> >::type paths(pathsSEXP);
-    rcpp_result_gen = Rcpp::wrap(set_proj_search_paths(paths));
+    Rcpp::traits::input_parameter< bool >::type with_proj(with_projSEXP);
+    rcpp_result_gen = Rcpp::wrap(set_proj_search_paths(paths, with_proj));
     return rcpp_result_gen;
 END_RCPP
 }
 // PROJ_network
-std::string PROJ_network(bool enable, std::string url);
+std::string PROJ_network(int enable, std::string url);
 RcppExport SEXP _terra_PROJ_network(SEXP enableSEXP, SEXP urlSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< bool >::type enable(enableSEXP);
+    Rcpp::traits::input_parameter< int >::type enable(enableSEXP);
     Rcpp::traits::input_parameter< std::string >::type url(urlSEXP);
     rcpp_result_gen = Rcpp::wrap(PROJ_network(enable, url));
     return rcpp_result_gen;
@@ -480,7 +481,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_terra_setGDALCacheSizeMB", (DL_FUNC) &_terra_setGDALCacheSizeMB, 2},
     {"_terra_getGDALCacheSizeMB", (DL_FUNC) &_terra_getGDALCacheSizeMB, 1},
     {"_terra_get_proj_search_paths", (DL_FUNC) &_terra_get_proj_search_paths, 0},
-    {"_terra_set_proj_search_paths", (DL_FUNC) &_terra_set_proj_search_paths, 1},
+    {"_terra_set_proj_search_paths", (DL_FUNC) &_terra_set_proj_search_paths, 2},
     {"_terra_PROJ_network", (DL_FUNC) &_terra_PROJ_network, 2},
     {"_terra_removeDriver", (DL_FUNC) &_terra_removeDriver, 1},
     {"_terra_pearson_cor", (DL_FUNC) &_terra_pearson_cor, 3},

src/RcppFunctions.cpp

@@ -434,14 +434,14 @@ void gdal_init(std::string projpath, std::string datapath) {
 	//GDAL_NETCDF_IGNORE_XY_AXIS_NAME_CHECKS
 
 	//GDALregistred = true;
-#if GDAL_VERSION_MAJOR >= 3
- #ifdef PROJ_6
 	if (!projpath.empty()) {
-		const char *cp = projpath.c_str();
-		proj_context_set_search_paths(PJ_DEFAULT_CTX, 1, &cp);
-	}
- #endif
+#if GDAL_VERSION_NUM >= 3000000
+		std::vector<char *> cpaths(2);
+		cpaths[0] = (char *)projpath.c_str();
+		cpaths[1] = NULL;
+		OSRSetPROJSearchPaths(cpaths.data());
 #endif
+	}
 #ifdef PROJ_71
 	#ifndef __EMSCRIPTEN__
 		proj_context_set_enable_network(PJ_DEFAULT_CTX, 1);
@@ -567,36 +567,54 @@ std::vector<std::string> get_proj_search_paths() {
 
 
 // [[Rcpp::export(name = ".set_proj_search_paths")]]
-bool set_proj_search_paths(std::vector<std::string> paths) {
+bool set_proj_search_paths(std::vector<std::string> paths, bool with_proj = false) {
 	if (paths.empty()) {
 		return false;
 	}
+	if (with_proj) {
+		// Set for PROJ library
+		if (paths.size() == 1) {
+			const char *cp = paths[0].c_str();
+			proj_context_set_search_paths(PJ_DEFAULT_CTX, 1, &cp);
+		}
+		return true;
+	} else {
+		// Set for GDAL
 #if GDAL_VERSION_NUM >= 3000000
-	std::vector <char *> cpaths(paths.size()+1);
-	for (size_t i = 0; i < paths.size(); i++) {
-		cpaths[i] = (char *) (paths[i].c_str());
-	}
-	cpaths[cpaths.size()-1] = NULL;
-	OSRSetPROJSearchPaths(cpaths.data());
-	return true;
+		std::vector <char *> cpaths(paths.size()+1);
+		for (size_t i = 0; i < paths.size(); i++) {
+			cpaths[i] = (char *) (paths[i].c_str());
+		}
+		cpaths[cpaths.size()-1] = NULL;
+		OSRSetPROJSearchPaths(cpaths.data());
+		return true;
 #else
-	return false;
+		return false;
 #endif
+	}
 }
 
 
 // [[Rcpp::export(name = ".PROJ_network")]]
-std::string PROJ_network(bool enable, std::string url) {
+std::string PROJ_network(int enable, std::string url) {
 	std::string s = "";
 #ifdef PROJ_71
-	if (enable) {
+	if (enable == -1) { // get current status
+		return std::to_string(proj_context_is_network_enabled(PJ_DEFAULT_CTX));
+	} else if (enable == 1) {
 		proj_context_set_enable_network(PJ_DEFAULT_CTX, 1);
+#if GDAL_VERSION_NUM >= 3040000
+		OSRSetPROJEnableNetwork(1);
+#endif
 		if (url.size() > 5) {
 			proj_context_set_url_endpoint(PJ_DEFAULT_CTX, url.c_str());
 		}
 		s = proj_context_get_url_endpoint(PJ_DEFAULT_CTX);
-	} else { // disable:
+	} else if (enable == 0) { // disable:
 		proj_context_set_enable_network(PJ_DEFAULT_CTX, 0);
+#if GDAL_VERSION_NUM >= 3040000
+		OSRSetPROJEnableNetwork(0);
+#endif
 	}
 #endif
 	return s;