Support PROJECT_PATH and ELLIPSOID arguments when using JSON input

R/qgis-arguments.R

@@ -95,16 +95,27 @@ qgis_sanitize_arguments <- function(algorithm, ..., .algorithm_arguments = qgis_
   args_sanitized
 }
 
+
+#' @keywords internal
+unclass_recursive <- function(x) {
+  is_list <- vapply(x, is.list, logical(1))
+  x[is_list] <- lapply(x[is_list], unclass_recursive)
+  lapply(x, unclass)
+}
+
+
 # turn sanitized arguments into command-line arguments
 qgis_serialize_arguments <- function(arguments, use_json_input = FALSE) {
   if (use_json_input) {
-    unclass_recursive <- function(x) {
-      is_list <- vapply(x, is.list, logical(1))
-      x[is_list] <- lapply(x[is_list], unclass_recursive)
-      lapply(x, unclass)
-    }
-
-    jsonlite::toJSON(list(inputs = unclass_recursive(arguments)), auto_unbox = TRUE)
+    arguments <- unclass_recursive(arguments)
+    arglist <-
+      list(
+        inputs = arguments[!(names(arguments) %in% c("ELLIPSOID", "PROJECT_PATH"))],
+        ellipsoid = arguments$ELLIPSOID,
+        project_path = arguments$PROJECT_PATH
+      )
+    arglist <- arglist[!vapply(arglist, is.null, logical(1))]
+    jsonlite::toJSON(arglist, auto_unbox = TRUE)
   } else {
     args_dict <- vapply(arguments, inherits, logical(1), "qgis_dict_input")
     if (any(args_dict)) {

tests/testthat/test-qgis-arguments.R

@@ -49,6 +49,66 @@ test_that("qgis_sanitize_arguments() accepts multiple input arguments", {
   )
 })
 
+test_that("qgis_serialize_arguments() outputs correct JSON strings", {
+  arguments <- list(
+    LAYOUT = "Layout 1",
+    TEXT_FORMAT = 0,
+    OUTPUT = "output.pdf",
+    PROJECT_PATH = "test.qgs",
+    AGGREGATES = list(
+      list(
+        aggregate = "first_value",
+        delimiter = ",",
+        input = '"admin"',
+        length = 36,
+        name = "admin",
+        precision = 0,
+        type = 10
+      ),
+      list(
+        aggregate = "concatenate",
+        delimiter = ",",
+        input = '"name"',
+        length = 3000,
+        name = "name",
+        precision = 0,
+        type = 10
+      )
+    )
+  )
+  json <- qgis_serialize_arguments(arguments = arguments, use_json_input = TRUE)
+  expect_identical(
+    jsonlite::fromJSON(json, simplifyVector = FALSE),
+    list(
+      inputs = list(
+        LAYOUT = "Layout 1",
+        TEXT_FORMAT = 0L,
+        OUTPUT = "output.pdf",
+        AGGREGATES = list(
+          list(
+            aggregate = "first_value",
+            delimiter = ",",
+            input = "\"admin\"",
+            length = 36L,
+            name = "admin",
+            precision = 0L,
+            type = 10L
+          ),
+          list(
+            aggregate = "concatenate",
+            delimiter = ",",
+            input = "\"name\"",
+            length = 3000L,
+            name = "name",
+            precision = 0L,
+            type = 10L
+            )
+          )
+        ),
+      project_path = "test.qgs")
+    )
+})
+
 test_that("argument coercers work", {
   expect_error(as_qgis_argument(list()), "Don't know how to convert object of type")
   expect_identical(as_qgis_argument("chr value"), "chr value")