get_site_data_from_NASIS_db: add obs_date to alias deprecation

warning, fix `site_id` alias

Author: brownag

R/get_site_data_from_NASIS_db.R

@@ -45,6 +45,7 @@ get_site_data_from_NASIS_db <- function(SS = TRUE,
   .soilDB_warn_deprecated_aliases(
     c(
       "upedonid" = "pedon_id",
+      "obs_date" = "obsdate",
       "longstddecimaldegrees" = "x_std",
       "latstddecimaldegrees" = "y_std",
       "descname" = "describer",
@@ -61,9 +62,9 @@ get_site_data_from_NASIS_db <- function(SS = TRUE,
     NASISDomainsAsFactor(stringsAsFactors)
   }
 
-	q <- paste0("SELECT siteiid, siteobsiid, usiteid, 
+	q <- paste0("SELECT siteiid, siteobsiid, usiteid, usiteid AS site_id,
   	", ifelse(include_pedon, "peiid, CAST(upedonid AS varchar(60)) as pedon_id, upedonid, ", ""), "
-  	obsdate, utmzone, utmeasting, utmnorthing, horizdatnm,
+  	obsdate, obsdate AS obs_date,  utmzone, utmeasting, utmnorthing, horizdatnm,
   	longstddecimaldegrees, latstddecimaldegrees, gpspositionalerror, 
     ", ifelse(include_pedon, "descname AS describer, descname, pedonpurpose, pedontype, pedlabsampnum, labdatadescflag, 
     tsectstopnum, tsectinterval, utransectid, tsectkind, tsectselmeth, erocl,", ""), "

data-raw/NASIS_SoilProfileCollections.R

@@ -20,10 +20,15 @@ write.csv(restrictions(p), "data-raw/spc-restrictions.csv", row.names = FALSE)
 
 recent1822a <- read.csv("data-raw/spc-horizons.csv")
 depths(recent1822a) <- peiid ~ hzdept + hzdepb
+
 site(recent1822a) <- read.csv("data-raw/spc-site.csv")
 diagnostic_hz(recent1822a) <- read.csv("data-raw/spc-diagnostic_hz.csv")
 restrictions(recent1822a) <- read.csv("data-raw/spc-restrictions.csv")
 
+# TODO: PATCH for obs_date
+# recent1822a$obs_date <- recent1822a$obsdate
+# recent1822a$site_id <- recent1822a$usiteid
+
 # ensure that phiid is set as hzID 
 hzidname(recent1822a) <- "phiid"
 hzdesgnname(recent1822a) <- "hzname"