Skip to content

Commit db82cc0

Browse files
committed
Update for soilDB 2.8.11 / NASIS data model 7.4.3
1 parent 17e61d4 commit db82cc0

18 files changed

Lines changed: 14 additions & 17 deletions

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Title: A System of Soil Classification for Making and Interpreting Soil Surveys
33
Description: Taxonomic dictionaries, formative element lists, and functions related to the maintenance, development and application of U.S. Soil Taxonomy.
44
Data and functionality are based on official U.S. Department of Agriculture sources including the latest edition of the Keys to Soil Taxonomy. Descriptions and metadata are obtained from the National Soil Information System or Soil Survey Geographic databases. Other sources are referenced in the data documentation.
55
Provides tools for understanding and interacting with concepts in the U.S. Soil Taxonomic System. Most of the current utilities are for working with taxonomic concepts at the "higher" taxonomic levels: Order, Suborder, Great Group, and Subgroup.
6-
Version: 0.2.7
6+
Version: 0.2.8
77
Authors@R: c(person(given="Andrew", family="Brown", email="andrew.g.brown@usda.gov", role = c("aut", "cre")), person(given="Dylan", family="Beaudette", role = c("aut"), email = "dylan.beaudette@usda.gov"))
88
Maintainer: Andrew Brown <andrew.g.brown@usda.gov>
99
Depends: R (>= 3.5)
1010
License: GPL (>= 3)
1111
Encoding: UTF-8
1212
LazyLoad: yes
1313
Repository: CRAN
14-
URL: https://github.com/ncss-tech/SoilTaxonomy, https://ncss-tech.github.io/SoilTaxonomy/, http://ncss-tech.github.io/SoilTaxonomy/
14+
URL: https://github.com/ncss-tech/SoilTaxonomy, https://ncss-tech.github.io/SoilTaxonomy/
1515
BugReports: https://github.com/ncss-tech/SoilTaxonomy/issues
1616
Imports: stats, utils, stringr, data.table
1717
Suggests:

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SoilTaxonomy 0.2.8 (2025-07-10)
2+
- Update data sets for soilDB 2.8.11 and NASIS data model 7.4.3
3+
- `parse_family()`: Remove patch for `"diatomaceous"` mineralogy class in NASIS metadata
4+
15
# SoilTaxonomy 0.2.7 (2025-04-04)
26
- Added `ST_criteria_13th` data set relating taxon codes to specific criteria from the Keys to Soil Taxonomy (13th Edition)
37
- Added `getTaxonCriteria()`: a helper method for extracting values from `ST_criteria_13th`

R/family-classes.R

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@ parse_family <- function(family, column_metadata = TRUE, flat = TRUE) {
9292
# lookup classes in KST definitions
9393
kst_lookup <- lapply(res$classes_split, function(x) {
9494
x <- tolower(x)
95-
96-
###: CHOICE LIST PATCHES
97-
# mapping of "diatomaceous" mineralogy class -> "diatomaceous earth" choicename for taxminalogy
98-
x[x == "diatomaceous"] <- "diatomaceous earth"
99-
###
100-
###
10195
y <- tolower(ST_family_classes$classname)
10296
ldx <- grepl(' over ', x, fixed = TRUE) & !(x %in% y)
10397
if (sum(ldx) > 0) {

R/taxonTree.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
#' @return A `SoilTaxonNode` (subclass of `data.tree` `Node`) object (invisibly). A text representation of the tree is printed to stdout when `verbose=TRUE`.
1616
#' @export
1717
#' @importFrom stats complete.cases
18-
#' @examplesIf !inherits(requireNamespace("data.tree", quietly = TRUE), 'try-error')
19-
#' @examples
18+
#' @examplesIf requireNamespace("data.tree")
2019
#'
2120
#' # hapludults and hapludalfs (to subgroup level)
2221
#' taxonTree(c("hapludults", "hapludalfs"))
@@ -39,7 +38,7 @@ taxonTree <- function(taxon,
3938
# get child taxa at most detailed `level`
4039
lh <- level_hierarchy(family = FALSE)
4140
lowest_level <- max(match(level, lh))
42-
x <- unique(c(taxon, do.call('c',
41+
x <- unique(c(taxon, do.call('c',
4342
getChildTaxa(taxon, level = as.character(lh[lowest_level]))
4443
)))
4544
y <- getTaxonAtLevel(x, level = level)

data-raw/ST-family-classes.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DomainID,classname,group
33
126,amorphic,mineralogy class
44
126,carbonatic,mineralogy class
55
126,coprogenous,mineralogy class
6-
126,diatomaceous earth,mineralogy class
6+
126,diatomaceous,mineralogy class
77
126,ferrihumic,mineralogy class
88
126,ferrihydritic,mineralogy class
99
126,ferritic,mineralogy class
@@ -129,6 +129,7 @@ DomainID,classname,group
129129
127,sandy-skeletal,particle-size class
130130
127,sandy-skeletal over loamy,particle-size class
131131
127,very-fine,particle-size class
132+
127,diatomaceous,particle-size class
132133
128,acid,reaction class
133134
128,allic,reaction class
134135
128,calcareous,reaction class

data/ST.rda

12 Bytes
Binary file not shown.

data/ST_SMR_13th.rda

-36 Bytes
Binary file not shown.

data/ST_criteria_13th.rda

-110 Bytes
Binary file not shown.

data/ST_family_classes.rda

-10 Bytes
Binary file not shown.

data/ST_features.rda

-4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)