Skip to content

Commit 2241d22

Browse files
committed
support glatos workbook version 1.4; fix #272
1 parent e9ce0fa commit 2241d22

12 files changed

Lines changed: 1362 additions & 474 deletions

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Package: glatos
22
Type: Package
33
Title: A package for the Great Lakes Acoustic Telemetry Observation System
44
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.
5-
Version: 0.9.0.9001
6-
Date: 2025-09-12
5+
Version: 0.9.0.9002
6+
Date: 2025-09-24
77
Depends: R (>= 3.6.0)
88
Imports:
99
av,

NAMESPACE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export(as_glatos_animals)
88
export(as_glatos_detections)
99
export(as_glatos_receivers)
1010
export(calc_collision_prob)
11+
export(cast)
1112
export(check_dependencies)
1213
export(check_vdat)
1314
export(check_vue)
@@ -30,6 +31,7 @@ export(glatos_check_col_classes)
3031
export(glatos_check_col_names)
3132
export(glatos_detections)
3233
export(glatos_receivers)
34+
export(identify_workbook_version)
3335
export(install_ffmpeg)
3436
export(interpolate_path)
3537
export(is_glatos_animals)
@@ -56,6 +58,7 @@ export(read_vdat_csv)
5658
export(read_vemco_tag_specs)
5759
export(read_vue_detection_csv)
5860
export(read_vue_event_csv)
61+
export(read_workbook_project)
5962
export(real_sensor_values)
6063
export(receiver_line_det_sim)
6164
export(residence_index)
@@ -72,6 +75,7 @@ export(vrl2csv)
7275
export(vue_convert)
7376
export(write_vdat_csv)
7477
import(data.table)
78+
import(readxl)
7579
import(sp)
7680
importFrom(data.table,foverlaps)
7781
importFrom(dplyr,"%>%")

NEWS.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
----
22

3-
# glatos 0.9.0 dev (2025-09-12)
3+
# glatos 0.9.0 dev (2025-09-24)
44

55

66
### New features
77

8+
- Added support for GLATOS workbook version 1.4 (xlsx file) in
9+
`read_glatos_workbook()`.
10+
- Excel workbooks in version 1.4 have no macros and have column headers
11+
in the first row (v. 1.3 has an empty first row and usually had macros).
12+
- Added new input argument `simplify` which allows (when `simplify = TRUE`)
13+
return of a list with the same structure as the input workbook (e.g.,
14+
columns named "Deployment", "Recovery", "Tagging", ...).
15+
- Disallow multiple columns with the same name (returns an error). In earlier
16+
versions, a suffix was added to all but the first in each set of duplicate
17+
column names.
18+
- fixes [issue #272](https://github.com/ocean-tracking-network/glatos/issues/272)
19+
820
- Added support for parquet files in `read_otn_detections()`.
921
- fixes [issue #254](https://github.com/ocean-tracking-network/glatos/issues/254)
1022

R/class-glatos_workbook.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#' (*.xlsm) file.
88
#'
99
#' @return A list of class `glatos_workbook` created from a standard GLATOS
10-
#' data workbook (*.xlsm) file with three elements:
10+
#' data workbook (*.xlsx or *.xlsm) file with three elements:
1111
#' \describe{
1212
#' \item{metadata}{A list with data about the project.}
1313
#' \item{animals}{A data frame with data about tagged animals.}
@@ -16,7 +16,7 @@
1616
#'
1717
#' @note
1818
#' This function may be developed in the future to dictate conversion
19-
#' constuction from a data frame.
19+
#' construction from a data frame.
2020
#'
2121
#' @keywords internal
2222

0 commit comments

Comments
 (0)