feat: add project funding, v1.3.7

- Add project_funding to makara datasets (was set ot NA before)
- Add section to DeploymentDetail
- Bump to v1.3.7

Author: jeffwalkernoaa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pacm",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -45,6 +45,7 @@
   },
   "overrides": {
     "d3-color": "^3.0.0",
-    "@ranfdev/deepobj": "1.0.4"
+    "@ranfdev/deepobj": "1.0.4",
+    "brace-expansion": ">=5.0.8"
   }
 }

package.json

@@ -317,6 +317,7 @@ targets_makara <- list(
             makara_project_id,
             project_id,
             project_code,
+            project_funding,
             project_contacts
           ),
         by = c("makara_project_id")
@@ -336,6 +337,7 @@ targets_makara <- list(
 
         # project
         project = project_code,
+        project_funding,
         data_poc = project_contacts,
 
         # deployment
@@ -348,6 +350,7 @@ targets_makara <- list(
         deployment_type = if_else(platform_type_mobile, "MOBILE", "STATIONARY"),
         water_depth_meters = deployment_water_depth_m,
         dynamic_management_platform = dynamic_management_platform,
+        deployment_url,
 
         # recording
         recorder_depth_meters = map_chr(recordings, ~ format_range(.x$recorder_depth_meters)),
@@ -773,8 +776,6 @@ targets_makara <- list(
         submission_id = "MAKARA",
         source = "MAKARA",
         # PARS-only fields; NA here so every source shares one shape
-        deployment_url = NA_character_,
-        project_funding = NA_character_,
         recording_duration_secs = NA_real_,
         recording_interval_secs = NA_real_
       ) |>

r/R/makara.R

@@ -102,34 +102,34 @@ makara_projects|stem|6dfc7d9def206adb|a1fa423f1ce14b9e|e485203958fb4115|-2036387
 makara_recordings|stem|fdfe41e5e7156940|45e8641005ea4eab|e485203958fb4115|1548282254||t20665.5784339965s|s83247b|83247|rds|local|vector|||0.044||
 makara_sites|stem|9b9a2ff26ad7536d|1acf0148d038953d|e485203958fb4115|1877513385||t20665.5784433675s|s81524b|81524|rds|local|vector|||0.848||
 makara_sites_pacm|stem|bc1b123979109f08|79714817f90fd74b|8fb982e2ff772672|1616462878||t20665.5784438134s|s16514b|16514|rds|local|vector|||0.001||
-makara_deployments|stem|002b227dd2be3a88|1f41d2aeaa925e2b|f770f254e60989ec|-704525416||t20665.5784541274s|s183551b|183551|rds|local|vector|||0.325||
-makara_deployments_pacm|stem|004fcaaa58c68623|91d9feda55b99837|12dd4415db352efd|-1487034830||t20665.5784550998s|s97776b|97776|rds|local|vector|||0.006||
-makara_analyses|stem|363f4b605aa7e939|2fa3db0621948c74|dce78adcda733d19|1131499317||t20665.5784700731s|s225349b|225349|rds|local|vector|||0.692||
-makara_tracks|stem|0cf36a38a76c5a67|375079808da21b34|d258e5312f33f485|-1825061865||t20665.5786059365s|s4933884b|4933884|rds|local|vector|||12.202||
-makara_mobile_deployments_missing_tracks|stem|9f681d07e6431a12|77c270daddffdf03|17524159db4ab5ee|1402159278||t20665.5786067343s|s194b|194|rds|local|vector|||0.002|[makara] Found 12 mobile deployments missing tracks|
 makara_detections_mobile|stem|253dfe4b91fa1f9f|243eaf2683d68171|10b04235c60882c3|1504345014||t20665.578684721s|s3811002b|3811002|rds|local|vector|||17.496||
 makara_detections|stem|5a36b33ba9fc11b1|cf4eb9e8d66442a3|c4b5228682e25ec7|615277591||t20665.5787029312s|s4537722b|4537722|rds|local|vector|||0.489||
 makara_analyses_pacm|stem|ae575f9457c4051e|167453e554996ffa|3b3a52b0531300a3|1754061444||t20665.5787345825s|s4661768b|4661768|rds|local|vector|||1.727||
 makara_citations_pacm|stem|3096149f5f7e9fc5|3c341052a897ee33|a4e10cedf6afe585|-1285629772||t20665.5787441534s|s697b|697|rds|local|vector|||0.006||
-makara_pacm|stem|9c1b55dcb16fc546|e2bb381d3d566ea8|e719417c7ae1d7ee|-771249215||t20665.5787579403s|s9699073b|9699073|rds|local|vector|||0||
-pacm_data_raw|stem|6f0ea253096db3f7|bfdb04144ca6e865|869d4628bfdf912e|317370686||t20665.5787730051s|s10296725b|10296725|rds|local|vector|||0.007||
-pacm_exclude|stem|3ca966e4970d6c16|4da92f993db0f58c|cc940aaf8e6c2b04|-1527439320||t20665.578776485s|s270b|270|rds|local|vector|||0.005||
-pacm_data|stem|1a7bcf7008e87423|4b973124d8f92936|5f0b9456345fbb7c|2058829249||t20665.5791127374s|s6946538b|6946538|rds|local|vector|||28.042||
-export_analyses_file|stem|1b2a3aaeb93126e5|a7ebf966abb14e20|48eea489ae027e35|1462024440|output/export/analyses.csv|t20665.579116564s|s3536059b|3536059|file|local|vector|||0.063||
-pacm_deployments|stem|011619cfae367ed3|6450a406889eff28|c8733dd33fa434b5|543366116||t20665.5791244216s|s2772650b|2772650|rds|local|vector|||0.074||
-pacm_analyses_no_theme|stem|6933e9d90366c967|d2a10ce969502fe4|658afc4928f151ee|1668423467||t20665.5791292772s|s718b|718|rds|local|vector|||0.007||
-export_sites_file|stem|376a70d18280b12f|3e470f2024c1a9b6|ee500489ccfee7f9|-1164200004|output/export/sites.csv|t20665.5791347573s|s44854b|44854|file|local|vector|||0.06||
-export_citations_file|stem|5dd65a3c10485d55|a9dfa0525c18f19e|7deb81a1ffe06151|1782747769|output/export/citations.csv|t20665.5791357748s|s1333b|1333|file|local|vector|||0.066||
-export_deployments_file|stem|a5f50320fc2db6ed|eb61daf767675c88|1b0105ca56689f5d|297047246|output/export/deployments.csv|t20665.5791362135s|s1006161b|1006161|file|local|vector|||0.097||
-export_tracks_file|stem|ef686de7ad276ba9|c32113f5813f4593|4b1dae7896871bf6|-1521520435|output/export/tracks.csv|t20665.5791411633s|s34106048b|34106048|file|local|vector|||0.527||
-pacm_ref|stem|8a2a98a15e34c97c|8405bd16f0bf84d8|ee3b38ab6fb42474|-1695610880||t20665.5791432018s|s8253b|8253|rds|local|vector|||0.003||
-pacm_tracks_map|stem|b1f545e5c8b72561|890eaea79b6b2b58|c8733dd33fa434b5|1044126119||t20665.5791448566s|s3916002b|3916002|rds|local|vector|||2.285||
-pacm_sites_map|stem|a0f1ad41420a57cd|d4434d57acc34a67|c8733dd33fa434b5|260666098||t20665.579152686s|s51155b|51155|rds|local|vector|||1.608||
-export_detections_file|stem|1d4e0a58b5a3a4a2|f6e133cd9eaacdbc|3e2008dc5eefcc92|-1251242918|output/export/detections.csv|t20665.5791541888s|s113515039b|113515039|file|local|vector|||1.684||
-pacm_deployments_map|stem|5f4594cdabcb2814|e8163a2dcd2f554f|c8733dd33fa434b5|-1250941415||t20665.5791545019s|s212277b|212277|rds|local|vector|||1.693||
-export|stem|4a01a2faba59519a|1ea8b86e6c94b5f0|e4c6a6b093dd5f6f|-2123215358||t20665.5791547334s|s136b|136|rds|local|vector|||0||
-pacm_themes|stem|d6722bf88e713c8c|8ed9f6ae2aaf4e03|43b3450c4c8bd8d9|730575946||t20665.579171507s|s28401507b|28401507|rds|local|vector|||0.626||
-pacm_themes_files|stem|f5a2a349baa4668c|ce2184b51e53f007|d078acdd6ec9234c|490252437|output/www/beaked/sites.json*output/www/beaked/deployments.json*output/www/beaked/tracks.json*output/www/beaked/detections.csv*output/www/blue/sites.json*output/www/blue/deployments.json*output/www/blue/tracks.json*output/www/blue/detections.csv*output/www/dolphin/sites.json*output/www/dolphin/deployments.json*output/www/dolphin/tracks.json*output/www/dolphin/detections.csv*output/www/fin/sites.json*output/www/fin/deployments.json*output/www/fin/tracks.json*output/www/fin/detections.csv*output/www/gray/sites.json*output/www/gray/deployments.json*output/www/gray/tracks.json*output/www/gray/detections.csv*output/www/humpback/sites.json*output/www/humpback/deployments.json*output/www/humpback/tracks.json*output/www/humpback/detections.csv*output/www/kogia/sites.json*output/www/kogia/deployments.json*output/www/kogia/tracks.json*output/www/kogia/detections.csv*output/www/minke/sites.json*output/www/minke/deployments.json*output/www/minke/tracks.json*output/www/minke/detections.csv*output/www/narw/sites.json*output/www/narw/deployments.json*output/www/narw/tracks.json*output/www/narw/detections.csv*output/www/nbhf/sites.json*output/www/nbhf/deployments.json*output/www/nbhf/tracks.json*output/www/nbhf/detections.csv*output/www/pilot/sites.json*output/www/pilot/deployments.json*output/www/pilot/tracks.json*output/www/pilot/detections.csv*output/www/pwdo/sites.json*output/www/pwdo/deployments.json*output/www/pwdo/tracks.json*output/www/pwdo/detections.csv*output/www/risso/sites.json*output/www/risso/deployments.json*output/www/risso/tracks.json*output/www/risso/detections.csv*output/www/sei/sites.json*output/www/sei/deployments.json*output/www/sei/tracks.json*output/www/sei/detections.csv*output/www/sperm/sites.json*output/www/sperm/deployments.json*output/www/sperm/tracks.json*output/www/sperm/detections.csv*output/www/hapo/sites.json*output/www/hapo/deployments.json*output/www/hapo/tracks.json*output/www/hapo/detections.csv*output/www/unid/sites.json*output/www/unid/deployments.json*output/www/unid/tracks.json*output/www/unid/detections.csv*output/www/bodo/sites.json*output/www/bodo/deployments.json*output/www/bodo/tracks.json*output/www/bodo/detections.csv*output/www/brwh/sites.json*output/www/brwh/deployments.json*output/www/brwh/tracks.json*output/www/brwh/detections.csv*output/www/kiwh/sites.json*output/www/kiwh/deployments.json*output/www/kiwh/tracks.json*output/www/kiwh/detections.csv*output/www/deployments/sites.json*output/www/deployments/deployments.json*output/www/deployments/tracks.json*output/www/deployments/detections.csv|t20665.579611556s|s242170154b|242170154|file|local|vector|||37.056||
+makara_deployments|stem|2cb6c277428c8bff|698d040f41731001|f770f254e60989ec|-704525416||t20665.6120954536s|s185600b|185600|rds|local|vector|||0.381||
+makara_analyses|stem|363f4b605aa7e939|2fa3db0621948c74|aa2337c8b42cf78a|1131499317||t20665.6121256327s|s225349b|225349|rds|local|vector|||0.724||
+makara_deployments_pacm|stem|a8afcd88c66b4735|bbceeb0b42cfb365|79bbc3d7dd3f4d22|-1487034830||t20665.6121745867s|s99667b|99667|rds|local|vector|||0.011||
+makara_tracks|stem|0cf36a38a76c5a67|375079808da21b34|845d006c2ad01195|-1825061865||t20665.6123250686s|s4933884b|4933884|rds|local|vector|||12.061||
+makara_mobile_deployments_missing_tracks|stem|9f681d07e6431a12|77c270daddffdf03|6e00ff5bc97f67d9|1402159278||t20665.612325987s|s194b|194|rds|local|vector|||0.002|[makara] Found 12 mobile deployments missing tracks|
+makara_pacm|stem|768ae83bc57e27c5|e2bb381d3d566ea8|fde913b1265bb58c|-771249215||t20665.6123400689s|s9701621b|9701621|rds|local|vector|||0||
+pacm_data_raw|stem|f83444d238b9849b|bfdb04144ca6e865|66378149d7166fb0|317370686||t20665.612355384s|s10297705b|10297705|rds|local|vector|||0.007||
+pacm_exclude|stem|3ca966e4970d6c16|4da92f993db0f58c|4a6edb1bbfb86772|-1527439320||t20665.6123587124s|s270b|270|rds|local|vector|||0.005||
+pacm_data|stem|9e3259f98f19d981|4b973124d8f92936|b146d6873a6df2fe|2058829249||t20665.6127022168s|s6947871b|6947871|rds|local|vector|||28.65||
+export_analyses_file|stem|1b2a3aaeb93126e5|a7ebf966abb14e20|79a9a960c8044422|1462024440|output/export/analyses.csv|t20665.6127066983s|s3536059b|3536059|file|local|vector|||0.094||
+export_citations_file|stem|5dd65a3c10485d55|a9dfa0525c18f19e|5612fbe74cac58ee|1782747769|output/export/citations.csv|t20665.6127238133s|s1333b|1333|file|local|vector|||0.056||
+export_sites_file|stem|376a70d18280b12f|3e470f2024c1a9b6|d6c17edb1bd33414|-1164200004|output/export/sites.csv|t20665.6127238679s|s44854b|44854|file|local|vector|||0.068||
+export_deployments_file|stem|02b2c5eb960a86d8|eb61daf767675c88|2c0e1981232424c5|297047246|output/export/deployments.csv|t20665.6127242229s|s1091429b|1091429|file|local|vector|||0.101||
+export_tracks_file|stem|ef686de7ad276ba9|c32113f5813f4593|2ea5fed980f4ddf1|-1521520435|output/export/tracks.csv|t20665.6127293594s|s34106048b|34106048|file|local|vector|||0.53||
+pacm_deployments|stem|ccb736ddea92ab73|6450a406889eff28|c457101e0e2c5306|543366116||t20665.6127311812s|s2774660b|2774660|rds|local|vector|||0.217||
+pacm_tracks_map|stem|e2513c97801f2a95|890eaea79b6b2b58|c457101e0e2c5306|1044126119||t20665.6127318915s|s3916001b|3916001|rds|local|vector|||1.958||
+pacm_ref|stem|8a2a98a15e34c97c|8405bd16f0bf84d8|b1e7fc0e5b6e6fe4|-1695610880||t20665.6127323241s|s8253b|8253|rds|local|vector|||0.003||
+pacm_analyses_no_theme|stem|6933e9d90366c967|d2a10ce969502fe4|8bec3b191160b345|1668423467||t20665.6127324086s|s718b|718|rds|local|vector|||0.011||
+pacm_sites_map|stem|717942e1638b8e88|d4434d57acc34a67|c457101e0e2c5306|260666098||t20665.6127412388s|s51157b|51157|rds|local|vector|||1.603||
+export_detections_file|stem|1d4e0a58b5a3a4a2|f6e133cd9eaacdbc|ca41a084ca975532|-1251242918|output/export/detections.csv|t20665.6127424343s|s113515039b|113515039|file|local|vector|||1.678||
+pacm_deployments_map|stem|c73f011dca022b23|e8163a2dcd2f554f|c457101e0e2c5306|-1250941415||t20665.6127427764s|s212282b|212282|rds|local|vector|||1.709||
+export|stem|4a01a2faba59519a|1ea8b86e6c94b5f0|7a7205f728b75b8f|-2123215358||t20665.6127430359s|s136b|136|rds|local|vector|||0.001||
+pacm_themes|stem|aecc5274c723defc|8ed9f6ae2aaf4e03|01053249fa689a17|730575946||t20665.6127735364s|s28403424b|28403424|rds|local|vector|||0.407||
+pacm_themes_files|stem|e73e839775cd5aa8|ce2184b51e53f007|f21500a5fbf85cc0|490252437|output/www/beaked/sites.json*output/www/beaked/deployments.json*output/www/beaked/tracks.json*output/www/beaked/detections.csv*output/www/blue/sites.json*output/www/blue/deployments.json*output/www/blue/tracks.json*output/www/blue/detections.csv*output/www/dolphin/sites.json*output/www/dolphin/deployments.json*output/www/dolphin/tracks.json*output/www/dolphin/detections.csv*output/www/fin/sites.json*output/www/fin/deployments.json*output/www/fin/tracks.json*output/www/fin/detections.csv*output/www/gray/sites.json*output/www/gray/deployments.json*output/www/gray/tracks.json*output/www/gray/detections.csv*output/www/humpback/sites.json*output/www/humpback/deployments.json*output/www/humpback/tracks.json*output/www/humpback/detections.csv*output/www/kogia/sites.json*output/www/kogia/deployments.json*output/www/kogia/tracks.json*output/www/kogia/detections.csv*output/www/minke/sites.json*output/www/minke/deployments.json*output/www/minke/tracks.json*output/www/minke/detections.csv*output/www/narw/sites.json*output/www/narw/deployments.json*output/www/narw/tracks.json*output/www/narw/detections.csv*output/www/nbhf/sites.json*output/www/nbhf/deployments.json*output/www/nbhf/tracks.json*output/www/nbhf/detections.csv*output/www/pilot/sites.json*output/www/pilot/deployments.json*output/www/pilot/tracks.json*output/www/pilot/detections.csv*output/www/pwdo/sites.json*output/www/pwdo/deployments.json*output/www/pwdo/tracks.json*output/www/pwdo/detections.csv*output/www/risso/sites.json*output/www/risso/deployments.json*output/www/risso/tracks.json*output/www/risso/detections.csv*output/www/sei/sites.json*output/www/sei/deployments.json*output/www/sei/tracks.json*output/www/sei/detections.csv*output/www/sperm/sites.json*output/www/sperm/deployments.json*output/www/sperm/tracks.json*output/www/sperm/detections.csv*output/www/hapo/sites.json*output/www/hapo/deployments.json*output/www/hapo/tracks.json*output/www/hapo/detections.csv*output/www/unid/sites.json*output/www/unid/deployments.json*output/www/unid/tracks.json*output/www/unid/detections.csv*output/www/bodo/sites.json*output/www/bodo/deployments.json*output/www/bodo/tracks.json*output/www/bodo/detections.csv*output/www/brwh/sites.json*output/www/brwh/deployments.json*output/www/brwh/tracks.json*output/www/brwh/detections.csv*output/www/kiwh/sites.json*output/www/kiwh/deployments.json*output/www/kiwh/tracks.json*output/www/kiwh/detections.csv*output/www/deployments/sites.json*output/www/deployments/deployments.json*output/www/deployments/tracks.json*output/www/deployments/detections.csv|t20665.6132232491s|s243038213b|243038213|file|local|vector|||37.887||
 format_number|function|f813cfef12221922
 PARS_PROFILES|object|3da8e5d8ed7f0778
 PARS_SUBMISSIONS_REQUIRED|object|5b241f49e030f813