Skip to content

Commit

Permalink
Merge pull request #220 from r-spatial/dont_set_locale
Browse files Browse the repository at this point in the history
Drop encoding = "UTF-8" for JSON in all places
  • Loading branch information
jannes-m authored Sep 15, 2024
2 parents c19b4c2 + 0278061 commit e8f3efc
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-9415-4582", affiliation = "Voltron Data")),
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# qgisprocess (development version)

# qgisprocess 0.4.0

## Enhancements
Expand Down
3 changes: 1 addition & 2 deletions R/qgis-help.R
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ qgis_help_json <- function(algorithm, check_deprecation = TRUE) {
arg_skip_loading_plugins(algorithm),
"help",
algorithm
),
encoding = "UTF-8"
)
)

try({
Expand Down
3 changes: 1 addition & 2 deletions R/qgis-run-algorithm.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
```
Expand Down Expand Up @@ -137,7 +137,7 @@ result <- qgis_run_algorithm(
result
#> <Result of `qgis_run_algorithm("native:buffer", ...)`>
#> 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))
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion man/qgisprocess-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e8f3efc

Please sign in to comment.