Skip to content

Commit ed1d585

Browse files
lzehllzehl
authored
Merge branch 'v6' into dev-neuroimaging
2 parents 1f2851f + c7b3944 commit ed1d585

23 files changed

+435
-240
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
"legalPerson"
1515
]
1616
},
17+
"customUsageClause": {
18+
"type": "string",
19+
"_instruction": "Enter a statement describing the usage rights, such as 'All rights reserved.'."
20+
},
1721
"year": {
1822
"type": "array",
1923
"items": {
@@ -22,7 +26,7 @@
2226
},
2327
"minItems": 1,
2428
"uniqueItems": true,
25-
"_instruction": "Enter the year during which the copyright was first asserted and, optionally, later years during which updated versions were published."
29+
"_instruction": "Enter the year when the copyright was first asserted, and optionally any subsequent years when the copyright holder and/or the rights-reservation clause was updated."
2630
}
2731
}
2832
}

‎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/data/usageAgreement.schema.tpl.json‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"_type": "core:UsageAgreement",
3+
"required": [
4+
"authoringParty",
5+
"fullName",
6+
"jurisdiction",
7+
"modificationProfile",
8+
"template",
9+
"shortName"
10+
],
11+
"properties": {
12+
"authoringParty": {
13+
"type": "array",
14+
"minItems": 1,
15+
"uniqueItems": true,
16+
"_instruction": "Add all natural persons and legal entities (in display order) responsible for creating and establishing this usage agreement.",
17+
"_linkedCategories": [
18+
"legalPerson"
19+
]
20+
},
21+
"fullName": {
22+
"type": "string",
23+
"_instruction": "Enter the full name of this usage agreement."
24+
},
25+
"jurisdiction": {
26+
"_instruction": "Enter the jurisdiction in which this usage agreement was issued.",
27+
"_linkedCategories": [
28+
"jurisdiction"
29+
]
30+
},
31+
"modificationProfile": {
32+
"type": "array",
33+
"minItems": 1,
34+
"uniqueItems": true,
35+
"_instruction": "Add all the types of modifications that are allowed under this usage agreement.",
36+
"_linkedCategories": [
37+
"modificationProfileAspect"
38+
]
39+
},
40+
"shortName": {
41+
"type": "string",
42+
"_instruction": "Enter a short name (or alias) for this usage agreement that could be used as a shortened display title (e.g., for web services with too little space to display the full name)."
43+
},
44+
"source": {
45+
"type": "array",
46+
"minItems": 1,
47+
"uniqueItems": true,
48+
"_instruction": "Add all licenses or usage agreements that served as references in the creation of this usage agreement.",
49+
"_linkedTypes": [
50+
"core:License",
51+
"core:UsageAgreement"
52+
]
53+
},
54+
"supportChannel": {
55+
"type": "array",
56+
"minItems": 1,
57+
"uniqueItems": true,
58+
"_instruction": "Enter all channels through which users can obtain support and initiate negotiations regarding this usage agreement with the authoring party.",
59+
"items": {
60+
"type": "string",
61+
"_formats": [
62+
"email",
63+
"iri"
64+
]
65+
}
66+
},
67+
"template": {
68+
"_instruction": "Add the web resource that supplies the template for this usage agreement.",
69+
"_linkedTypes": [
70+
"core:WebResource"
71+
]
72+
}
73+
}
74+
}

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"_type": "core:Accessibility",
3+
"required": [
4+
"channel",
5+
"eligibility",
6+
"form",
7+
"process",
8+
"paymentModel"
9+
],
10+
"properties": {
11+
"channel": {
12+
"_instruction": "Add the relevant access channel indicating where access takes place (physical, virtual, or hybrid).",
13+
"_linkedTypes": [
14+
"controlledTerms:AccessChannel"
15+
]
16+
},
17+
"eligibility": {
18+
"_instruction": "Add the relevant access eligibility type indicating who is allowed to access (open, controlled, or restricted).",
19+
"_linkedTypes": [
20+
"controlledTerms:AccessEligibilityType"
21+
]
22+
},
23+
"form": {
24+
"_instruction": "Add the relevant access form indicating whether the user interacts directly or through mediation.",
25+
"_linkedTypes": [
26+
"controlledTerms:AccessForm"
27+
]
28+
},
29+
"process": {
30+
"_instruction": "Add the relevant access process type indicating how access is granted (immediate, registered, authenticated, or authorized).",
31+
"_linkedTypes": [
32+
"controlledTerms:AccessProcessType"
33+
]
34+
},
35+
"paymentModel": {
36+
"type": "array",
37+
"minItems": 1,
38+
"uniqueItems": true,
39+
"_instruction": "Add all relevant payment model types indicating how access costs are determined. If no payment is requires, select zero-cost payment model.",
40+
"_linkedTypes": [
41+
"controlledTerms:PaymentModelType"
42+
]
43+
}
44+
}
45+
}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"_type": "core:Dependency",
3+
"required": [
4+
"fulfilledBy"
5+
],
6+
"properties": {
7+
"fulfilledBy": {
8+
"_instruction": "Enter the resource that fulfils this dependency.",
9+
"_linkedTypes": [
10+
"core:Configuration",
11+
"core:File",
12+
"core:InterfaceVersion",
13+
"core:SoftwareVersion",
14+
"core:WebResource"
15+
]
16+
},
17+
"failureImpact": {
18+
"_instruction": "Add the impacts that failure of this dependency would have.",
19+
"type": "array",
20+
"minItems": 1,
21+
"uniqueItems": true,
22+
"_linkedTypes": [
23+
"controlledTerms:DependencyImpact"
24+
]
25+
}
26+
}
27+
}

