From 4dff7014a88630e179d6a2ea12ba1af50ee481de Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 17:19:00 +0200 Subject: [PATCH 1/5] Bump dev version number --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5d46ae77..cdd1b010 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: qgisprocess Title: Use 'QGIS' Processing Algorithms -Version: 0.4.0 +Version: 0.4.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@fishandwhistle.net", role = "aut", comment = c(ORCID = "0000-0002-9415-4582", affiliation = "Voltron Data")), diff --git a/NEWS.md b/NEWS.md index e78d311b..4f0f68c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# qgisprocess (development version) + # qgisprocess 0.4.0 ## Enhancements From 8ce845a40e3492cc3c85e096f1d5a8f7ac109184 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 18:07:20 +0200 Subject: [PATCH 2/5] Readme: update --- README.Rmd | 1 + README.md | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.Rmd b/README.Rmd index fff9ad75..92e1a549 100644 --- a/README.Rmd +++ b/README.Rmd @@ -139,6 +139,7 @@ Please note that the qgisprocess project is released with a [Contributor Code of ### Presentations +- useR! 2024: [slides](https://florisvdh.github.io/user-2024-qgisprocess) - FOSS4G 2023: [slides](https://florisvdh.github.io/foss4g-2023-qgisprocess/) & [video](https://www.youtube.com/watch?v=Qt5DzWThWqI) - FOSS4G 2021: [slides](https://dewey.dunnington.ca/slides/qgisprocess2021/) & [video](https://www.youtube.com/watch?v=iA0OQ2Icn6Y&t=1912s) diff --git a/README.md b/README.md index 2082a78a..04462e20 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ reconfigure the package, or just ``` r library(qgisprocess) #> Attempting to load the package cache ... Success! -#> QGIS version: 3.38.0-Grenoble +#> QGIS version: 3.38.2-Grenoble #> Having access to 2059 algorithms from 18 QGIS processing providers. #> Run `qgis_configure(use_cached_data = TRUE)` to reload cache and get more details. ``` @@ -137,7 +137,7 @@ result <- qgis_run_algorithm( result #> #> List of 1 -#> $ OUTPUT: 'qgis_outputVector' chr "/tmp/RtmphNqw6p/file1d6937316438/file1d6950ffc83a.gpkg" +#> $ OUTPUT: 'qgis_outputVector' chr "/tmp/RtmpLKaaqm/file7b6c2bf628b2/file7b6c44bc6b35.gpkg" output_sf <- sf::st_as_sf(result) plot(sf::st_geometry(output_sf)) @@ -221,6 +221,8 @@ By contributing to this project, you agree to abide by its terms. ### Presentations +- useR! 2024: + [slides](https://florisvdh.github.io/user-2024-qgisprocess) - FOSS4G 2023: [slides](https://florisvdh.github.io/foss4g-2023-qgisprocess/) & [video](https://www.youtube.com/watch?v=Qt5DzWThWqI) From a7534ad5a58f1fe25f6619821259180d23cc75c6 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 19:30:38 +0200 Subject: [PATCH 3/5] Rerun devtools::document() --- man/qgisprocess-package.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/qgisprocess-package.Rd b/man/qgisprocess-package.Rd index 683975a5..f4705eaf 100644 --- a/man/qgisprocess-package.Rd +++ b/man/qgisprocess-package.Rd @@ -6,7 +6,7 @@ \alias{qgisprocess-package} \title{qgisprocess: Use 'QGIS' Processing Algorithms} \description{ -Provides seamless access to the 'QGIS' (\url{https://qgis.org/en/site/}) processing toolbox using the standalone 'qgis_process' command-line utility. Both native and third-party (plugin) processing providers are supported. Beside referring data sources from file, also common objects from 'sf', 'terra' and 'stars' are supported. The native processing algorithms are documented by QGIS.org (2023) \url{https://docs.qgis.org/latest/en/docs/user_manual/processing_algs/}. +Provides seamless access to the 'QGIS' (\url{https://qgis.org/en/site/}) processing toolbox using the standalone 'qgis_process' command-line utility. Both native and third-party (plugin) processing providers are supported. Beside referring data sources from file, also common objects from 'sf', 'terra' and 'stars' are supported. The native processing algorithms are documented by QGIS.org (2024) \url{https://docs.qgis.org/latest/en/docs/user_manual/processing_algs/}. } \note{ A structured overview of the available functions can be consulted at From 75ce4a19b24d638cf5ee5f82cefa43f35d64ab07 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 6 Sep 2024 20:09:10 +0200 Subject: [PATCH 4/5] 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 5/5] 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")