Merge pull request #86 from sine-fdn/co2e_intensity_throughput

Co2e intensity throughput

Author: zeitgeist

gen/schemas/hoc.json

@@ -17,7 +17,7 @@
       "$ref": "#/definitions/Decimal"
     },
     "co2eIntensityThroughput": {
-      "type": "string"
+      "$ref": "#/definitions/HocCo2eIntensityThroughput"
     },
     "co2eIntensityWTW": {
       "$ref": "#/definitions/Decimal"
@@ -243,6 +243,13 @@
         }
       ]
     },
+    "HocCo2eIntensityThroughput": {
+      "type": "string",
+      "enum": [
+        "TEU",
+        "tonnes"
+      ]
+    },
     "HubType": {
       "type": "string",
       "enum": [

gen/schemas/toc.json

@@ -27,7 +27,7 @@
       "$ref": "#/definitions/Decimal"
     },
     "co2eIntensityThroughput": {
-      "type": "string"
+      "$ref": "#/definitions/TocCo2eIntensityThroughput"
     },
     "co2eIntensityWTW": {
       "$ref": "#/definitions/Decimal"
@@ -245,6 +245,13 @@
         "mixed"
       ]
     },
+    "TocCo2eIntensityThroughput": {
+      "type": "string",
+      "enum": [
+        "TEUkm",
+        "tkm"
+      ]
+    },
     "TransportMode": {
       "type": "string",
       "enum": [

gen/src/lib.rs

@@ -112,11 +112,19 @@ pub struct Toc {
     pub co2e_intensity_wtw: WrappedDecimal,
     #[serde(rename = "co2eIntensityTTW")]
     pub co2e_intensity_ttw: WrappedDecimal,
-    pub co2e_intensity_throughput: String,
+    pub co2e_intensity_throughput: TocCo2eIntensityThroughput,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub glec_data_quality_index: Option<GlecDataQualityIndex>,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub enum TocCo2eIntensityThroughput {
+    #[serde(rename = "TEUkm")]
+    TEUkm,
+    Tkm,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub enum TemperatureControl {
@@ -179,7 +187,15 @@ pub struct Hoc {
     pub co2e_intensity_wtw: WrappedDecimal,
     #[serde(rename = "co2eIntensityTTW")]
     pub co2e_intensity_ttw: WrappedDecimal,
-    pub co2e_intensity_throughput: String,
+    pub co2e_intensity_throughput: HocCo2eIntensityThroughput,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub enum HocCo2eIntensityThroughput {
+    #[serde(rename = "TEU")]
+    TEU,
+    Tonnes,
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema, PartialEq, Clone)]

gen/tests/tests.rs

@@ -67,7 +67,7 @@ fn test_toc_deser() {
             .into(),
             co2e_intensity_wtw: dec!(3.6801).into(),
             co2e_intensity_ttw: dec!(3.2801).into(),
-            co2e_intensity_throughput: "tkm".to_string(),
+            co2e_intensity_throughput: TocCo2eIntensityThroughput::Tkm,
             glec_data_quality_index: None,
             description: None,
             load_factor: None,