‎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: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
"required": [
55
"dataType",
66
"digitalIdentifier",
7-
"ethicsAssessment",
7+
"ethicsJurisdiction",
88
"experimentalApproach",
9-
"license",
109
"technique"
1110
],
1211
"properties": {
@@ -27,7 +26,7 @@
2726
"_linkedTypes": [
2827
"core:BehavioralProtocol"
2928
]
30-
},
29+
},
3130
"dataType": {
3231
"type": "array",
3332
"minItems": 1,
@@ -44,10 +43,10 @@
4443
"core:IdentifiersDotOrgID"
4544
]
4645
},
47-
"ethicsAssessment": {
48-
"_instruction": "Add the result of the ethics assessment of this dataset version.",
49-
"_linkedTypes": [
50-
"controlledTerms:EthicsAssessment"
46+
"ethicsJurisdiction": {
47+
"_instruction": "Add the jurisdiction under which the ethics assessment of this dataset version was conducted.",
48+
"_linkedCategories": [
49+
"jurisdiction"
5150
]
5251
},
5352
"experimentalApproach": {
@@ -58,7 +57,7 @@
5857
"_linkedTypes": [
5958
"controlledTerms:ExperimentalApproach"
6059
]
61-
},
60+
},
6261
"inputData": {
6362
"type": "array",
6463
"minItems": 1,
@@ -75,26 +74,25 @@
7574
"sands:CommonCoordinateSpaceVersion"
7675
]
7776
},
78-
"isAlternativeVersionOf": {
79-
"type": "array",
80-
"minItems": 1,
81-
"uniqueItems": true,
82-
"_instruction": "Add all dataset versions that can be used alternatively to this dataset version.",
77+
"isPrecededBy": {
78+
"_instruction": "Add the dataset version preceding this dataset version.",
8379
"_linkedTypes": [
8480
"core:DatasetVersion"
8581
]
8682
},
87-
"isNewVersionOf": {
88-
"_instruction": "Add the dataset version preceding this dataset version.",
83+
"isVariantOf": {
84+
"type": "array",
85+
"minItems": 1,
86+
"uniqueItems": true,
87+
"_instruction": "Add all dataset versions that can be used alternatively to this dataset version.",
8988
"_linkedTypes": [
9089
"core:DatasetVersion"
9190
]
9291
},
93-
"license": {
94-
"_instruction": "Add the license or an online available data usage agreement for this dataset version.",
92+
"isVersionOf": {
93+
"_instruction": "Add the version-independent information about this dataset.",
9594
"_linkedTypes": [
96-
"core:License",
97-
"core:WebResource"
95+
"core:Dataset"
9896
]
9997
},
10098
"preparationDesign": {
@@ -135,7 +133,7 @@
135133
"_linkedCategories": [
136134
"studyTarget"
137135
]
138-
},
136+
},
139137
"technique": {
140138
"type": "array",
141139
"minItems": 1,

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"_type": "core:Interface",
3+
"_extends": "products/researchProduct.schema.tpl.json",
4+
"required": [
5+
"communicationProtocol",
6+
"interfaceType"
7+
],
8+
"properties": {
9+
"communicationProtocol": {
10+
"_instruction": "Enter the communication protocol used by this interface.",
11+
"_linkedTypes": [
12+
"controlledTerms:CommunicationProtocol"
13+
]
14+
},
15+
"interfaceType": {
16+
"_instruction": "Enter the type of this interface.",
17+
"_linkedTypes": [
18+
"controlledTerms:CommunicationInterfaceType"
19+
]
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)