Skip to content

Commit f5f6daa

Browse files
apdavisonapdavison
committed
Merge branch 'v6' into service-interfaces
* v6: (26 commits) Update softwareVersion.schema.tpl.json Update datasetVersion.schema.tpl.json Update fileBundle.schema.tpl.json Rename 'isSuccessorOf' to 'isPrecededBy' and update instruction Update instructions in softwareVersion schema Update instruction for isVersionOf in schema Update metaDataModelVersion.schema.tpl.json Rename 'isSuccessorOf' to 'isPrecededBy' and update instruction Rename 'isSuccessorOf' to 'isPrecededBy' Add isPrecededBy and isVariantOf fields to schema Add Location schema Add GeoCoordinates schema Update datasetVersion.schema.tpl.json Update researchProductVersion.schema.tpl.json Update webServiceVersion.schema.tpl.json Update softwareVersion.schema.tpl.json Update modelVersion.schema.tpl.json Update metaDataModelVersion.schema.tpl.json Update datasetVersion.schema.tpl.json Update researchProduct.schema.tpl.json ... # Conflicts: # schemas/products/webService.schema.tpl.json # schemas/products/webServiceVersion.schema.tpl.json
2 parents bcd5a59 + 63fda2a commit f5f6daa

13 files changed

+95
-61
lines changed

‎schemas/data/fileBundle.schema.tpl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"uniqueItems": true,
2525
"_instruction": "Add all entities that defined which files were grouped into this file bundle. Note that the schema types of the instances stated here, need to match the ones stated under 'groupingType'.",
2626
"_linkedCategories": [
27-
"coordinateSpace",
27+
"coordinateFramework",
2828
"fileOrigin",
2929
"studyTarget"
3030
]

‎schemas/miscellaneous/geoCoordinates.schema.tpl.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"_type": "core:GeoCoordinates",
3+
"required": [
4+
"latitude",
5+
"longitude"
6+
],
7+
"properties": {
8+
"elevation": {
9+
"type": "number",
10+
"_instruction": "Enter the elevation of the location in metres, following the definitions of the WGS84 system."
11+
},
12+
"latitude": {
13+
"type": "number",
14+
"_instruction": "Enter the latitude of the location in decimal degrees, following the definitions of the WGS84 system."
15+
},
16+
"longitude": {
17+
"type": "number",
18+
"_instruction": "Enter the longitude of the location in decimal degrees, following the definitions of the WGS84 system."
19+
}
20+
}
21+
}

‎schemas/miscellaneous/location.schema.tpl.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"_type": "core:Location",
3+
"required": [
4+
"country"
5+
],
6+
"properties": {
7+
"address": {
8+
"type": "string",
9+
"_instruction": "Enter the address of the location, in the format [Street address], City, [Region/State], [Postal code]. The minimum requested information is City."
10+
},
11+
"country": {
12+
"_instruction": "Enter the country in which the location is found.",
13+
"_linkedTypes": [
14+
"controlledTerms:SovereignState"
15+
]
16+
},
17+
"geoCoordinates": {
18+
"_instruction": "Enter the geographic coordinates of the location.",
19+
"_embeddedTypes": [
20+
"core:GeoCoordinates"
21+
]
22+
}
23+
}
24+
}

‎schemas/products/dataset.schema.tpl.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
"core:DOI",
2121
"core:IdentifiersDotOrgID"
2222
]
23-
},
24-
"hasVersion": {
25-
"type": "array",
26-
"minItems": 1,
27-
"uniqueItems": true,
28-
"_instruction": "Add all versions of this dataset.",
29-
"_linkedTypes": [
30-
"core:DatasetVersion"
31-
]
3223
}
3324
}
3425
}

