Code review

DiSSCo · Oct 8, 2024 · ad61b2a · ad61b2a
1 parent c5609c9
commit ad61b2a
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 29 deletions.
diff --git a/data-model/fdo-type/data-mapping/0.4.0/schema/data-mapping.json b/data-model/fdo-type/data-mapping/0.4.0/schema/data-mapping.json
@@ -130,9 +130,9 @@
       "type": "string",
       "description": "The data standard that is being mapped from",
       "enum": [
-        "dwc",
-        "abcd",
-        "abcdefg"
+        "DwC",
+        "ABCD",
+        "ABCDEFG"
       ]
     },
     "ods:hasTombstoneMetadata": {

diff --git a/data-model/fdo-type/digital-media/0.4.0/schema/digital-media.json b/data-model/fdo-type/digital-media/0.4.0/schema/digital-media.json
@@ -119,15 +119,17 @@
       "pattern": "^(https?:\/\/ror\\.org\/0\\w{6}[0-9]{2})|^(https?:\/\/www\\.wikidata\\.org\/wiki\/Q\\w+)",
       "examples": [
         "https://ror.org/015hz7p22",
-        "https://www.wikidata.org/wiki/Q641676"
+        "https://www.wikidata.org/wiki/Q641676",
+        "https://ror.org/03wkt5x30"
       ]
     },
     "ods:organisationName": {
       "type": "string",
-      "description": "Full museum name according to ROR or Wikidata",
+      "description": "Primary organisation name according to ROR or Wikidata",
       "examples": [
         "National Museum of Natural History",
-        "Tallinn University of Technology"
+        "Tallinn University of Technology",
+        "Muséum national d'Histoire naturelle"
       ]
     },
     "dcterms:format": {

diff --git a/data-model/fdo-type/digital-specimen/0.4.0/schema/digital-specimen.json b/data-model/fdo-type/digital-specimen/0.4.0/schema/digital-specimen.json
@@ -168,15 +168,17 @@
       "pattern": "^(https?:\/\/ror\\.org\/0\\w{6}[0-9]{2})|^(https?:\/\/www\\.wikidata\\.org\/wiki\/Q\\w+)",
       "examples": [
         "https://ror.org/015hz7p22",
-        "https://www.wikidata.org/wiki/Q838691"
+        "https://www.wikidata.org/wiki/Q641676",
+        "https://ror.org/03wkt5x30"
       ]
     },
     "ods:organisationName": {
       "type": "string",
-      "description": "Full museum name according to ROR or Wikidata",
+      "description": "Primary organisation name according to ROR or Wikidata",
       "examples": [
         "National Museum of Natural History",
-        "Muséum national d'histoire naturelle"
+        "Tallinn University of Technology",
+        "Muséum national d'Histoire naturelle"
       ]
     },
     "dwc:collectionCode": {

diff --git a/data-model/fdo-type/digital-specimen/0.4.0/schema/taxon-identification.json b/data-model/fdo-type/digital-specimen/0.4.0/schema/taxon-identification.json
@@ -19,7 +19,7 @@
       "description": "An identifier for the set of dwc:Taxon information. May be a global unique identifier or an identifier specific to the data set",
       "examples": [
         "https://www.catalogueoflife.org/data/taxon/5TXLM",
-        "https://www.gbif.org/species/212"
+        "https://www.catalogueoflife.org/data/taxon/6J6FX"
       ]
     },
     "dwc:scientificName": {
@@ -174,14 +174,17 @@
       "type": "string",
       "description": "The full name, with authorship and date information if known, of the currently valid (zoological) or accepted (botanical) ods:TaxonIdentification",
       "examples": [
-        "Tamias minimus"
+        "Flaccisagitta hexaptera (d'Orbigny, 1836)",
+        "Lysimachia arvensis subsp. arvensis",
+        "https://www.catalogueoflife.org/data/taxon/BPC8M"
       ]
     },
     "dwc:acceptedNameUsageID": {
       "type": "string",
       "description": "An identifier for the name usage (documented meaning of the name according to a source) of the currently valid (zoological) or accepted (botanical) taxon",
       "examples": [
-        "6W3C4"
+        "https://www.catalogueoflife.org/data/taxon/6J6FX",
+        "https://www.catalogueoflife.org/data/taxon/BPC8M"
       ]
     },
     "dwc:cultivarEpithet": {

diff --git a/data-model/fdo-type/shared-model/0.4.0/examples/identifier-example.json b/data-model/fdo-type/shared-model/0.4.0/examples/identifier-example.json
@@ -1,10 +1,11 @@
 {
   "@id": "BMNH(E)1902475",
   "@type": "ods:Identifier",
-  "dcterms:type": "dwc:catalogueNumber",
+  "dcterms:title": "dwc:catalogueNumber",
+  "dcterms:type": "locally unique identifier",
   "dcterms:identifier": "BMNH(E)1902475",
   "dcterms:subject": ["Registratie nummer"],
   "ods:isPartOfLabel": true,
-  "ods:isIDPersistent": true,
-  "ods:isIDResolvable": false
+  "ods:GupriLevel": "ods:LocallyUniqueStable",
+  "ods:identifierStatus": "ods:Alternative"
 }
diff --git a/data-model/fdo-type/shared-model/0.4.0/examples/identifier-orcid-example.json b/data-model/fdo-type/shared-model/0.4.0/examples/identifier-orcid-example.json
@@ -0,0 +1,10 @@
+{
+  "@id": "https://orcid.org/0000-0002-5669-2769",
+  "@type": "ods:Identifier",
+  "dcterms:title": "orcid",
+  "dcterms:type": "URL",
+  "dcterms:identifier": "https://orcid.org/0000-0002-5669-2769",
+  "ods:isPartOfLabel": false,
+  "ods:GupriLevel": "ods:GloballyUniqueStablePersistentResolvable",
+  "ods:identifierStatus": "ods:Preferred"
+}
diff --git a/data-model/fdo-type/shared-model/0.4.0/schema/identifier.json b/data-model/fdo-type/shared-model/0.4.0/schema/identifier.json
@@ -22,15 +22,46 @@
       "const": "ods:Identifier",
       "description": "The type of the digital object, in this case a ods:Identifier"
     },
