Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new study: Zeppel_2008 #731

Open
wants to merge 33 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0821d12
Add new studies: Data extracted from textual flora descriptions (#701)
ehwenk May 25, 2023
4a57b13
Add new study: RussellSmith_2012 (#702)
yangsophieee May 25, 2023
3fd10d3
Add new studies: Santini_2012; Santini_2013; Santini_2016 (#703)
ehwenk May 26, 2023
15ef184
Add new study: Nano_2011 (#704)
yangsophieee May 26, 2023
57f46fe
Add new study: Enright_2014 (#705)
yangsophieee May 26, 2023
6a730b0
Fire response workshop 2023 (#709)
ehwenk May 30, 2023
c859c95
Add new study: Mitchell_2008 (#706)
ehwenk Jun 1, 2023
dd19033
Add new study: Kocacinar_2003 (#708)
ehwenk Jun 1, 2023
b1a32d3
Add new study: Searson_2004 (#707)
ehwenk Jun 1, 2023
1dc281a
Add new study: Witkowski_1991 (#710)
ehwenk Jun 2, 2023
de31f45
Add new study: Britton_1994 (#712)
ehwenk Jun 3, 2023
359dada
Add new study: Cowling_1987 (#713)
ehwenk Jun 4, 2023
4050503
Add new study: Auld_2000 (#711)
ehwenk Jun 5, 2023
5decbbf
edit metadata_create_template (#716)
ehwenk Jun 6, 2023
a311f6c
add new study: Tsakalos_2022 (#714)
ehwenk Jun 7, 2023
f4c7bb4
Add new study: Brodribb_2000 (#718)
ehwenk Jun 7, 2023
8c28b9f
Add new study: Collette_2021 (#717)
ehwenk Jun 8, 2023
a474a79
Add new study: Zeppel_2008
ehwenk Jun 14, 2023
4c5ca8e
Add new study: Yunusa_2010 (#720)
ehwenk Jun 14, 2023
26dbda4
Add new study: Pate_1990 (#726)
yangsophieee Jun 15, 2023
86d8a25
Merge branch 'develop' into Zeppel_2008
ehwenk Jun 15, 2023
3d2bbc5
Update metadata.yml
ehwenk Jun 15, 2023
a17ea00
Flora data fixes (#734)
dcol2804 Jun 19, 2023
d2d408e
Regenerate traits.yml from APD (#727)
ehwenk Jun 20, 2023
535f168
Add new study: Sweedman_2006 (#723)
ehwenk Jun 21, 2023
b9b081c
Add additional data and new study: Nano_2011 & Crowley_2007 (#730)
yangsophieee Jun 21, 2023
6769bfd
Add new study: Lawes_2014 (#740)
yangsophieee Jun 21, 2023
93d014c
add 3 traits to scraped data files (#724)
ehwenk Jun 21, 2023
451a501
Add new study: Wooller_2002 (#729)
ehwenk Jun 22, 2023
b890729
Merge branch 'develop' into Zeppel_2008
ehwenk Jun 22, 2023
32753e6
Update metadata.yml
ehwenk Jun 22, 2023
cd7b3a2
Merge branch 'develop' into Zeppel_2008
dfalster Sep 13, 2023
1b05c64
Further updates from develop
dfalster Sep 13, 2023
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
7 changes: 4 additions & 3 deletions R/setup.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ metadata_create_template <- function(dataset_id,
out$source$primary["key"] = dataset_id
out$source$primary["bibtype"] = "Article"

collectors <- c("last_name", "given_name", "ORCID", "affiliation")

out$contributors <- out$contributors$elements
out$contributors$data_collectors[c(exclude, "notes")] <- NULL
out$contributors$data_collectors[] <- "unknown"
out$contributors$data_collectors <- list(out$contributors$data_collectors)
out$contributors$data_collectors <- list(out$contributors$data_collectors$elements[collectors])
out$contributors$data_collectors[[1]][] <- "unknown"
out$contributors[c("assistants", "austraits_curators")] <- "unknown"

out$dataset <- out$dataset$values[c("data_is_long_format", "custom_R_code", "collection_date", "taxon_name", "location_name",
Expand Down
84,364 changes: 42,469 additions & 41,895 deletions config/taxon_list.csv

Large diffs are not rendered by default.

466 changes: 179 additions & 287 deletions config/traits.yml

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion config/unit_conversions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ unit_from,unit_to,function
%,{count}/{count},x*.01
{dimensionless},{count}/{count},x*1
a,mo,x*12
mo,a,x/12
mo,a,x*1/12
{count}/m2,{count}/mm2,x*1/1000000
{count}/cm2,{count}/mm2,x*1/100
cm,m,x*0.01
cm,mm,x*10
um,mm,x*0.001
mm,um,x*1000
mm,cm,x*0.1
m,mm,x*1000
cm2,mm2,x*100
m2,mm2,x*1000000
Expand Down Expand Up @@ -129,10 +130,12 @@ mol{H2O}/m2/s,umol{H2O}/m2/s,x*1000000
mmol/m2/s,umol{H2O}/m2/s,x*1000
mmol{H2O}/m2/s,umol{H2O}/m2/s,x*1000
nmol{H2O}/m2/s,umol{H2O}/m2/s,x*1/1000
m3{H2O}/m2{leaf}/d,g/cm2{leaf}/d,x*100
yangsophieee marked this conversation as resolved.
Show resolved Hide resolved
cm2{leaf}/cm2{sapwood},mm2{sapwood}/mm2{leaf},1/x
mm2{leaf}/mm2{sapwood},mm2{sapwood}/mm2{leaf},1/x
cm2{leaf}/mm2{sapwood},mm2{sapwood}/mm2{leaf},x*1/100
cm2{sapwood}/m2{leaf},mm2{sapwood}/mm2{leaf},x*1/10000
m2{sapwood}/m2{leaf},mm2{sapwood}/mm2{leaf},x*1
10^4.mm2{sapwood}/mm2{leaf},mm2{sapwood}/mm2{leaf},x*1/10000
MPa,Pa,x*1000
neg_MPa,MPa,x*-1
Expand All @@ -154,6 +157,7 @@ kg/m/MPa/s,10^4.kg/m/MPa/s,x*10000
10^3.kg/m/MPa/s,10^4.kg/m/MPa/s,x*10
ml/cm/MPa/s,10^4.kg/m/MPa/s,x*100
kg/m/Pa/s,kg/m/MPa/s,x*1/1000
kg/mm/MPa/s,kg/m/MPa/s,x*1000
10^6.kg/m/MPa/s,kg/m/MPa/s,x*1/1000000
10^4.kg/m/MPa/s,kg/m/MPa/s,x*1/10000
10^1.kg/m/MPa/s,kg/m/MPa/s,x*0.1
Expand Down
172,842 changes: 172,842 additions & 0 deletions data/ABRS_2023/data.csv

Large diffs are not rendered by default.

Loading