Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/mhpob/glatos into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mhpob committed Jan 13, 2024
2 parents 1e6433e + 07ce141 commit 41f9a1f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Package: glatos
Type: Package
Title: A package for the Great Lakes Acoustic Telemetry Observation System
Description: Functions useful to members of the Great Lakes Acoustic Telemetry Observation System https://glatos.glos.us; many more broadly relevant to simulating, processing, analysing, and visualizing acoustic telemetry data.
Version: 0.8.0.9000
Date: 2024-01-04
Version: 0.8.0.9001
Date: 2024-01-13
Depends: R (>= 3.5.0)
Imports:
av,
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

### Bug fixes

- Omit data.table from class of object returned by `read_glatos_detections()`
and `read_glatos_receivers()`.
- fixes [issue #200](https://github.com/ocean-tracking-network/glatos/issues/200)

- Fix typo in Description to Suggest 'gifski' (not 'gifsky').
- fixes [issue #185](https://github.com/ocean-tracking-network/glatos/issues/185)

Expand Down
4 changes: 3 additions & 1 deletion R/load-read_glatos_detections.r
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ read_glatos_detections <- function(det_file, version = NULL) {
))
}

# assign class
# strip data.table and assign glatos_detections class
data.table::setDF(dtc)

dtc <- as_glatos_detections(dtc)

return(dtc)
Expand Down
4 changes: 3 additions & 1 deletion R/load-read_glatos_receivers.r
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ read_glatos_receivers <- function(rec_file, version = NULL) {
}
#-end v1.x----------------------------------------------------------------

# assign class
# strip data.table and assign glatos_receivers class
data.table::setDF(rec)

rec <- as_glatos_receivers(rec)

return(rec)
Expand Down

0 comments on commit 41f9a1f

Please sign in to comment.