+    "dcterms:title": {
+      "type": "string",
+      "description": "A name for the identifier",
+      "examples": [
+        "dwc:occurrenceID",
+        "abcd:UnitID",
+        "ROR",
+        "ORCID",
+        "cetaf stable identifier"
+      ]
+    },
     "dcterms:type": {
       "type": "string",
-      "description": "The type of the identifier",
+      "description": "The type of the value in the `dcterms:identifier` field",
+      "enum": [
+        "ARK",
+        "arXiv",
+        "bibcode",
+        "DOI",
+        "EAN13",
+        "EISSN",
+        "Handle",
+        "IGSN",
+        "ISBN",
+        "ISSN",
+        "ISTC",
+        "LISSN",
+        "LSID",
+        "PMID",
+        "PURL",
+        "UPC",
+        "URL",
+        "URN",
+        "w3id",
+        "UUID",
+        "Other",
+        "locally unique identifier"
+      ],
       "examples": [
-        "dwc:catalogueNumber",
-        "dwca:id",
-        "orcid",
-        "wikidata",
-        "ror"
+        "DOI"
       ]
     },
     "dcterms:identifier": {
@@ -76,18 +107,30 @@
       "type": "boolean",
       "description": "Indicates whether the identifier is part of the physical label"
     },
-    "ods:isIDPersistent": {
-      "type": "boolean",
-      "description": "Indicates whether the identifier is a persistent identifier"
+    "ods:GupriLevel": {
+      "type": "string",
+      "description": "Indicates whether the identifier is a persistent identifier",
+      "enum": [
+        "ods:LocallyUniqueStable",
+        "ods:GloballyUniqueStable",
+        "ods:GloballyUniqueStableResolvable",
+        "ods:GloballyUniqueStablePersistentResolvable",
+        "ods:GloballyUniqueStablePersistentResolvableFDOCompliant"
+      ]
     },
-    "ods:isIDResolvable": {
-      "type": "boolean",
-      "description": "Indicates whether the identifier is resolvable"
+    "ods:identifierStatus": {
+      "type": "string",
+      "description": "Indicates the status of the identifier",
+      "enum": [
+        "ods:Preferred",
+        "ods:Alternative",
+        "ods:Superseded"
+      ]
     }
   },
   "required": [
     "@type",
-    "dcterms:type",
+    "dcterms:title",
     "dcterms:identifier"
   ],
   "additionalProperties": false

diff --git a/data-model/fdo-type/shared-model/0.4.0/schema/tombstone-metadata.json b/data-model/fdo-type/shared-model/0.4.0/schema/tombstone-metadata.json
@@ -66,7 +66,8 @@
             "description": "The type of relationship between the tombstoned object and the related object",
             "examples": [
               "ods:relatedTo",
-              "ods:isDuplicateOf"
+              "ods:isDuplicateOf",
+              "ods:isReplacedWith"
             ]
           },
           "additionalProperties": false,