fetchNASIS("components"): Use a custom query for mapunit info

ncss-tech · Jun 9, 2022 · 0495bdc · dylanbeaudette · Jun 11, 2022 · dylanbeaudette
1 parent cdd0330
commit 0495bdc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/R/fetchNASIS_components.R b/R/fetchNASIS_components.R
@@ -20,9 +20,26 @@
     assign('component.hz.problems', value = character(0), envir = soilDB.env)
   }
 
-  # load data in pieces
+  # optionally legend and mapunit information are included if in local DB/selected set
+  #   includes possible results for rep and non-rep DMUs and any mustatus
   f.lg         <- get_legend_from_NASIS(SS = SS, dsn = dsn)
-  f.mu         <- get_mapunit_from_NASIS(SS = SS, repdmu = FALSE, dsn = dsn) # include possible results for rep and non-rep DMUS
+  mu.q <- "SELECT ng.grpname, liid, lmapunitiid, lmapunitiid AS mukey, areatypename,
+           nationalmusym, muiid, musym, muname, mukind, mutype, muacres, mustatus,
+           dmuinvesintens, farmlndcl, dmuiid, repdmu 
+           FROM area a 
+            INNER JOIN areatype at ON at.areatypeiid = a.areatypeiidref
+            INNER JOIN legend_View_1 l ON l.areaiidref = a.areaiid 
+            INNER JOIN lmapunit_View_1 lmu ON lmu.liidref = l.liid 
+            INNER JOIN mapunit_View_1 mu ON mu.muiid = lmu.muiidref
+            INNER JOIN nasisgroup ng ON ng.grpiid = mu.grpiidref
+            INNER JOIN correlation_View_1 cor ON cor.muiidref = mu.muiid
+            INNER JOIN datamapunit_View_1 dmu ON dmu.dmuiid = cor.dmuiidref"
+  if (!SS) {
+    mu.q <- gsub("_View_1", "", mu.q)
+  }
+  f.mu         <- uncode(dbQueryNASIS(NASIS(dsn = dsn), mu.q), dsn = dsn)
+
+  # load data in pieces
   f.comp       <- get_component_data_from_NASIS_db(SS = SS, dsn = dsn, nullFragsAreZero = nullFragsAreZero)
   f.chorizon   <- get_component_horizon_data_from_NASIS_db(SS = SS, fill = fill, dsn = dsn, nullFragsAreZero = nullFragsAreZero)
   f.copm       <- get_component_copm_data_from_NASIS_db(SS = SS, dsn = dsn)
@@ -75,12 +92,7 @@
 
   # add mapunit data to object if any
   if (!is.null(f.mu) && nrow(f.mu) > 0) {
-    f.mu$mukey <- f.mu$lmapunitiid
-    site(f.chorizon) <- f.mu[,c("liid", "lmapunitiid", "mukey",
-                                "nationalmusym", "muiid", "musym", 
-                                "muname", "mukind", "mutype", 
-                                "mustatus", "dmuinvesintens",
-                                "farmlndcl", "dmuiid", "repdmu")] # left-join via dmuiid
+    site(f.chorizon) <- f.mu # left-join via dmuiid
   }
 
   # add legend data to object if any

diff --git a/R/get_component_data_from_NASIS_db.R b/R/get_component_data_from_NASIS_db.R
@@ -626,7 +626,7 @@ get_component_horizon_data_from_NASIS_db <- function(SS = TRUE,
   LEFT OUTER JOIN chtexturegrp_View_1 cht ON cht.chiidref = ch.chiid AND cht.rvindicator = 1
   LEFT OUTER JOIN chstructgrp_View_1 chs ON chs.chiidref = ch.chiid AND chs.rvindicator = 1
 
-  -- why is this here?
+  -- why is this here? to order on dmudesc
   INNER JOIN datamapunit_View_1 dmu ON dmu.dmuiid = co.dmuiidref
 
   ORDER BY dmudesc, comppct_r DESC, compname ASC, hzdept_r ASC;"
@@ -658,7 +658,7 @@ get_component_horizon_data_from_NASIS_db <- function(SS = TRUE,
 
   # "sieving" chfrags, chuarts tables for parity with fetchNASIS("pedons") @horizons slot columns
 
-  if (nrow(d) > 0){
+  if (nrow(d) > 0) {
     # horizon fragments
     chf <- simplifyFragmentData(
       uncode(dbQueryNASIS(channel, q2, close = FALSE), dsn = dsn),