Merge pull request #219 from r-spatial/bug_locale

get rid of encoding argument
r-spatial · Sep 16, 2024 · 17d7b66 · 17d7b66
2 parents a7534ad + e8f3efc
commit 17d7b66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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",

diff --git 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({

diff --git 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")
-Original file line number
+Diff line change
@@ Expand Up @@
           arg_skip_loading_plugins(algorithm),
           "help",
           algorithm
-        ),
-        encoding = "UTF-8"
+        )
       )
       try({
@@ Expand Down @@