Skip to content

Commit

Permalink
fix some weird imports, catch duplicate refactor artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
mikejohnson51 committed Aug 24, 2022
1 parent d456af2 commit 76c42e2
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ data-raw
^tic\.R$
Dockerfile
^README\.Rmd$
^_pkgdown\.yml$
^docs$
^pkgdown$
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ inst/doc
*.log
*.cache
*.gpkg
docs
8 changes: 0 additions & 8 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,7 @@ importFrom(rvest,html_nodes)
importFrom(rvest,read_html)
importFrom(sf,`st_crs<-`)
importFrom(sf,as_Spatial)
importFrom(sf,distinct)
importFrom(sf,filter)
importFrom(sf,group_by)
importFrom(sf,mutate)
importFrom(sf,mutate_at)
importFrom(sf,read_sf)
importFrom(sf,slice)
importFrom(sf,st_area)
importFrom(sf,st_as_sf)
importFrom(sf,st_as_sfc)
Expand Down Expand Up @@ -161,8 +155,6 @@ importFrom(sf,st_touches)
importFrom(sf,st_transform)
importFrom(sf,st_union)
importFrom(sf,st_within)
importFrom(sf,ungroup)
importFrom(sf,vars)
importFrom(sf,write_sf)
importFrom(terra,aggregate)
importFrom(terra,as.matrix)
Expand Down
3 changes: 1 addition & 2 deletions R/aggregate_to_distribution.R
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ aggregate_to_distribution = function(gpkg = NULL,
crs = 5070)


# Add outlets
if (!is.null(outlets)) {
network_list$flowpaths = left_join(network_list$flowpaths, outlets, by = "ID")

} else {
network_list$flowpaths$poi_id = NA

}

network_list <-
Expand Down
24 changes: 22 additions & 2 deletions R/hyaggregate_utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,28 @@ prepare_network = function(network_list) {

names(network_list$flowpaths) = tolower(names(network_list$flowpaths))
names(network_list$catchments) = tolower(names(network_list$catchments))

if(any(duplicated(network_list$catchments))){
n = sum(duplicated(network_list$catchments))
id = network_list$catchments$id[which(duplicated(network_list$catchments))]
id = paste(id, collapse = ", ")
hyaggregate_log("WARN", glue("Dropping {n} duplicate catchments: {id}"))
network_list$catchments = filter(network_list$catchments, !duplicated(network_list$catchments))
}

if(any(duplicated(network_list$flowpaths))){
n = sum(duplicated(network_list$flowpaths))
id = network_list$flowpaths$id[which(duplicated(network_list$flowpaths))]
id = paste(id, collapse = ", ")
hyaggregate_log("WARN", glue("Dropping {n} duplicate flowpaths: {id}"))
network_list$flowpaths = filter(network_list$flowpaths, !duplicated(network_list$flowpaths))
}

if(any(duplicated(network_list$flowpaths$id))){
n = sum(duplicated(network_list$flowpaths))
hyaggregate_log("WARN", glue("Dropping {n} duplicate flowpaths."))
}


# Add a hydrosequence to the flowpaths
network_list$flowpaths = add_hydroseq(flowpaths = network_list$flowpaths)
Expand All @@ -43,9 +65,7 @@ prepare_network = function(network_list) {
)
))
}



network_list$flowpaths$order = network_list$flowpaths %>%
st_drop_geometry() %>%
flush_prefix(c("id", "toid")) %>%
Expand Down
3 changes: 2 additions & 1 deletion R/poi_handlers.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ generate_catchment_network = function(gpkg){
#' @param verbose should messages be emitted?
#' @return data.frame with ID, type columns
#' @export
#' @importFrom sf read_sf st_drop_geometry mutate_at vars mutate group_by ungroup filter distinct slice
#' @importFrom sf read_sf st_drop_geometry
#' @importFrom dplyr mutate_at vars mutate group_by ungroup filter distinct slice
#' @importFrom tidyr pivot_longer

poi_to_outlet = function(gpkg,
Expand Down

0 comments on commit 76c42e2

Please sign in to comment.