Merge pull request #26 from sine-fdn/updates

chore: update properties and example

Author: zeitgeist

specs/index.bs

@@ -1149,6 +1149,9 @@ Properties of data type <{TAD}>:
 
 Issue: this needs to be discussed with SFC and especially also Tool providers:
 
+Note: At least one of the properties `energyCarrier` or `feedstocks` MUST be defined. If possible,
+both SHOULD be defined.
+
 <figure id="tad-properties-table" dfn-type="element-attr" dfn-for="TAD">
   <table class="data">
     <thead>
@@ -1163,11 +1166,6 @@ Issue: this needs to be discussed with SFC and especially also Tool providers:
         <td>String
         <td>M
         <td>The non-empty unique ID of this activity relative to the [=host system=].
-      <tr>
-        <td><dfn>shipmentId</dfn>
-        <td>String
-        <td>M
-        <td>The [=shipment id=] of the shipment related to this <{TCE}>
       <tr>
         <td><dfn>consignmentId</dfn>
         <td>String
@@ -1213,14 +1211,14 @@ Issue: this needs to be discussed with SFC and especially also Tool providers:
       <tr>
         <td><dfn>departureAt</dfn>
         <td>String
-        <td>O
+        <td>M
         <td>
               Timestamp of departure. The value MUST be a date and time string conforming to ISO 8601 with timezone UTC.
               NOTE: the original data model defined this as the "date of loading"
       <tr>
         <td><dfn>arrivalAt</dfn>
         <td>String
-        <td>O
+        <td>M
         <td>Timestamp of arrival. The value MUST be a date and time string conforming to ISO 8601 with timezone UTC.
       <tr>
         <td><dfn>mode</dfn>
@@ -1240,14 +1238,20 @@ Issue: this needs to be discussed with SFC and especially also Tool providers:
       <tr>
         <td><dfn>energyCarrier</dfn>
         <td>String
-        <td>M
-        <td>The substance used to generate mechanical movement or heat and to generate chemical or
-        physical processes as per the [[!GLEC]] Framework. For example: Diesel, HVO, petrol, CNG, LNG, LPG, HFO, MGO, Aviation fuel, Hydrogen, Methanol, Electric, etc.
+        <td>O
+        <td>
+            The substance used to generate mechanical movement or heat and to generate chemical or
+            physical processes as per the [[!GLEC]] Framework. For example: Diesel, HVO, petrol, CNG, LNG, LPG, HFO, MGO, Aviation fuel, Hydrogen, Methanol, Electric, etc.
+
+            If <{TAD/energyCarrier}> is not defined, then <{TAD/feedstocks}> MUST be defined. If possible, both SHOULD be defined.
       <tr>
         <td><dfn>feedstocks</dfn>
         <td><{Feedstock}>[]
         <td>O
-        <td>If defined, theon-empty array of [=Feedstocks=] of the energy carrier. The sum total of the feedstock percentages MUST be smaller than or equal to 1.
+        <td>
+            If defined, the non-empty array of [=Feedstocks=] of the energy carrier. The sum total of the feedstock percentages MUST be smaller than or equal to 1.
+
+            If <{TAD/feedstocks}> is not defined, then <{TAD/energyCarrier}> MUST be defined. If possible, both SHOULD be defined.
     </table>
     <figcaption><{TAD}> properties</figcaption>
 </figure>
@@ -1848,7 +1852,8 @@ A Product Footprint with a <{ShipmentFootprint}> highlighted:
           "fossilGhgEmissions": "3.6801",
           "fossilCarbonContent": "0.0",
           "biogenicCarbonContent": "0.0",
-          "characterizationFactors": "AR5",
+          "characterizationFactors": "AR6",
+          "ipccCharacterizationFactors": ["AR6"],
           "crossSectoralStandardsUsed": [ "GHG Protocol Product standard" ],
           "productOrSectorSpecificRules": [],
           "boundaryProcessesDescription": "SFC GLEC Framework-conforming (W2W CO2e emissions)",