Added Unknown departure reason, additional milk characteristics

* Added "Unknown" to Departure Reason. Resolves adewg#206. * Added x/y/z positions to QuarterMilking, and TEMPERATURE to milk characteristics. Resolves adewg#170.
cookeac · Jul 15, 2021 · 441b5d1 · 441b5d1
1 parent 19730a1
commit 441b5d1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/enums/icarDepartureReasonType.json b/enums/icarDepartureReasonType.json
@@ -19,6 +19,7 @@
     "MilkingAbility",
     "BadType",
     "Behaviour",
-    "Other"
+    "Other",
+    "Unknown"
   ]
 }
diff --git a/types/icarMilkCharacteristicsType.json b/types/icarMilkCharacteristicsType.json
@@ -11,7 +11,7 @@
   "properties": {
     "characteristic": {
       "type": "string",
-      "description": "ICAR Milk Characteristics Codes and values - we have at this moment SCC, FAT, PROTEIN, LAC, UREA, BLOOD, ACETONE, BHB, LDH, PRO, AVGCOND, MAXCOND, AVGFLWR,  MAXFLWR, WEIGHT.\nThe following units have to be applied:\n\n|SCC|Somatic cell count|x1000 cells/ml|NCL\n|FAT|Fat|%|VP\n|PROTEIN|Protein|%|VP\n|LAC|Lactose|%|VP\n|UREA|Urea|mg/l|M1\n|BLOOD|Blood|true/false|A99\n|ACETONE|Acetone|mmol/l|M33\n|BHB|Beta hydroxybutyrate|mmol/l|M33\n|LDH|Lactate dehydrogenase|IU/l|\n|PRO|Progesteron|mmol/l|M33\n|AVGCOND|Average conductivity value of the milk at 25 ° C|mS/cm|H61\n|MAXCOND|Maximum conductivity value of the milk at 25 ° C|mS/cm|H61\n|AVGFLWR|Average flow rate|Kg/min|F31\n|MAXFLWR|Max flow rate|Kg/min|F31\n|WEIGHT|Weight of animal|Kg|KGM\n|PAG|Pregnancy associated glycoprotein|mmol/l|M33"
+      "description": "ICAR Milk Characteristics Codes and values: SCC, FAT, PROTEIN, LAC, UREA, BLOOD, ACETONE, BHB, LDH, PRO, AVGCOND, MAXCOND, AVGFLWR,  MAXFLWR, WEIGHT, TEMPERATURE.\nThe following units have to be applied:\n\n|SCC|Somatic cell count|x1000 cells/ml|NCL\n|FAT|Fat|%|VP\n|PROTEIN|Protein|%|VP\n|LAC|Lactose|%|VP\n|UREA|Urea|mg/l|M1\n|BLOOD|Blood|true/false|A99\n|ACETONE|Acetone|mmol/l|M33\n|BHB|Beta hydroxybutyrate|mmol/l|M33\n|LDH|Lactate dehydrogenase|IU/l|\n|PRO|Progesteron|mmol/l|M33\n|AVGCOND|Average conductivity value of the milk at 25 ° C|mS/cm|H61\n|MAXCOND|Maximum conductivity value of the milk at 25 ° C|mS/cm|H61\n|AVGFLWR|Average flow rate|Kg/min|F31\n|MAXFLWR|Max flow rate|Kg/min|F31\n|WEIGHT|Weight of animal|Kg|KGM\n|PAG|Pregnancy associated glycoprotein|mmol/l|M33"
     },
     "value": {
       "type": "string",

diff --git a/types/icarQuarterMilkingType.json b/types/icarQuarterMilkingType.json
@@ -14,6 +14,21 @@
         "RR"
       ]
     },
+    "xposition": { 
+      "type": "number",
+      "nullable": true,
+      "description": "Optional milking robot X position. Vendors may choose not to provide this."
+    },
+    "yposition": { 
+      "type": "number",
+      "nullable": true,
+      "description": "Optional milking robot Y position. Vendors may choose not to provide this."
+    },
+    "zposition": { 
+      "type": "number",
+      "nullable": true,
+      "description": "Optional milking robot Z position. Vendors may choose not to provide this."
+    },
     "quarterMilkingDuration": {
       "$ref": "../types/icarMilkDurationType.json"
     },