Skip to content

Commit

Permalink
reinstate changes from #228 that were lost during merge conflict reso…
Browse files Browse the repository at this point in the history
…lution
  • Loading branch information
chrisholbrook committed Aug 22, 2024
1 parent e99bb84 commit 0b89b0b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
16 changes: 14 additions & 2 deletions R/vis-interpolate_path.r
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
#' interpolation will be used for all points when `lnl_thresh`
#' = 0.
#'
#' @details All linear interpolation is done by code{stats::approx} with
#' @details All linear interpolation is done by [stats::approx()] with
#' argument `ties = "ordered"` controlling how tied `x` values
#' are handled. See [approxfun()].
#' are handled. See [stats::approxfun()].
#'
#' @return A dataframe with animal_id, bin_timestamp,
#' latitude, longitude, and record_type.
Expand Down Expand Up @@ -204,6 +204,18 @@
interpolate_path <- function(det, trans = NULL, start_time = NULL,
int_time_stamp = 86400, lnl_thresh = 0.9,
out_class = NULL, show_progress = TRUE) {

## Declare global variables for NSE & R CMD check
detection_timestamp_utc <- record_type <- num_rows <- animal_id <- bin <-
bin_stamp <- i_lat <- deploy_lat <- i_lon <- deploy_long <-
bin_timestamp <- num <- start_dtc <- x.animal_id <-
x.detection_timestamp_utc <- x.deploy_lat <- x.deploy_long <-
x.record_type <- x.num_rows <- x.bin <- gcd <- i.start <-
lcd <- crit <- t_lat <- t_lon <- t_timestamp <- coord <- grp <-
nln_longitude <- nln_latitude <- seq_count <- i_time <- latitude_lead <-
longitude_lead <- cumdist <- NULL


# stop if out_class is not NULL, data.table, or tibble
if (!is.null(out_class)) {
if (!(out_class %in% c("data.table", "tibble"))) {
Expand Down
4 changes: 2 additions & 2 deletions man/convert_otn_erddap_to_att.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/interpolate_path.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0b89b0b

Please sign in to comment.