Skip to content

Commit 28772c0

Browse files
authored
Merge pull request #37 from isamplesorg/develop
Develop
2 parents b475649 + a670879 commit 28772c0

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

.github/workflows/process_vocab.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@master
3636
- name: Vocabulary action
37-
uses: isamplesorg/vocabularies@develop
37+
uses: isamplesorg/vocabularies@main
3838
# input variables 'action', 'path', 'inputttl' and 'inputvocaburi' are defined in action.yml, and assigned values here
3939
# GitHub creates an environment variable for the input with the name INPUT_<VARIABLE_NAME>
4040
with:
4141
action: docs
4242
path: ${{ github.workspace }}
4343
# provide ttl file names without extensions; the base file name will be
4444
# used for output files with the appropriate extension.
45-
inputttl: material_sample_object_type|material_sample_type(superseded)|material_type|sampled_feature_type
45+
inputttl: material_sample_object_type|material_type|sampled_feature_type
4646
# these are the URIs for the ConceptScheme; there must be a conceptScheme defined in each vocabulary.
47-
inputvocaburi: msot:conceptscheme|spec:specimentypevocabulary|mat:materialsvocabulary|sf:sampledfeaturevocabulary
47+
inputvocaburi: msot:conceptscheme|mat:materialsvocabulary|sf:sampledfeaturevocabulary
4848

4949
- name: Deploy docs
5050
uses: JamesIves/github-pages-deploy-action@v4

docs/readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ HTML representations of vocabularies for categorizing material sample type chara
1313

1414
## Concept scheme: iSamples Material Sample Object Type Vocabulary
1515

