From 99ade222b4c5ad1adca2ee04b2f44a11db1a55a8 Mon Sep 17 00:00:00 2001 From: TomDijkema Date: Thu, 27 Jun 2024 10:29:59 +0200 Subject: [PATCH 1/2] Add title property to all schemas of latest version (3) Add title property to all schemas of latest version (3) --- .../0.3.0/schema/digital-media.json | 1 + .../0.3.0/schema/chronometric-age.json | 1 + .../0.3.0/schema/digital-specimen.json | 1 + .../digital-specimen/0.3.0/schema/event.json | 1 + .../0.3.0/schema/identification.json | 1 + .../0.3.0/schema/location.json | 1 + .../0.3.0/schema/material-entity.json | 3 +- .../0.3.0/schema/mas.json | 3 +- .../shared-model/0.3.0/schema/agent.json | 1 + .../shared-model/0.3.0/schema/assertion.json | 3 +- .../shared-model/0.3.0/schema/citation.json | 3 +- .../0.3.0/schema/entity-relationship.json | 3 +- .../shared-model/0.3.0/schema/identifier.json | 3 +- .../0.3.0/schema/source-system.json | 1 + .../0.1.0/schema/tettris-service.json | 3 +- .../0.1.0/schema/virtual-collection.json | 28 ++++++++++++++----- 16 files changed, 43 insertions(+), 14 deletions(-) diff --git a/data-model/fdo-type/digital-media/0.3.0/schema/digital-media.json b/data-model/fdo-type/digital-media/0.3.0/schema/digital-media.json index 069a315..bb284a6 100644 --- a/data-model/fdo-type/digital-media/0.3.0/schema/digital-media.json +++ b/data-model/fdo-type/digital-media/0.3.0/schema/digital-media.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-media/0.3.0/digital-media.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Digital Media Version 0.3.0", + "title": "DigitalMedia", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/chronometric-age.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/chronometric-age.json index ac144f8..546b4f3 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/chronometric-age.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/chronometric-age.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-specimen/0.3.0/chronometric-age.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Chronometric Age Version 0.3.0", + "title": "ChronometricAge", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/digital-specimen.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/digital-specimen.json index afa1de1..047747c 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/digital-specimen.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/digital-specimen.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/digitalobjects/digital-specimen/0.3.0/digital-specimen.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Digital Specimen Version 0.3.0", + "title": "DigitalSpecimen", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/event.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/event.json index 2c7f918..eb8068f 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/event.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/event.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-specimen/0.3.0/event.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Event Version 0.3.0", + "title": "Event", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/identification.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/identification.json index 01838a1..56a2ff3 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/identification.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/identification.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-specimen/0.3.0/identification.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Identification object Version 0.3.0", + "title": "Identification", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/location.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/location.json index a9b8ebf..2c48fd1 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/location.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/location.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-specimen/0.3.0/location.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Location Version 0.3.0", + "title": "Location", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/digital-specimen/0.3.0/schema/material-entity.json b/data-model/fdo-type/digital-specimen/0.3.0/schema/material-entity.json index b1dcd30..64f1587 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/schema/material-entity.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/schema/material-entity.json @@ -1,8 +1,9 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/digital-specimen/0.3.0/material-entity.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "type": "object", "$comment": "Material Entity Version 0.3.0, only if the part did not get a separate catalogue number, otherwise it will be a separate digital specimen itself", + "title": "MaterialEntity", + "type": "object", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json index 32e9885..998a7d1 100644 --- a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json +++ b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json @@ -1,9 +1,10 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/mas.json", "$schema": "https://json-schema.org/draft/2020-12/schema", + "$comment": "Machine Annotation Service Version 0.3.0", + "title": "MAS", "type": "object", "description": "Automated annotation services that enhance biodiversity data", - "$comment": "Machine Annotation Service Version 0.3.0", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/agent.json b/data-model/fdo-type/shared-model/0.3.0/schema/agent.json index 0ea42ed..abfef14 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/agent.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/agent.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/agent.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Agent object Version 0.3.0", + "title": "Agent", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json b/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json index 314c043..961c889 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json @@ -1,8 +1,9 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/assertion.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "type": "object", "$comment": "Annotation Version 0.3.0", + "title": "Assertion", + "type": "object", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/citation.json b/data-model/fdo-type/shared-model/0.3.0/schema/citation.json index 935c05b..576b31c 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/citation.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/citation.json @@ -1,9 +1,10 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/citation.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "description": "Based on https://rs.gbif.org/extension/gbif/1.0/references.xml but includes ods specific terms", "$comment": "Citation object Version 0.3.0", + "title": "Citation", "type": "object", + "description": "Based on https://rs.gbif.org/extension/gbif/1.0/references.xml but includes ods specific terms", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/entity-relationship.json b/data-model/fdo-type/shared-model/0.3.0/schema/entity-relationship.json index a21ff3c..b66514a 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/entity-relationship.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/entity-relationship.json @@ -1,9 +1,10 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/emtity-relationship.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "description": "Based on https://rs.gbif.org/extension/resource_relationship_2024-02-19.xml but with ods specific terms", "$comment": "Entity Relationship object Version 0.3.0", + "title": "EntityRelationship", "type": "object", + "description": "Based on https://rs.gbif.org/extension/resource_relationship_2024-02-19.xml but with ods specific terms", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/identifier.json b/data-model/fdo-type/shared-model/0.3.0/schema/identifier.json index 1036ed3..7ba4604 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/identifier.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/identifier.json @@ -1,9 +1,10 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/identifier.json", - "description": "Based on https://rs.gbif.org/extension/gbif/1.0/identifier.xml but includes ods specific terms", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Identifier object Version 0.3.0", + "title": "Identifier", "type": "object", + "description": "Based on https://rs.gbif.org/extension/gbif/1.0/identifier.xml but includes ods specific terms", "properties": { "@id": { "type": "string", diff --git a/data-model/fdo-type/source-system/0.3.0/schema/source-system.json b/data-model/fdo-type/source-system/0.3.0/schema/source-system.json index 4e7267f..64c05a9 100644 --- a/data-model/fdo-type/source-system/0.3.0/schema/source-system.json +++ b/data-model/fdo-type/source-system/0.3.0/schema/source-system.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/source-system/0.3.0/source-system.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Source System Version 0.3.0", + "title": "SourceSystem", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/tettris-service/0.1.0/schema/tettris-service.json b/data-model/fdo-type/tettris-service/0.1.0/schema/tettris-service.json index 8e5df95..ca8f9bb 100644 --- a/data-model/fdo-type/tettris-service/0.1.0/schema/tettris-service.json +++ b/data-model/fdo-type/tettris-service/0.1.0/schema/tettris-service.json @@ -1,8 +1,9 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/tettris-service/0.1.0/tettris-service.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "type": "object", "$comment": "https://docs.google.com/document/d/1jbeVkUgoKXEmXKGlaHfJVxNRBk_aNBMSNdgPzLSqjGc/edit?usp=sharing", + "title": "TaxonomicService", + "type": "object", "properties": { "title": { "type": "string", diff --git a/data-model/fdo-type/virtual-collection/0.1.0/schema/virtual-collection.json b/data-model/fdo-type/virtual-collection/0.1.0/schema/virtual-collection.json index 8794c97..f7e9d05 100644 --- a/data-model/fdo-type/virtual-collection/0.1.0/schema/virtual-collection.json +++ b/data-model/fdo-type/virtual-collection/0.1.0/schema/virtual-collection.json @@ -1,7 +1,8 @@ { - "$id": "https://schemas.dissco.tech/schemas/fdo-type/virtualcollection/0.1.0/virtualcollection.json", + "$id": "https://schemas.dissco.tech/schemas/fdo-type/virtualcollection/0.1.0/virtualcollection.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "DigitalObject Version 0.1.0", + "title": "VirtualCollection", "type": "object", "properties": { "ods:id": { @@ -133,22 +134,35 @@ }, "description": "Value or configuration of the filter.", "examples": [ - ["Netherlands", "Belgium"], - ["1"] + [ + "Netherlands", + "Belgium" + ], + [ + "1" + ] ] } }, - "required": ["filterKey", "filterValue"] + "required": [ + "filterKey", + "filterValue" + ] }, "examples": [ [ { "filterKey": "country", - "filterValue": ["Netherlands", "Belgium"] + "filterValue": [ + "Netherlands", + "Belgium" + ] }, { "filterKey": "midsLevel", - "filterValue": ["1"] + "filterValue": [ + "1" + ] } ] ] @@ -167,4 +181,4 @@ "ltc:ObjectGroup" ], "additionalProperties": false -} +} \ No newline at end of file From 67b8d3a3d16273c47fbe54dc1ce4b0c168a4d4df Mon Sep 17 00:00:00 2001 From: TomDijkema Date: Thu, 27 Jun 2024 10:34:36 +0200 Subject: [PATCH 2/2] Typos and add more titles Typos and add more titles --- .../0.3.0/schema/create-update-tombstone.json | 1 + .../fdo-type/data-mapping/0.3.0/schema/data-mapping.json | 1 + .../fdo-type/machine-annotation-service/0.3.0/schema/mas.json | 2 +- data-model/fdo-type/shared-model/0.3.0/schema/assertion.json | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data-model/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone.json b/data-model/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone.json index d542dc2..949860a 100644 --- a/data-model/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone.json +++ b/data-model/fdo-type/create-update-tombstone-event/0.3.0/schema/create-update-tombstone.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/create-update-delete-tombstone-event/0.3.0/create-update-delete-tombstone-event.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Create Update Tombstone Event Version 0.3.0", + "title": "CreateUpdateTombstoneEvent", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/data-mapping/0.3.0/schema/data-mapping.json b/data-model/fdo-type/data-mapping/0.3.0/schema/data-mapping.json index 8bbe61c..f2b3b5b 100644 --- a/data-model/fdo-type/data-mapping/0.3.0/schema/data-mapping.json +++ b/data-model/fdo-type/data-mapping/0.3.0/schema/data-mapping.json @@ -2,6 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/mapping/0.3.0/data-mapping.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Data Mapping Version 0.3.0", + "title": "DataMapping", "type": "object", "properties": { "@id": { diff --git a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json index 998a7d1..41c9f39 100644 --- a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json +++ b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/mas.json @@ -2,7 +2,7 @@ "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/mas.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "$comment": "Machine Annotation Service Version 0.3.0", - "title": "MAS", + "title": "MachineAnnotationService", "type": "object", "description": "Automated annotation services that enhance biodiversity data", "properties": { diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json b/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json index 961c889..682353e 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/assertion.json @@ -1,13 +1,13 @@ { "$id": "https://schemas.dissco.tech/schemas/fdo-type/shared-model/0.3.0/assertion.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "$comment": "Annotation Version 0.3.0", + "$comment": "Assertion Version 0.3.0", "title": "Assertion", "type": "object", "properties": { "@id": { "type": "string", - "description": "The identifier for the Annotation object." + "description": "The identifier for the Assertion object." }, "@type": { "type": "string",