Merge pull request #536 from USEPA/review-533

add water type + speed up fetchATTAINS(); {arcgislayers}-ify fetchNHD
USEPA · Nov 5, 2024 · 69792d3 · 69792d3
2 parents 265ff53 + 4f41ba0
commit 69792d3
Show file tree

Hide file tree

Showing 8 changed files with 495 additions and 445 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -68,15 +68,14 @@ Imports:
     urltools,
     geojsonsf,
     tibble,
-    rlang
-Remotes:
-    github::R-ArcGIS/arcgislayers,
-    github::R-ArcGIS/arcgis,
-    github::R-ArcGIS/arcpbf
+    rlang,
+    nhdplusTools,
+    arcgislayers,
+    httr,
+    jsonlite
 Depends: 
     R (>= 3.5.0)
 Suggests:
-    nhdplusTools, 
     lwgeom,
     DT,
     RColorBrewer,

diff --git a/R/GeospatialFunctions.R b/R/GeospatialFunctions.R
diff --git a/R/RequiredCols.R b/R/RequiredCols.R
@@ -241,12 +241,17 @@ attains.cols <- c(
   "ATTAINS.isthreatened", "ATTAINS.state", "ATTAINS.on303dlist",
   "ATTAINS.organizationname", "ATTAINS.region", "ATTAINS.Shape_Length",
   "ATTAINS.reportingcycle", "ATTAINS.assmnt_joinkey", "ATTAINS.hastmdl",
-  "ATTAINS.orgtype", "ATTAINS.permid_joinkey", "ATTAINS.catchmentistribal",
+  "ATTAINS.orgtype", 
+  "ATTAINS.permid_joinkey", #  
+  "ATTAINS.catchmentistribal",
   "ATTAINS.ircategory", "ATTAINS.waterbodyreportlink", "ATTAINS.assessmentunitidentifier",
   "ATTAINS.overallstatus", "ATTAINS.isassessed", "ATTAINS.isimpaired",
   "ATTAINS.has4bplan", "ATTAINS.huc12", "ATTAINS.hasalternativeplan",
   "ATTAINS.visionpriority303d", "ATTAINS.areasqkm", "ATTAINS.catchmentareasqkm",
-  "ATTAINS.catchmentstatecode", "ATTAINS.catchmentresolution", "ATTAINS.Shape_Area"
+  "ATTAINS.catchmentstatecode", "ATTAINS.catchmentresolution", "ATTAINS.Shape_Area",
+  "ATTAINS.xwalk_method", 
+  "ATTAINS.xwalk_huc12_version", 
+  "ATTAINS.waterTypeCode"
 )
 
 # Only used in TADA Shiny or should be at the end

diff --git a/man/TADA_GetATTAINS.Rd b/man/TADA_GetATTAINS.Rd
diff --git a/man/TADA_MakeSpatial.Rd b/man/TADA_MakeSpatial.Rd
diff --git a/man/fetchATTAINS.Rd b/man/fetchATTAINS.Rd