fix merge

Merge branch 'tmp-dev' into dev

# Conflicts:
#	DESCRIPTION
#	inst/qmd_template/make_tag_push_summary.qmd

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: otndo
 Title: Understand your OTN data
-Version: 0.2.3.9000
+Version: 0.3.0.9999
 Authors@R: 
     person("Michael", "O'Brien", , "mike@obrien.page", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1420-6395"))

README.Rmd

@@ -67,7 +67,8 @@ download.file(
     "https://members.oceantrack.org/data/repository/pbsm/detection-extracts/",
     "pbsm_matched_detections_2018.zip/@@download/file"
   ),
-  destfile = file.path(td, "pbsm_matched_detections_2018.zip")
+  destfile = file.path(td, "pbsm_matched_detections_2018.zip"),
+  mode = "wb"
 )
 unzip(file.path(td, "pbsm_matched_detections_2018.zip"),
   exdir = td

README.md

@@ -68,10 +68,11 @@ download.file(
     "https://members.oceantrack.org/data/repository/pbsm/detection-extracts/",
     "pbsm_matched_detections_2018.zip/@@download/file"
   ),
-  destfile = file.path(td, "pbsm_matched_detections_2018.zip")
+  destfile = file.path(td, "pbsm_matched_detections_2018.zip"),
+  mode = "wb"
 )
 unzip(file.path(td, "pbsm_matched_detections_2018.zip"),
-      exdir = td
+  exdir = td
 )
 
 
@@ -116,7 +117,8 @@ receiver data:
 download.file(
   paste0(
     "https://members.oceantrack.org/data/repository/pbsm/data-and-metadata/",
-    "archived-records/2018/pbsm-instrument-deployment-short-form-2018.xls/@@download/file"),
+    "archived-records/2018/pbsm-instrument-deployment-short-form-2018.xls/@@download/file"
+  ),
   destfile = file.path(td, "pbsm-instrument-deployment-short-form-2018.xls"),
   mode = "wb"
 )
@@ -130,7 +132,7 @@ download.file(
   destfile = file.path(td, "pbsm_qualified_detections_2018.zip")
 )
 unzip(file.path(td, "pbsm_qualified_detections_2018.zip"),
-      exdir = td
+  exdir = td
 )
 
 ## Unqualified detections
@@ -142,7 +144,7 @@ download.file(
   destfile = file.path(td, "pbsm_unqualified_detections_2018.zip")
 )
 unzip(file.path(td, "pbsm_unqualified_detections_2018.zip"),
-      exdir = td
+  exdir = td
 )
 
 

inst/qmd_template/make_tag_push_summary.qmd

@@ -26,6 +26,7 @@ knitr::opts_chunk$set(
 library(data.table)
 library(otndo)
 library(reactable)
+library(leaflet)
 ```
 
 
@@ -227,7 +228,9 @@ reactable(new_station_summary)
 #| fig-cap: Figure 7. Number of newly-added detections per receiver. Points represent receiver locations, where color reflects the number of detections  and size  reflects the number of fish at that location.
 #| eval: !expr "nrow(new_matches) > 0"
 
-leaflet_graph(station_spatial)
+new_station_spatial <- prep_station_spatial(new_matches, type = "tag")
+
+leaflet_graph(new_station_spatial)
 ```