Merge branch 'main' of github.com:ABbiodiversity/wildRtrax

CITATION.cff

@@ -39,19 +39,6 @@ references:
     address: Vienna, Austria
   year: '2024'
   version: '>= 4.1.0'
-- type: software
-  title: curl
-  abstract: 'curl: A Modern and Flexible Web Client for R'
-  notes: Imports
-  url: https://jeroen.r-universe.dev/curl
-  repository: https://CRAN.R-project.org/package=curl
-  authors:
-  - family-names: Ooms
-    given-names: Jeroen
-    email: [email protected]
-    orcid: https://orcid.org/0000-0002-4035-0289
-  year: '2024'
-  doi: 10.32614/CRAN.package.curl
 - type: software
   title: dplyr
   abstract: 'dplyr: A Grammar of Data Manipulation'
@@ -156,7 +143,7 @@ references:
   authors:
   - family-names: Ooms
     given-names: Jeroen
-    email: [email protected]
+    email: [email protected]
     orcid: https://orcid.org/0000-0002-4035-0289
   year: '2024'
   doi: 10.32614/CRAN.package.magick

R/analyze-data.R

@@ -286,7 +286,8 @@ wt_ind_detect <- function(x, threshold, units = "minutes", datetime_col = image_
     # Sometimes VNA sneaks in here
     mutate(individual_count = as.numeric(ifelse(individual_count == "VNA", 1, individual_count))) |>
     # Amalgamate tags of same species in same image; currently broken into two separate rows
-    group_by(location, {{datetime_col}}, species_common_name) |>
+    # Use image_id because sometimes {{datetime_col}} is same for 2 images
+    group_by(location, image_id, species_common_name) |>
     mutate(individual_count = sum(individual_count)) |>
     distinct(location, {{datetime_col}}, species_common_name, individual_count, .keep_all = TRUE) |>
     ungroup() |>

README.md

@@ -7,7 +7,6 @@
 [![Codecov test coverage](https://codecov.io/gh/ABbiodiversity/wildRtrax/branch/main/graph/badge.svg)](https://app.codecov.io/gh/ABbiodiversity/wildRtrax?branch=main)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.13916882.svg)](https://doi.org/10.5281/zenodo.13916882)
 [![R-CMD-check](https://github.com/ABbiodiversity/wildRtrax/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ABbiodiversity/wildRtrax/actions/workflows/R-CMD-check.yaml)
->>>>>>> development
 <!-- badges: end -->
 
 ## Overview