From c20605561d3c0d190abe71acd0031bda39fd6eaa Mon Sep 17 00:00:00 2001
From: Sam Leeflang <sam.leeflang@naturalis.nl>
Date: Thu, 27 Jun 2024 11:47:40 +0200
Subject: [PATCH] Change to mergingState after discussion

---
 .../annotation/0.3.0/schema/annotation.json   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/data-model/fdo-type/annotation/0.3.0/schema/annotation.json b/data-model/fdo-type/annotation/0.3.0/schema/annotation.json
index 0e60ba9..5f60fec 100644
--- a/data-model/fdo-type/annotation/0.3.0/schema/annotation.json
+++ b/data-model/fdo-type/annotation/0.3.0/schema/annotation.json
@@ -390,23 +390,21 @@
       "type": "string",
       "description": "Internally generated PID to identify the batch the annotation was generated by"
     },
-    "ods:annotationStatus": {
+    "ods:mergingStatus": {
       "enum": [
-        "ods:Active",
-        "ods:Rejected",
-        "ods:Approved",
-        "ods:Tombstoned"
+        "ods:RejectedForMerging",
+        "ods:ApprovedForMerging"
       ],
-      "description": "The status of the annotation. Once an annotation is made it will receives the status odsActive. Some annotation can then be accepted or rejected by the user."
+      "description": "The merging status of the annotation."
     },
-    "ods:decisionDate": {
+    "ods:mergingStateChangeDate": {
       "type": "string",
       "format": "date-time",
-      "description": "The date and time when the annotation was approved. This is only filled when the annotationStatus is ods:Approved or ods:Rejected."
+      "description": "The date and time when the annotation was merging state was changed."
     },
-    "ods:Decider": {
+    "ods:mergingStateChangedBy": {
       "type": "object",
-      "description": "Object containing information on who approved the annotation. This is only filled when the annotationStatus is ods:Approved.",
+      "description": "Object containing information on who changed the merging state of the annotation.",
       "properties": {
         "@id": {
           "type": "string",
@@ -421,7 +419,7 @@
         },
         "@type": {
           "type": "string",
-          "description": "The type of the decider.",
+          "description": "The type of the agent who changed the merging state.",
           "enum": [
             "foaf:Person",
             "foaf:Organisation",
@@ -430,7 +428,7 @@
         },
         "foaf:name": {
           "type": "string",
-          "description": "The name of the decider. http://xmlns.com/foaf/0.1/#term_name",
+          "description": "The name of the agent who changed the merging state. http://xmlns.com/foaf/0.1/#term_name",
           "examples": [
             "Gbif linker service"
           ]