From c19b4c294ce5b48608132c71978f930250ec95d7 Mon Sep 17 00:00:00 2001 From: jannes-m Date: Thu, 5 Sep 2024 10:22:52 +0000 Subject: [PATCH 1/3] get rid of encoding argument --- R/qgis-algorithms.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/qgis-algorithms.R b/R/qgis-algorithms.R index 392af4d3..f01e762a 100644 --- a/R/qgis-algorithms.R +++ b/R/qgis-algorithms.R @@ -130,7 +130,7 @@ algorithm_is_native <- function(algorithm) { #' @keywords internal qgis_query_algorithms <- function(quiet = FALSE) { if (qgis_using_json_output()) { - result <- qgis_run(args = c("list", "--json"), encoding = "UTF-8") + result <- qgis_run(args = c("list", "--json")) if (nchar(result$stderr) > 0L) { message( "\nStandard error message from 'qgis_process':\n", From 75ce4a19b24d638cf5ee5f82cefa43f35d64ab07 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 20:09:10 +0200 Subject: [PATCH 2/3] qgis_help_json(): drop encoding arg (see PR #219) --- R/qgis-help.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/R/qgis-help.R b/R/qgis-help.R index a7f29d56..95679ae6 100644 --- a/R/qgis-help.R +++ b/R/qgis-help.R @@ -109,8 +109,7 @@ qgis_help_json <- function(algorithm, check_deprecation = TRUE) { arg_skip_loading_plugins(algorithm), "help", algorithm - ), - encoding = "UTF-8" + ) ) try({ From 990ffa9c90ca66f838e868b3252e7643845ac32b Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 20:09:30 +0200 Subject: [PATCH 3/3] qgis_run_algorithm(): drop encoding arg (see PR #219) --- R/qgis-run-algorithm.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/R/qgis-run-algorithm.R b/R/qgis-run-algorithm.R index 5bb13433..7009aa55 100644 --- a/R/qgis-run-algorithm.R +++ b/R/qgis-run-algorithm.R @@ -137,8 +137,7 @@ qgis_run_algorithm <- function(algorithm, ..., PROJECT_PATH = NULL, ELLIPSOID = echo_cmd = !.quiet, stdout_callback = if (!.quiet && !use_json_output) function(x, ...) cat(x), stderr_callback = function(x, ...) message(x, appendLF = FALSE), - stdin = if (use_json_input) stdin_file, - encoding = if (use_json_output) "UTF-8" else "" + stdin = if (use_json_input) stdin_file ) if (!.quiet) cat("\n")