feat: merge QuantValue and MeasuredValue

w3c-ccg · Feb 9, 2024 · 0bc6cc7 · 0bc6cc7
1 parent 2786607
commit 0bc6cc7
Show file tree

Hide file tree

Showing 29 changed files with 160 additions and 214 deletions.
diff --git a/docs/openapi/components/schemas/common/AgricultureActivity.yml b/docs/openapi/components/schemas/common/AgricultureActivity.yml
@@ -220,7 +220,7 @@ example: |-
         },
         "measurement": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "00.00",
           "unitCode": "UNKNOWN"
@@ -239,11 +239,11 @@ example: |-
         },
         "measurement": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "100.00",
           "unitCode": "P1"
         }
       }
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml b/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml
@@ -329,7 +329,7 @@ example: |-
         },
         "measurement": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "75.947",
           "unitCode": "B13"
@@ -348,7 +348,7 @@ example: |-
         },
         "measurement": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "58.340",
           "unitCode": "P1"

diff --git a/docs/openapi/components/schemas/common/CBPEntry.yml b/docs/openapi/components/schemas/common/CBPEntry.yml
@@ -236,7 +236,7 @@ properties:
   quantity:
     title: Quantity
     description: Report the entered quantity for each IT/BL/AWB covered by this entry. The quantity reported should be at the most detailed level of the shipment being reported. (The quantity being reported is the smallest exterior packaging unit.) If the entry covers the entire bill of lading, AWB, or in-bond shipment, the quantity reported will be the total quantity. If the entry is for a house bill, both the master bill and house bill will be shown in Block 29, but the only quantity reported will be the house bill quantity.
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: quantity
       '@id': https://w3id.org/traceability#quantity
@@ -365,11 +365,12 @@ example: |-
     "bolNumber": "87654321A",
     "quantity": {
       "type": [
-        "MeasuredValue"
+        "QuantitativeValue"
       ],
-      "value": "200"
+      "value": "200",
+      "unitCode": "items"
     },
     "voyageFlightTrip": "E002901",
     "conveyanceName": "Gizera",
     "arrivalDate": "2022-02-25"
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/CBPEntryType86.yml b/docs/openapi/components/schemas/common/CBPEntryType86.yml
@@ -58,7 +58,7 @@ properties:
   quantity:
     title: Quantity
     description: Report the entered quantity for each IT/BL/AWB covered by this entry. The quantity reported should be at the most detailed level of the shipment being reported. (The quantity being reported is the smallest exterior packaging unit.) If the entry covers the entire bill of lading, AWB, or in-bond shipment, the quantity reported will be the total quantity. If the entry is for a house bill, both the master bill and house bill will be shown in Block 29, but the only quantity reported will be the house bill quantity.
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: quantity
       '@id': https://w3id.org/traceability#quantity
@@ -156,9 +156,10 @@ example: |-
     "countryOfOrigin": "DK",
     "quantity": {
       "type": [
-        "MeasuredValue"
+        "QuantitativeValue"
       ],
-      "value": "1"
+      "value": "1",
+      "unitCode": "items"
     },
     "fairRetailValue": {
       "type": [
@@ -173,4 +174,4 @@ example: |-
       "number": "10025672",
       "identifierType": "CBP"
     }
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/DeliveryStatement.yml b/docs/openapi/components/schemas/common/DeliveryStatement.yml
@@ -33,10 +33,10 @@ properties:
   deliveredVolume:
     title: deliveredVolume
     description: Volume of the item being delivered
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: deliveredVolume
-      '@id': https://schema.org/MeasuredValue
+      '@id': https://schema.org/QuantitativeValue
   observation:
     title: Observation List
     description: List of observations
@@ -62,7 +62,7 @@ example: |-
     "deliveredDate": "2019-12-11T03:50:55Z",
     "deliveredVolume": {
       "type": [
-        "MeasuredValue"
+        "QuantitativeValue"
       ],
       "value": "8806",
       "unitCode": "dth"
@@ -80,7 +80,7 @@ example: |-
         },
         "measurement": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "50000",
           "unitCode": "BTU"

diff --git a/docs/openapi/components/schemas/common/FoodGradeInspection.yml b/docs/openapi/components/schemas/common/FoodGradeInspection.yml
@@ -444,14 +444,14 @@ example: |-
         "remarks": "Size: Mostly large, many medium, few small",
         "minTemperature": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "51",
           "unitCode": "FAH"
         },
         "maxTemperature": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "55",
           "unitCode": "FAH"

diff --git a/docs/openapi/components/schemas/common/FoodGradeInspectionLot.yml b/docs/openapi/components/schemas/common/FoodGradeInspectionLot.yml
@@ -86,14 +86,14 @@ properties:
   minTemperature:
     title: Minimum Temperature
     description: Minimum product temperature measured.
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: minTemperature
       '@id': https://schema.org/measuredValue
   maxTemperature:
     title: Maximum Temperature
     description: Maximum product temperature measured.
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: maxTemperature
       '@id': https://schema.org/measuredValue
