Skip to content

Commit 1507f03

Browse files
Merge branch 'main' into bug/Metric-inDimension-fix
2 parents a0e0699 + 6f749c6 commit 1507f03

File tree

5 files changed

+27
-48
lines changed

5 files changed

+27
-48
lines changed

jsonschema/definitions/Attribution.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@
1515
"$id": "http://www.w3.org/ns/dcat#hadRole",
1616
"title": "role",
1717
"description": "The function of an entity or agent with respect to another entity or resource.",
18-
"oneOf": [
19-
{
20-
"$ref": "#/definitions/Role",
21-
"description": "inline description of Role"
22-
},
23-
{
24-
"type": "string",
25-
"description": "reference iri of Role",
26-
"format": "iri"
27-
}
28-
]
18+
"type": "string"
2919
},
3020
"agent": {
3121
"$id": "http://www.w3.org/ns/prov#agent",

jsonschema/definitions/Checksum.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@
1515
"$id": "http://spdx.org/rdf/terms#algorithm",
1616
"title": "algorithm",
1717
"description": "The algorithm used to produce the subject Checksum.",
18-
"oneOf": [
19-
{
20-
"$ref": "#/definitions/ChecksumAlgorithm",
21-
"description": "inline description of ChecksumAlgorithm"
22-
},
23-
{
24-
"type": "string",
25-
"description": "reference iri of ChecksumAlgorithm",
26-
"format": "iri"
27-
}
28-
]
18+
"type": "string"
2919
},
3020
"checksumValue": {
3121
"$id": "http://spdx.org/rdf/terms#checksumValue",

jsonschema/definitions/Dataset.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -752,10 +752,7 @@
752752
"type": "null"
753753
},
754754
{
755-
"type": "array",
756-
"items": {
757-
"type": "string"
758-
}
755+
"type": "string"
759756
}
760757
]
761758
},
@@ -1025,6 +1022,15 @@
10251022
{
10261023
"type": "null"
10271024
},
1025+
{
1026+
"$ref": "#/definitions/Location",
1027+
"description": "inline description of Location"
1028+
},
1029+
{
1030+
"type": "string",
1031+
"description": "reference iri of Location",
1032+
"format": "iri"
1033+
},
10281034
{
10291035
"type": "array",
10301036
"items": {

jsonschema/definitions/Metric.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,27 @@
1515
"$id": "http://www.w3.org/ns/dqv#expectedDataType",
1616
"title": "expected datatype",
1717
"description": "Represents the expected data type for the metric's observed value (e.g., xsd:boolean, xsd:double etc...)",
18-
"oneOf": [
19-
{
20-
"$ref": "#/definitions/anySimpleType",
21-
"description": "inline description of anySimpleType"
22-
},
23-
{
24-
"type": "string",
25-
"description": "reference iri of anySimpleType",
26-
"format": "iri"
27-
}
28-
]
18+
"type": "string"
2919
},
3020
"inDimension": {
3121
"$id": "http://www.w3.org/ns/dqv#inDimension",
3222
"title": "in dimension",
3323
"description": "Represents the dimensions a quality metric, certificate and annotation allow a measurement of.",
3424
"type": "string",
3525
"format": "iri"
26+
},
27+
"definition": {
28+
"$id": "https://www.w3.org/ns/dqv#definition",
29+
"title": "definition",
30+
"description": "Definition of the metric.",
31+
"oneOf": [
32+
{
33+
"type": "null"
34+
},
35+
{
36+
"type": "string"
37+
}
38+
]
3639
}
3740
},
3841
"required": [

jsonschema/definitions/Relationship.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@
1515
"$id": "http://www.w3.org/ns/dcat#hadRole",
1616
"title": "role",
1717
"description": "The function of an entity or agent with respect to another entity or resource.",
18-
"oneOf": [
19-
{
20-
"$ref": "#/definitions/Role",
21-
"description": "inline description of Role"
22-
},
23-
{
24-
"type": "string",
25-
"description": "reference iri of Role",
26-
"format": "iri"
27-
}
28-
]
18+
"type": "string"
2919
},
3020
"relation": {
3121
"$id": "http://purl.org/dc/terms/relation",

0 commit comments

Comments
 (0)