16+
[HTML web page version](https://isamplesorg.github.io/vocabularies/material_sample_object_type.html)
17+
1618
[ARDC Research Vocabularies Australia (RVA) vocabulary service landing page](https://vocabs.ardc.edu.au/viewById/683)
1719

1820
[RDF source file](https://raw.githubusercontent.com/isamplesorg/vocabularies/main/vocabulary/material_sample_object_type.ttl). This is the authoritative representation.
1921

2022
## Concept scheme: iSamples Sampled Feature Type Vocabulary
2123

24+
[HTML web page version](https://isamplesorg.github.io/vocabularies/sampled_feature_type.html)
25+
2226
[ARDC Research Vocabularies Australia (RVA) vocabulary service landing page](https://vocabs.ardc.edu.au/viewById/665)
2327

2428
[RDF source file](https://raw.githubusercontent.com/isamplesorg/vocabularies/main/vocabulary/sampled_feature_type.ttl). This is the authoritative representation.

vocabulary/material_sample_object_type.ttl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,15 @@ msot:conceptscheme
113113
rdfs:label "iSamples Material Sample Object Type Vocabulary"@en ;
114114
owl:imports <http://www.w3.org/2004/02/skos/core> ;
115115
skos:altLabel "iSamples Material Sample Object Type Vocabulary"@en ;
116-
117116
skos:definition "Broad categories to specify the kind of physical thing identified as the ‘sample’."@en ;
118-
119117
skos:editorNote "There has been considerable discussion of use of 'specimen' vs. 'sample'; the two terms are considered essentially synonyms in the iSamples context. 'Specimen' was used originally, but after discussion with reviewers, we decided to switch to 'material sample', consistent with Darwin Core TDWG wg decision (https://dwc.tdwg.org/list/#dwc_MaterialSample) and current OGC O&M/ISO19156 (http://www.opengis.net/doc/as/om/3.0). Some original URIs (0.9 version) had 'specimen' in the identifier tokens, these have been revised to materialsample for v1.0 release."@en ;
120118
skos:historyNote "2022-01-07 SMR Change base URI to https://w3id.org/isample/vocabulary/, setting up resolution using w3id. Make the conceptScheme and ontology. Add Dublin core imports."@en ;
121119
skos:historyNote "2022-03-11 SMR change definitions from rdfs:comment to skos:definition. Minor fixes in definitions. Add skos matches to URIs from other vocabularies."@en ;
122120
skos:historyNote "2022-09-30 SMR per https://github.com/isamplesorg/metadata/issues/109, change specimen to sample in vocabulary names and labels. Add 'Slurry biome aggregation' and 'Bundle biome aggregation' (github issue 110). Rename 'liquid or gas' sample type to 'fluid in container' (github issue 108)."@en ;
123121
skos:historyNote "2023-07-27 SMR modify base specimen type vocabulary, add 'Non biologic solid object' change broader relations in this vocab to use that as parent class where appropriate. Intention is a specimen category for solid objects that are not biologic; this subsumes 'Fossil' and 'Artifact', but excludes living organism, their parts and products. Obviously there is some overlap with Research specimens."@en ;
124122
skos:historyNote "2023-11-06 SMR add missing inScheme on Non-biologic solid object and solid materal specimen. Update version number in URI to 1.0"@en ;
125123
skos:historyNote "2024-04-19 SMR update language to always use 'material sample' instead of specimen or physical specimen, including in text, labels, and in the URI tokens. Edit defintions to improve clarity."@en ;
124+
skos:historyNote "2024-09-13 remove version numbers from URI"@en ;
126125
skos:note "The material sample object type is intended to be orthogonal to material type and sampled feature, but there are dependencies between some categories. The material sample object type is mostly determined by the nature of the sample object (solid, fluid, aggregate...), what kind of containment is necessary, and by the genetic origin of the material or object. There is overlap between some of the classes-- Research products might be solid objects or aggregations. Whole organisms, Fossils and Artifacts are typically solid objects. Multiple categories can be assigned to a sample, or one aspect can be chosen as pre-eminent."@en ;
127126
skos:prefLabel "iSamples Material Sample Object Type Vocabulary"@en ;
128127
.

vocabulary/material_type.ttl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ mat:materialsvocabulary
161161
skos:historyNote "2022-01-05 SMR version 0.9, change base uri to https://w3id.org/isample/vocabulary/material/0.9/ for testing with ESIP COR and w3id uri resolution"@en ;
162162
skos:historyNote "2022-03-11 SMR change definitions from rdfs:comment to skos:definition. Minor fixes to some definitions. Add skos matches to URIs from other vocabularies; 2023-11-05 version 1.0, in preparation for release. "@en ;
163163
skos:historyNote "2024-08-14 SMR, various updates since 2023-12: change seeAlso to closeMatch for Rock mapping to http://resource.geosciml.org/classifier/cgi/lithology/rock; minor edits to align with manuscript about the metadata schema; update vocabularies to use 'material sample' instead of 'specimen'; update schema.org namespace to http://; add provider and codeRepository in conceptScheme metadata; minor typo fixes and definition edits."@en ;
164+
skos:historyNote "2024-09-13 remove version numbers from URI"@en ;
164165
skos:prefLabel "iSamples Materials Vocabulary "@en ;
165166
.
166167
mat:mineral
-18.2 MB
Binary file not shown.

vocabulary/sampled_feature_type.ttl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ sf:sampledfeaturevocabulary
239239
skos:historyNote "2022-09-30 add biological entity as sampled feature, per issue https://github.com/isamplesorg/metadata/issues/107. This update was lost at some point and added back in 2022-12-09."@en ;
240240
skos:historyNote "2023-11-05 SMR update version to 1.0, prep for release"@en ;
241241
skos:historyNote "2024-04-19 SMR update definitions to remove use of 'specimen'. Edit some definitions for better clarity"@en ;
242+
skos:historyNote "2024-09-13 remove version numbers from URI"@en ;
242243
skos:prefLabel "Sampled Feature Type vocabulary"@en ;
243244
.
244245
sf:subaerialsurfaceenvironment

0 commit comments

Comments
 (0)