@@ -230,14 +230,14 @@ example: |-
     "remarks": "Size: Mostly large, many medium, few small",
     "minTemperature": {
       "type": [
-        "MeasuredValue"
+        "QuantitativeValue"
       ],
       "value": "51",
       "unitCode": "FAH"
     },
     "maxTemperature": {
       "type": [
-        "MeasuredValue"
+        "QuantitativeValue"
       ],
       "value": "55",
       "unitCode": "FAH"

diff --git a/docs/openapi/components/schemas/common/InspectionReport.yml b/docs/openapi/components/schemas/common/InspectionReport.yml
@@ -66,7 +66,7 @@ properties:
         measurement:
           title: Measured Value
           description: The measurement of an Observation.
-          $ref: ./MeasuredValue.yml
+          $ref: ./QuantitativeValue.yml
         date:
           title: Observation Date
           description: The date of the Observation.
@@ -101,7 +101,7 @@ properties:
         measurement:
           title: Measured Value
           description: The measurement of an Observation.
-          $ref: ./MeasuredValue.yml
+          $ref: ./QuantitativeValue.yml
         date:
           title: Observation Date
           description: The date of the Observation.
@@ -195,7 +195,7 @@ example: |-
           "inchikey": "OHSVLFRHMCKCQY-UHFFFAOYSA-N"
         },
         "measurement": {
-          "type": ["MeasuredValue"],
+          "type": ["QuantitativeValue"],
           "value": "100.00",
           "unitCode": "P1"
         }
@@ -212,7 +212,7 @@ example: |-
           "description": "ISO 1352:2011 specifies the conditions for performing torsional, constant-amplitude, nominally elastic stress fatigue tests on metallic specimens without deliberately introducing stress concentrations. The tests are carried out at ambient temperature (ideally at between 10 °C and 35 °C) in air by applying a pure couple to the specimen about its longitudinal axis."
         },
         "measurement": {
-          "type": ["MeasuredValue"],
+          "type": ["QuantitativeValue"],
           "value": "00.00",
           "unitCode": "UNKNOWN"
         }
@@ -227,7 +227,7 @@ example: |-
           "description": "ISO 148-1:2016 specifies the Charpy (V-notch and U-notch) pendulum impact test method for determining the energy absorbed in an impact test of metallic materials. This part of ISO 148 does not cover instrumented impact testing, which is specified in ISO 14556."
         },
         "measurement": {
-          "type": ["MeasuredValue"],
+          "type": ["QuantitativeValue"],
           "value": "2.252",
           "unitCode": "B13"
         }
@@ -242,7 +242,7 @@ example: |-
           "description": "ISO 1352:2011 specifies the conditions for performing torsional, constant-amplitude, nominally elastic stress fatigue tests on metallic specimens without deliberately introducing stress concentrations. The tests are carried out at ambient temperature (ideally at between 10 °C and 35 °C) in air by applying a pure couple to the specimen about its longitudinal axis."
         },
         "measurement": {
-          "type": ["MeasuredValue"],
+          "type": ["QuantitativeValue"],
           "value": "00.00",
           "unitCode": "UNKNOWN"
         }

diff --git a/docs/openapi/components/schemas/common/MeasuredValue.yml b/docs/openapi/components/schemas/common/MeasuredValue.yml
diff --git a/docs/openapi/components/schemas/common/MonthlyDeliveryStatement.yml b/docs/openapi/components/schemas/common/MonthlyDeliveryStatement.yml
@@ -49,7 +49,7 @@ example: |-
         "deliveredDate": "2019-12-11T03:50:55Z",
         "deliveredVolume": {
           "type": [
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value": "8806",
           "unitCode": "dth"
@@ -67,7 +67,7 @@ example: |-
             },
             "measurement": {
               "type": [
-                "MeasuredValue"
+                "QuantitativeValue"
               ],
               "value": "50000",
               "unitCode": "BTU"
@@ -76,4 +76,4 @@ example: |-
         ]
       }      
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/Observation.yml b/docs/openapi/components/schemas/common/Observation.yml
@@ -28,10 +28,10 @@ properties:
   measurement:
     title: Measured Value
     description: The measurement of an Observation.
-    $ref: ./MeasuredValue.yml
+    $ref: ./QuantitativeValue.yml
     $linkedData:
       term: measurement
-      '@id': https://w3id.org/traceability#MeasuredValue
+      '@id': https://w3id.org/traceability#QuantitativeValue
   date:
     title: Observation Date
     description: The date of the Observation.
@@ -52,7 +52,7 @@ example: |-
       "formula": "Mc"
     },
     "measurement": {
-      "type": ["MeasuredValue"],
+      "type": ["QuantitativeValue"],
       "value": "00.00",
       "unitCode": "UNKNOWN"
     }

diff --git a/docs/openapi/components/schemas/common/OilAndGasDeliveryTicket.yml b/docs/openapi/components/schemas/common/OilAndGasDeliveryTicket.yml
@@ -209,7 +209,7 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"9500",
           "unitCode":"m3"
@@ -227,7 +227,7 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"45000",
           "unitCode":"bbl"
@@ -245,7 +245,7 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"9450",
           "unitCode":"m3"
@@ -263,7 +263,7 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"54000",
           "unitCode":"bbl"
@@ -281,7 +281,7 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"921.7",
           "unitCode":"lbm/ft3"
@@ -299,11 +299,11 @@ example: |-
         },
         "measurement":{
           "type":[
-            "MeasuredValue"
+            "QuantitativeValue"
           ],
           "value":"28",
           "unitCode":"degrees"
         }
       }
     ]
-  }
+  }