Merge pull request #385 from DOI-USGS/380

support Permanent_Identifier and case insensitive collumn culling
DOI-USGS · May 10, 2024 · a69653a · a69653a
2 parents b0cd256 + 2f674fa
commit a69653a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/R/A_nhdplusTools.R b/R/A_nhdplusTools.R
@@ -10,6 +10,7 @@ nhdplusTools_env <- new.env()
 # NHDPlus Attributes
 COMID <- "COMID"
 FEATUREID <- "FEATUREID"
+Permanent_Identifier <- "Permanent_Identifier"
 Hydroseq <- "Hydroseq"
 UpHydroseq <- "UpHydroseq"
 DnHydroseq <- "DnHydroseq"
@@ -50,6 +51,7 @@ WBAREACOMI <- "WBAREACOMI"
 # List of input names that should be changed to replacement names
 nhdplus_attributes <- list(
   COMID = COMID, NHDPlusID = COMID,
+  Permanent_Identifier = Permanent_Identifier,
   RPUID = RPUID,
   VPUID = VPUID,
   FEATUREID = FEATUREID,

diff --git a/R/get_nhdplushr.R b/R/get_nhdplushr.R
@@ -186,7 +186,7 @@ cull_cols <- function(x, keep_cols) {
 
   if(is.null(keep_cols)) return(x)
 
-  keep_cols <- keep_cols[keep_cols %in% names(x)]
+  keep_cols <- names(x)[sapply(names(x), \(x) any(grepl(x, keep_cols, ignore.case = TRUE)))]
 
   geom_name <- attr(x, "sf_column")
   if(!geom_name %in% keep_cols) keep_cols <- c(keep_cols, geom_name)