harmonize hzID in fetchX() functions - resolves #113

ncss-tech · Nov 6, 2019 · 4ca51ce · 4ca51ce
1 parent 49b9f15
commit 4ca51ce
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1 deletion.
diff --git a/R/fetchKSSL.R b/R/fetchKSSL.R
@@ -100,6 +100,9 @@ fetchKSSL <- function(series=NULL, bbox=NULL, mlra=NULL, pedlabsampnum=NULL, ped
 
 	} else m <- NULL
 
+	# set KSSL-specific horizon identifier
+	hzidname(h) <- "labsampnum"
+
 	## set metadata
 	h.metadata <- metadata(h)
 	h.metadata$origin <- 'KSSL via Soilweb / fetchKSSL'

diff --git a/R/fetchNASISLabData.R b/R/fetchNASISLabData.R
@@ -47,6 +47,8 @@ fetchNASISLabData <- function() {
 	# add site data to object
 	site(h) <- s # left-join via labpeiid
 
+	# set NASIS-specific horizon identifier
+	hzidname(h) <- 'phiid'
 
 	# 7. save and mention bad pedons
 	assign('bad.labpedon.ids', value=bad.pedon.ids, envir=soilDB.env)

diff --git a/R/fetchNASIS_components.R b/R/fetchNASIS_components.R
@@ -78,6 +78,9 @@ fetchNASIS_components <- function(SS=TRUE, rmHzErrors=TRUE, fill = FALSE, string
     if(length(get("component.hz.problems", envir = soilDB.env)) > 0)
       message("-> QC: horizon errors detected, use `get('component.hz.problems', envir=soilDB.env)` for related coiid values")
 
+  # set NASIS component specific horizon identifier
+  hzidname(f.chorizon) <- 'chiid'
+
   # set metadata
   m <- metadata(f.chorizon)
   m$origin <- 'NASIS components'

diff --git a/R/fetchNASIS_pedons.R b/R/fetchNASIS_pedons.R
@@ -195,6 +195,9 @@ fetchNASIS_pedons <- function(SS=TRUE, rmHzErrors=TRUE, nullFragsAreZero=TRUE, s
   m$origin <- 'NASIS pedons'
   metadata(h) <- m
 
+  # set NASIS-specific horizon identifier
+  hzidname(h) <- 'phiid'
+
   # print any messages on possible data quality problems:
   if(exists('sites.missing.pedons', envir=soilDB.env))
     if(length(get('sites.missing.pedons', envir=soilDB.env)) > 0)

diff --git a/R/fetchPedonPC.R b/R/fetchPedonPC.R
@@ -69,6 +69,9 @@ fetchPedonPC <- function(dsn) {
   if(nrow(lf) > 0)
     site(h) <- lf
 
+  # set PedonPC/NASIS-specific horizon identifier
+  hzidname(h) <- 'phiid'
+
 	# 7. save and mention bad pedons
 	assign('bad.pedon.ids', value=bad.pedon.ids, envir=soilDB.env)
 	if(length(bad.pedon.ids) > 0)

diff --git a/R/fetchRaCA.R b/R/fetchRaCA.R
@@ -126,6 +126,9 @@ fetchRaCA <- function(series=NULL, bbox=NULL, state=NULL, rcasiteid=NULL, get.vn
   s$region <- substr(s$rcasiteid, 2, 3)
   s$soilgroup <- substr(s$rcasiteid, 2, 5)
 
+  # set NASIS-specific horizon identifier
+  hzidname(h) <- 'phiid'
+
   # merge-in site data
   site(h) <- s
 

diff --git a/R/get_component_from_LIMS.R b/R/get_component_from_LIMS.R
@@ -288,6 +288,9 @@ fetchNASISWebReport <- function(projectname, rmHzErrors = FALSE, fill = FALSE,
   # add site data to object
   site(f.chorizon) <- f.component # left-join via cokey
 
+  # set SDA/SSURGO-specific horizon identifier
+  hzidname(f.chorizon) <- 'chkey'
+
   # print any messages on possible data quality problems:
   if (exists('component.hz.problems', envir=soilDB.env))
     message("-> QC: horizon errors detected, use `get('component.hz.problems', envir=soilDB.env)` for related cokey values")

diff --git a/R/get_component_from_SDA.R b/R/get_component_from_SDA.R
@@ -556,7 +556,10 @@ fetchSDA_component <- function(WHERE = NULL, duplicates = FALSE, childs = TRUE,
   ## TODO: make this error more informative
   # add site data to object
   site(f.chorizon) <- f.component # left-join via cokey
-
+
+  # set SDA/SSURGO-specific horizon identifier
+  hzidname(f.chorizon) <- 'chkey'
+
   # add diagnostics
   if(is.data.frame(f.diag)) {
     diagnostic_hz(f.chorizon) <- f.diag