Merge pull request #536 from HARPgroup/parent

rburghol · web-flow · commit e2797051ac85 · 2025-11-14T09:24:57.000-05:00
se the hydrotools version of is.empty and populate the parent_id attr…
diff --git a/R/RomFeature.R b/R/RomFeature.R
@@ -117,6 +117,8 @@ RomFeature <- R6Class(
           self$geom = as.character(config$dh_geofield)
         } else if (i == "nextdown_id") {
           self$nextdown_id = as.integer(config$nextdown_id)
+        } else if (i == "parent_id") {
+          self$parent_id = as.integer(config$parent_id)
         }
       }
     },
diff --git a/R/cia_utils.R b/R/cia_utils.R
@@ -600,7 +600,7 @@ fn_downstream <- function(riv.seg, AllSegList) {
     Upstream <- which(as.character(ModelSegments$Downstream)==as.character(ModelSegments$RiverSeg[k]))
     NumUp <- ModelSegments$RiverSeg[Upstream]
     ModelSegments[k,6]<- paste(NumUp, collapse = '+')
-    if (is.empty(ModelSegments[k,6])==TRUE){
+    if (hydrotools::is.empty(ModelSegments[k,6])==TRUE){
       ModelSegments[k,6]<- 'NA'
     } 
     k<-k+1

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ RomFeature <- R6Class(`
`117`	`117`	`self$geom = as.character(config$dh_geofield)`
`118`	`118`	`} else if (i == "nextdown_id") {`
`119`	`119`	`self$nextdown_id = as.integer(config$nextdown_id)`
	`120`	`+ } else if (i == "parent_id") {`
	`121`	`+ self$parent_id = as.integer(config$parent_id)`
`120`	`122`	`}`
`121`	`123`	`}`
`122`	`124`	`},`
Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ fn_downstream <- function(riv.seg, AllSegList) {`
`600`	`600`	`Upstream <- which(as.character(ModelSegments$Downstream)==as.character(ModelSegments$RiverSeg[k]))`
`601`	`601`	`NumUp <- ModelSegments$RiverSeg[Upstream]`
`602`	`602`	`ModelSegments[k,6]<- paste(NumUp, collapse = '+')`
`603`		`- if (is.empty(ModelSegments[k,6])==TRUE){`
	`603`	`+ if (hydrotools::is.empty(ModelSegments[k,6])==TRUE){`
`604`	`604`	`ModelSegments[k,6]<- 'NA'`
`605`	`605`	`}`
`606`	`606`	`k<-k+1`