Merge pull request #132 from cookeac/master

Corrected typo, added icarSetPurposeType enum.
adewg · Jul 27, 2020 · db0e4cf · db0e4cf
2 parents 24a1925 + 00789dd
commit db0e4cf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/enums/icarSetPurposeType.json b/enums/icarSetPurposeType.json
@@ -0,0 +1,16 @@
+{
+    "description": "Describes the purpose of a set of animals.",
+
+    "type": "string",
+
+    "enum": [
+      "Enclosure",
+      "Feeding",
+      "Health",
+      "Lactation",
+      "Movement",
+      "Reproduction",
+      "Session",
+      "Other"
+    ]
+  }
diff --git a/resources/icarAnimalSetResource.json b/resources/icarAnimalSetResource.json
@@ -1,7 +1,8 @@
 {
-  "description": "Core schema for representing animal sets",
+  "description": "Core schema for representing animal sets (often called groups or sessions).",
 
-  "allOf": [{
+  "allOf": [
+    {
       "$ref": "../resources/icarResource.json"
     },
     {
@@ -19,11 +20,11 @@
         },
         "name": {
           "type": "string",
-          "description": "Human readable name of the set.",
+          "description": "Human readable name of the set."
         },
-        "type": {
-          "type": "string",
-          "description": "Type of the animal set."
+        "purpose": {
+          "$ref": "../enums/icarSetPurposeType.json",
+          "description": "Purpose of the animal set."
         },
         "member": {
           "type": "array",

diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json
@@ -1214,7 +1214,7 @@
           "member": [{
             "id": "6e47cd5c-2d42-4268-a665-bd17cd5fc222",
             "name": "My Barn Group",
-            "type": "BARN",
+            "purpose": "Enclosure",
             "member": [{
                 "scheme": "eu.animalId",
                 "id": "276000312312345"