Skip to content

Commit

Permalink
Merge pull request #237 from tdwg/unknown
Browse files Browse the repository at this point in the history 
Remove `offspring` and `unknown` (v0.3)
  • Loading branch information
@peterdesmet
peterdesmet authored Oct 3, 2022
2 parents f7df61b + 48ab6d9 commit 08d9c26
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 23 deletions.
2 changes: 1 addition & 1 deletion camtrap-dp-profile.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "object",
"$defs": {
"version": {
"pattern": "0\\.2"
"pattern": "0\\.3"
}
},
"allOf": [
Expand Down
6 changes: 3 additions & 3 deletions example/datapackage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"format": "csv",
"mediatype": "text/csv",
"encoding": "utf-8",
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.2/deployments-table-schema.json"
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.3/deployments-table-schema.json"
},
{
"name": "media",
Expand All @@ -232,7 +232,7 @@
"format": "csv",
"mediatype": "text/csv",
"encoding": "utf-8",
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.2/media-table-schema.json"
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.3/media-table-schema.json"
},
{
"name": "observations",
Expand All @@ -241,7 +241,7 @@
"format": "csv",
"mediatype": "text/csv",
"encoding": "utf-8",
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.2/observations-table-schema.json"
"schema": "https://raw.githubusercontent.com/tdwg/camtrap-dp/0.3/observations-table-schema.json"
}
]
}
28 changes: 14 additions & 14 deletions example/observations.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ ebed479a-86bf-49b3-8a9f-a49b07cc0147,00a2c20d-f038-490c-9b3f-7e32abfa0be7,780c49
d3cb3c74-28c1-4d6f-9b19-23da8455b9f9,00a2c20d-f038-490c-9b3f-7e32abfa0be7,99880973-72c5-4fa8-8fd3-8c28861d2266,,2020-07-01T11:40:42+02:00,unclassified,TRUE,,,,,,,,,human,,,,,
ef2f7140-ae97-4b44-8309-ab1ffbc02879,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,8f5ffbf2-52c4-4dd2-b502-d93a8aa64640,,2020-07-29T07:29:41+02:00,unknown,FALSE,,,,,,,,,human,,,,,
68686a75-ad44-4676-b45e-2b85f60e4d11,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,1d98da96-c3ce-4479-9b97-8883cd33724f,,2020-07-29T07:38:55+02:00,blank,FALSE,,,,,,,,,human,,,,,
3d065f23-426a-449b-8693-f3c6b2ac9c7a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,89b807ca-697f-4452-8349-b235622c94fa,,2020-07-29T07:46:48+02:00,animal,FALSE,DGPL,Anas strepera,4,,subadult,unknown,,,human,Danny Van der beeck,2020-08-17T06:57:28Z,,,
3d065f23-426a-449b-8693-f3c6b2ac9c7a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,89b807ca-697f-4452-8349-b235622c94fa,,2020-07-29T07:46:48+02:00,animal,FALSE,DGPL,Anas strepera,4,,subadult,,,,human,Danny Van der beeck,2020-08-17T06:57:28Z,,,
1fa8b00a-8f0e-485e-b98e-eb9bb1ee5a9f,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,710eac2a-e261-478d-84e8-de99f418138c,,2020-07-30T06:29:31+02:00,animal,FALSE,DGPL,Anas strepera,1,,adult,female,,,human,Danny Van der beeck,2020-08-17T06:57:50Z,,,
e57d97b3-f15b-48f5-a86c-477952bf8b7a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,149f42ec-37bb-499b-9dac-24a90979e92c,,2020-07-31T06:43:33+02:00,animal,FALSE,DGP6,Anas platyrhynchos,2,,unknown,unknown,,,human,Danny Van der beeck,2020-08-17T07:03:19Z,,,
f5707f70-c264-4f81-9e2f-06d55ad23d37,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,45ee3031-93c2-4684-a917-d33d5274780f,,2020-08-02T07:00:14+02:00,animal,FALSE,DGP6,Anas platyrhynchos,5,,subadult,unknown,,,human,Danny Van der beeck,2020-08-18T21:09:30Z,,,
ccfa9680-f85f-41db-9760-445a19f5dbe7,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,02ae9f43-ae3e-4cd5-8a41-66f0543defdf,,2020-08-03T07:09:12+02:00,animal,FALSE,DGP6,Anas platyrhynchos,3,,subadult,unknown,,,human,Danny Van der beeck,2020-08-18T21:10:06Z,,,
1a32d481-ff36-4332-85ea-94423193936a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,8865647b-f927-4d1f-9bc2-25ad849df5f8,,2020-08-04T07:04:09+02:00,animal,FALSE,DGP6,Anas platyrhynchos,3,,subadult,unknown,,,human,Danny Van der beeck,2020-08-18T21:10:40Z,,,
c60eb90d-ab45-4b5a-8e0c-72204fdf4c08,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,4c03e12a-fc1d-495c-a50d-3eaf5916754d,,2020-08-05T07:02:01+02:00,animal,FALSE,DGPL,Anas strepera,1,,subadult,unknown,,,human,Danny Van der beeck,2020-08-18T21:11:23Z,,,
e57d97b3-f15b-48f5-a86c-477952bf8b7a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,149f42ec-37bb-499b-9dac-24a90979e92c,,2020-07-31T06:43:33+02:00,animal,FALSE,DGP6,Anas platyrhynchos,2,,,,,,human,Danny Van der beeck,2020-08-17T07:03:19Z,,,
f5707f70-c264-4f81-9e2f-06d55ad23d37,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,45ee3031-93c2-4684-a917-d33d5274780f,,2020-08-02T07:00:14+02:00,animal,FALSE,DGP6,Anas platyrhynchos,5,,subadult,,,,human,Danny Van der beeck,2020-08-18T21:09:30Z,,,
ccfa9680-f85f-41db-9760-445a19f5dbe7,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,02ae9f43-ae3e-4cd5-8a41-66f0543defdf,,2020-08-03T07:09:12+02:00,animal,FALSE,DGP6,Anas platyrhynchos,3,,subadult,,,,human,Danny Van der beeck,2020-08-18T21:10:06Z,,,
1a32d481-ff36-4332-85ea-94423193936a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,8865647b-f927-4d1f-9bc2-25ad849df5f8,,2020-08-04T07:04:09+02:00,animal,FALSE,DGP6,Anas platyrhynchos,3,,subadult,,,,human,Danny Van der beeck,2020-08-18T21:10:40Z,,,
c60eb90d-ab45-4b5a-8e0c-72204fdf4c08,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,4c03e12a-fc1d-495c-a50d-3eaf5916754d,,2020-08-05T07:02:01+02:00,animal,FALSE,DGPL,Anas strepera,1,,subadult,,,,human,Danny Van der beeck,2020-08-18T21:11:23Z,,,
00d6726c-755a-46d2-b424-f0b4a3a6f26a,29b7d356-4bb4-4ec4-b792-2af5cc32efa8,38c4c1c6-1810-4347-a1d6-339709563ffd,,2020-08-08T06:20:35+02:00,unknown,FALSE,,,,,,,,,human,,,,,
0d3e96d8-d24d-476b-a76e-11bda9170f95,577b543a-2cf1-4b23-b6d2-cda7e2eac372,8f779513-7c73-487a-a7ee-e4741909a657,,2020-06-19T23:00:00+02:00,blank,FALSE,,,,,,,,,human,,,,,
7e29c71f-4bd3-441f-b711-127944d7b8e0,577b543a-2cf1-4b23-b6d2-cda7e2eac372,a80896b5-74f3-4f4c-a364-a4175e83aad0,,2020-06-20T00:00:00+02:00,blank,FALSE,,,,,,,,,human,,,,,
78a45ae5-992b-4324-8e1e-de1e63088269,577b543a-2cf1-4b23-b6d2-cda7e2eac372,5fbf69a4-dad8-46a5-89ac-527cfcee99de,,2020-06-20T00:05:55+02:00,animal,FALSE,RQPW,Castor fiber,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:18:16Z,,,
e622b65c-8e09-4e45-ba32-a4c1a6c29fc7,577b543a-2cf1-4b23-b6d2-cda7e2eac372,976129e2-e5bd-48db-aa00-1ce247767f17,,2020-06-20T00:31:51+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:18:45Z,,,
fb662fab-d94e-490e-8b09-a617daab6383,577b543a-2cf1-4b23-b6d2-cda7e2eac372,b4b39b00-94d6-432d-b93e-9dc048f81dd7,,2020-06-24T01:33:53+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:19:13Z,,,
477b2f9d-33b4-47e3-8f8e-91d8247e2c05,577b543a-2cf1-4b23-b6d2-cda7e2eac372,75948520-e93a-4405-ab97-2d924c10227b,,2020-06-26T04:09:25+02:00,animal,FALSE,5BSG3,Vulpes vulpes,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:19:36Z,,,
dfdc4c48-3702-4650-aa02-3395257fb9b0,577b543a-2cf1-4b23-b6d2-cda7e2eac372,5be4f4ed-4d2d-41e5-8e8a-a2826a49af4a,,2020-06-29T00:01:12+02:00,animal,FALSE,3Y9VW,Martes foina,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:20:06Z,,,
78a45ae5-992b-4324-8e1e-de1e63088269,577b543a-2cf1-4b23-b6d2-cda7e2eac372,5fbf69a4-dad8-46a5-89ac-527cfcee99de,,2020-06-20T00:05:55+02:00,animal,FALSE,RQPW,Castor fiber,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:18:16Z,,,
e622b65c-8e09-4e45-ba32-a4c1a6c29fc7,577b543a-2cf1-4b23-b6d2-cda7e2eac372,976129e2-e5bd-48db-aa00-1ce247767f17,,2020-06-20T00:31:51+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:18:45Z,,,
fb662fab-d94e-490e-8b09-a617daab6383,577b543a-2cf1-4b23-b6d2-cda7e2eac372,b4b39b00-94d6-432d-b93e-9dc048f81dd7,,2020-06-24T01:33:53+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:19:13Z,,,
477b2f9d-33b4-47e3-8f8e-91d8247e2c05,577b543a-2cf1-4b23-b6d2-cda7e2eac372,75948520-e93a-4405-ab97-2d924c10227b,,2020-06-26T04:09:25+02:00,animal,FALSE,5BSG3,Vulpes vulpes,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:19:36Z,,,
dfdc4c48-3702-4650-aa02-3395257fb9b0,577b543a-2cf1-4b23-b6d2-cda7e2eac372,5be4f4ed-4d2d-41e5-8e8a-a2826a49af4a,,2020-06-29T00:01:12+02:00,animal,FALSE,3Y9VW,Martes foina,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:20:06Z,,,
ae1cab0f-e028-4320-91ce-ddb79d9806dd,577b543a-2cf1-4b23-b6d2-cda7e2eac372,fcc98f5f-3bae-47d2-a294-c781c3ca7509,,2020-06-29T01:00:00+02:00,blank,FALSE,,,,,,,,,human,,,,,
9e191d10-544e-42ea-9935-b55df95a1dd3,577b543a-2cf1-4b23-b6d2-cda7e2eac372,a60816f2-eead-4183-a16b-debbb2a540dd,,2020-06-29T01:33:16+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,unknown,,,human,Danny Van der beeck,2020-08-11T21:20:40Z,,,
9e191d10-544e-42ea-9935-b55df95a1dd3,577b543a-2cf1-4b23-b6d2-cda7e2eac372,a60816f2-eead-4183-a16b-debbb2a540dd,,2020-06-29T01:33:16+02:00,animal,FALSE,44QYC,Mustela putorius,1,,adult,,,,human,Danny Van der beeck,2020-08-11T21:20:40Z,,,
a0431321-b705-4598-9f89-47328fc437a9,62c200a9-0e03-4495-bcd8-032944f6f5a1,16537357-8942-4206-a74d-1ca4a324c044,,2021-03-27T21:38:18+01:00,animal,FALSE,GCHS,Ardea cinerea,1,,,,,,human,Axel Neukermans,2021-05-31T08:27:06Z,,,
dd92ac77-c951-4114-bce7-5c4cd3d6fa73,62c200a9-0e03-4495-bcd8-032944f6f5a1,e5690234-0644-42cd-be96-dcc69939c68d,,2021-03-31T23:59:15+01:00,blank,FALSE,,,1,,,,,,human,Axel Neukermans,2021-10-10T06:33:19Z,,,
cb30a896-50c2-473e-9985-0c0c5b468bd0,62c200a9-0e03-4495-bcd8-032944f6f5a1,4dcacd8f-a5f3-4acc-89f9-9aaf3d385ef8,,2021-04-05T20:08:33+01:00,animal,FALSE,32FH,Ardea,1,,unknown,unknown,,,machine,Western Europe species model Version 1,2021-07-05T11:43:57Z,0.9,,
bb027d7e-5801-4e70-950f-1f1972046962,62c200a9-0e03-4495-bcd8-032944f6f5a1,7245a2aa-e2cf-4bd0-9052-9c7b2ddd9aad,,2021-04-11T20:43:09+01:00,animal,FALSE,GCHS,Ardea cinerea,1,,unknown,unknown,,,human,Axel Neukermans,2021-10-10T06:35:23Z,,,
cb30a896-50c2-473e-9985-0c0c5b468bd0,62c200a9-0e03-4495-bcd8-032944f6f5a1,4dcacd8f-a5f3-4acc-89f9-9aaf3d385ef8,,2021-04-05T20:08:33+01:00,animal,FALSE,32FH,Ardea,1,,,,,,machine,Western Europe species model Version 1,2021-07-05T11:43:57Z,0.9,,
bb027d7e-5801-4e70-950f-1f1972046962,62c200a9-0e03-4495-bcd8-032944f6f5a1,7245a2aa-e2cf-4bd0-9052-9c7b2ddd9aad,,2021-04-11T20:43:09+01:00,animal,FALSE,GCHS,Ardea cinerea,1,,,,,,human,Axel Neukermans,2021-10-10T06:35:23Z,,,
678d278e-ec4c-4bcd-8e64-9f219ab377a2,62c200a9-0e03-4495-bcd8-032944f6f5a1,962dff14-1233-4ed1-ac89-7baf54bc19e7,,2021-04-18T22:24:42+01:00,human,FALSE,6MB3T,Homo sapiens,2,,,,,,human,Axel Neukermans,2021-10-10T06:34:40Z,,jeep met 2 mensen rijden in de marcq,
7 changes: 2 additions & 5 deletions observations-table-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,7 @@
"enum": [
"adult",
"subadult",
"juvenile",
"offspring",
"unknown"
"juvenile"
]
}
},
Expand All @@ -161,8 +159,7 @@
"required": false,
"enum": [
"female",
"male",
"unknown"
"male"
]
}
},
Expand Down

0 comments on commit 08d9c26

Please sign in to comment.