Skip to content

Commit

Permalink
soilDB 2.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
brownag committed Jun 10, 2022
1 parent 184392d commit 5bbf37e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# soilDB 2.7.1 (2022-06-10)
- `get_SDA_coecoclass()` better handling of `NULL` `ecoclassref`; support for filtering on `ecoclasstypename`; `not_assigned_value` now applies to `ecoclassname`, `ecoclasstypename` and `ecoclassref` columns in addition to `ecoclassid`; Thanks to Andy Paolucci and Jason Nemecek. Also, added additional columns from legend/mapunit tables (`areasymbol`, `lkey`, `muname`).
- `fetchNASIS(from="components")` now returns mapunit and legend information (if loaded in local NASIS database); results now contain `mustatus` and `repdmu` which can be used to remove components from additional mapunits and non-representative data mapunits; thanks to Nathan Roe
- Convert UTF8 strings in `us_ss_timeline` result to ASCII
- Convert UTF-8 strings in `us_ss_timeline` result to ASCII
- `SDA_query()`: Fixed POST request that could produce unhandled errors on network failure (now returns `try-error` like other error-causing code)
- `SDA_query()`: In the event of a syntax error, error contents are now returned as a message, not a warning.
- `uncode()` and `code()` now work with `data.table` and `tibble` objects.
- Various fixes to tests and error handling code to reduce likelihood of thrown errors from network problems or missing suggested packages.

# soilDB 2.7.0 (2022-05-18)
* Spatial
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ citEntry(
note = "R package version %s",
url = "https://CRAN.R-project.org/package=soilDB",
year = "%s",
textVersion = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown (%s). soilDB: Soil Database Interface. R package version %s. <https://CRAN.R-project.org/package=soilDB>"
textVersion = "Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (%s). soilDB: Soil Database Interface. R package version %s. <https://CRAN.R-project.org/package=soilDB>"
)
', version, format(Sys.time(), "%Y"), format(Sys.time(), "%Y"), version)
suppressWarnings(writeLines(strsplit(x, "\n")[[1]], "inst/CITATION"))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ Citation
##
## To cite soilDB in publications use:
##
## Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown
## (2022). soilDB: Soil Database Interface. R package version 2.7.0.
## Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (2022).
## soilDB: Soil Database Interface. R package version 2.7.1.
## <https://CRAN.R-project.org/package=soilDB>
##
## A BibTeX entry for LaTeX users is
##
## @Manual{,
## title = {soilDB: Soil Database Interface},
## author = {Dylan Beaudette and Jay Skovlin and Stephen Roecker and Andrew Brown},
## note = {R package version 2.7.0},
## note = {R package version 2.7.1},
## url = {https://CRAN.R-project.org/package=soilDB},
## year = {2022},
## }
Expand Down
4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ citEntry(
entry = "Manual",
title = "soilDB: Soil Database Interface",
author = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown",
note = "R package version 2.7.0",
note = "R package version 2.7.1",
url = "https://CRAN.R-project.org/package=soilDB",
year = "2022",
textVersion = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown (2022). soilDB: Soil Database Interface. R package version 2.7.0. <https://CRAN.R-project.org/package=soilDB>"
textVersion = "Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (2022). soilDB: Soil Database Interface. R package version 2.7.1. <https://CRAN.R-project.org/package=soilDB>"
)
2 changes: 1 addition & 1 deletion tests/testthat/test-SDA_query.R
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ test_that("SDA_query() works with multi-line records", {

skip_on_cran()

skip_if(inherits(x.3, 'try-error'))
skip_if(inherits(x.4, 'try-error'))

# https://github.com/ncss-tech/soilDB/issues/28
expect_true(inherits(x.4, 'data.frame'))
Expand Down

0 comments on commit 5bbf37e

Please sign in to comment.