Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
9a02b8a
Add names to tl template
ateucher Feb 13, 2024
b9d6f8b
Merge commit 'cf2528c9c6b88297d23edb7cef3f20bf5cbb2e29'
ateucher Mar 13, 2026
e7e5975
update minimum R version
ateucher Mar 13, 2026
7bb6f0d
Merged origin/main into Use-timelapse-tdb
ateucher Mar 13, 2026
4f68f90
Update .Rbuildignore and .gitignore
ateucher Mar 13, 2026
d2ca3bb
Allow extra columns outside the template, but drop empty unnamed columns
ateucher Mar 13, 2026
ca05d8e
Don't fail if no snow_depth column
ateucher Mar 16, 2026
dcb38bd
Get template directly from tdb files
ateucher Mar 16, 2026
0b07052
Remove template from sysdata
ateucher Mar 16, 2026
4861b8e
Choose latest template when more than one match
ateucher Mar 16, 2026
1de47f6
Use character as default, fill in master col spec if later
ateucher Mar 16, 2026
33aa9d7
Override some unspecified column - temperature and obj_count_image
ateucher Mar 16, 2026
45f9a38
Fix tests
ateucher Mar 16, 2026
46b1f88
Update snapshots
ateucher Mar 16, 2026
ed4c6e9
Document template arg; use base list.files; use template arg
ateucher Mar 16, 2026
7be90f1
Add test for manual template, standardize trigger mode if exists
ateucher Mar 16, 2026
a192e68
Only warn for really extra columns
ateucher Mar 17, 2026
0d5ac1d
Helper function for package templates
ateucher Mar 17, 2026
a599210
Error when no template in filename
ateucher Mar 17, 2026
cd5146e
Better checking with custom template
ateucher Mar 17, 2026
b3a4ec7
Make interactive menu to choose template
ateucher Mar 17, 2026
70db141
Check for columns before summarizing
ateucher Mar 17, 2026
5808103
Fix check starred, add total_count_episode if not present
ateucher Mar 17, 2026
e75cbab
Add template as class attribute
ateucher Mar 17, 2026
f7a2db7
Update README
ateucher Mar 17, 2026
f3ccd18
Take out mention of shiny app in templates section in README
ateucher Mar 17, 2026
e0e07d3
Use any_of to select any columns that match
ateucher Mar 17, 2026
550cb2d
Clean wallow data with separate video/jpg triggers
ateucher Mar 17, 2026
8107cc4
documentation
ateucher Mar 17, 2026
2509879
Make robust to different image/video file types
ateucher Mar 17, 2026
220fae8
scratch file for testing wallow and migration data
ateucher Mar 17, 2026
3694108
Keep Time Lapse photos in for now
ateucher Mar 17, 2026
daaa56e
Remove comment
ateucher Mar 17, 2026
41d0f3d
Drop trailing comma
ateucher Mar 17, 2026
d443779
Suggestions from copilot review
ateucher Mar 17, 2026
20f2356
More explicitly override generic character fields with those from mas…
ateucher Mar 17, 2026
5cf7fab
Update snapshot
ateucher Mar 17, 2026
bf5cde3
Merge branch 'Use-timelapse-tdb' of https://github.com/bcgov/bccamtra…
ateucher Mar 17, 2026
e9b2c4e
Update scratch file
ateucher Mar 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
^bccamtrap\.code-workspace$
^[.]?air[.]toml$
^\.vscode$
^\.claude$
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
.quarto
.Rprofile
docs
.claude

/.quarto/
**/*.quarto_ipynb
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ URL: https://github.com/bcgov/bccamtrap,
https://bcgov.github.io/bccamtrap/
BugReports: https://github.com/bcgov/bccamtrap/issues
Depends:
R (>= 2.10)
R (>= 4.1.0)
Imports:
bcmaps (>= 2.2.0),
bslib,
cli,
DBI,
dplyr,
ggiraph,
ggplot2,
glue,
gt,
janitor,
jsonlite,
leaflet,
lubridate,
mapview,
Expand All @@ -33,19 +35,17 @@ Imports:
readr,
readxl,
rlang (>= 1.1.0),
RSQLite,
sf,
shiny,
shinycssloaders,
tidyr,
withr,
zoo
Suggests:
DBI,
googledrive,
jsonlite,
RSQLite,
testthat (>= 3.0.0),
testthat (>= 3.0.0)
Config/testthat/edition: 3
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.3
9 changes: 7 additions & 2 deletions R/classes.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@ as.deployments <- function(x, subclass, ...) {
)
}

as.image_data <- function(x, ...) {
structure(x, class = c("image_data", class(x)), ...)
as.image_data <- function(x, template, ...) {
structure(
x,
class = c("image_data", class(x)),
template = template,
...
)
}

as.sample_sessions <- function(x, ...) {
Expand Down
Loading
Loading