‎schemas/products/datasetVersion.schema.tpl.json‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,19 @@
6969
"core:File",
7070
"core:FileBundle",
7171
"core:WebResource",
72-
"https://openminds.ebrains.eu/sands/BrainAtlas",
73-
"https://openminds.ebrains.eu/sands/BrainAtlasVersion",
74-
"https://openminds.ebrains.eu/sands/CommonCoordinateSpace",
75-
"https://openminds.ebrains.eu/sands/CommonCoordinateSpaceVersion"
72+
"https://openminds.ebrains.eu/sands/AnatomicalAtlas",
73+
"https://openminds.ebrains.eu/sands/AnatomicalAtlasVersion",
74+
"https://openminds.ebrains.eu/sands/CommonCoordinateFramework",
75+
"https://openminds.ebrains.eu/sands/CommonCoordinateFrameworkVersion"
7676
]
7777
},
78-
"isAlternativeVersionOf": {
78+
"isPrecededBy": {
79+
"_instruction": "Add the dataset version preceding this dataset version.",
80+
"_linkedTypes": [
81+
"core:DatasetVersion"
82+
]
83+
},
84+
"isVariantOf": {
7985
"type": "array",
8086
"minItems": 1,
8187
"uniqueItems": true,
@@ -84,10 +90,10 @@
8490
"core:DatasetVersion"
8591
]
8692
},
87-
"isNewVersionOf": {
88-
"_instruction": "Add the dataset version preceding this dataset version.",
93+
"isVersionOf": {
94+
"_instruction": "Add the version-independent information about this dataset.",
8995
"_linkedTypes": [
90-
"core:DatasetVersion"
96+
"core:Dataset"
9197
]
9298
},
9399
"license": {
@@ -97,6 +103,7 @@
97103
"core:WebResource"
98104
]
99105
},
106+
100107
"preparationDesign": {
101108
"type": "array",
102109
"minItems": 1,

‎schemas/products/metaDataModel.schema.tpl.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
"core:DOI",
2121
"core:SWHID"
2222
]
23-
},
24-
"hasVersion": {
25-
"type": "array",
26-
"minItems": 1,
27-
"uniqueItems": true,
28-
"_instruction": "Add all versions of this (meta)data model.",
29-
"_linkedTypes": [
30-
"core:MetaDataModelVersion"
31-
]
3223
}
3324
}
3425
}

‎schemas/products/metaDataModelVersion.schema.tpl.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
"core:SWHID"
2323
]
2424
},
25-
"isAlternativeVersionOf": {
25+
"isPrecededBy": {
26+
"_instruction": "Add the (meta)data model version preceding this (meta)data model version.",
27+
"_linkedTypes": [
28+
"core:MetaDataModelVersion"
29+
]
30+
},
31+
"isVariantOf": {
2632
"type": "array",
2733
"minItems": 1,
2834
"uniqueItems": true,
@@ -31,10 +37,10 @@
3137
"core:MetaDataModelVersion"
3238
]
3339
},
34-
"isNewVersionOf": {
35-
"_instruction": "Add the (meta)data version preceding this (meta)data model version.",
40+
"isVersionOf": {
41+
"_instruction": "Add the version-independent information about this (meta)data model.",
3642
"_linkedTypes": [
37-
"core:MetaDataModelVersion"
43+
"core:MetaDataModel"
3844
]
3945
},
4046
"license": {

‎schemas/products/model.schema.tpl.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@
3030
"core:SWHID"
3131
]
3232
},
33-
"hasVersion": {
34-
"type": "array",
35-
"minItems": 1,
36-
"uniqueItems": true,
37-
"_instruction": "Add all versions of this computational model.",
38-
"_linkedTypes": [
39-
"core:ModelVersion"
40-
]
41-
},
4233
"scope": {
4334
"_instruction": "Add the scope of this computational model.",
4435
"_linkedTypes": [

‎schemas/products/modelVersion.schema.tpl.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,25 @@
5656
"core:WebResource"
5757
]
5858
},
59-
"isAlternativeVersionOf": {
59+
"isPrecededBy": {
60+
"_instruction": "Add the model version preceding this model version.",
61+
"_linkedTypes": [
62+
"core:ModelVersion"
63+
]
64+
},
65+
"isVariantOf": {
6066
"type": "array",
6167
"minItems": 1,
6268
"uniqueItems": true,
63-
"_instruction": "Add all computational model versions that can be used alternatively to this computational model version.",
69+
"_instruction": "Add all model versions that can be used alternatively to this model version.",
6470
"_linkedTypes": [
6571
"core:ModelVersion"
6672
]
6773
},
68-
"isNewVersionOf": {
69-
"_instruction": "Add the computational model version preceding this computational model version.",
74+
"isVersionOf": {
75+
"_instruction": "Add the version-independent information about this model.",
7076
"_linkedTypes": [
71-
"core:ModelVersion"
77+
"core:Model"
7278
]
7379
},
7480
"license": {

‎schemas/products/researchProduct.schema.tpl.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"required": [
66
"description",
77
"fullName",
8-
"hasVersion",
98
"shortName"
109
],
1110
"properties": {

0 commit comments

Comments
 (0)