update trip_statistics with Gas (#280)

- averageGasConsumption - overallAverageGasConsumption - vehicleType = GAS Co-authored-by: Tomas Prvak <[email protected]>
skodaconnect · Dec 12, 2024 · b4916e0 · b4916e0
1 parent f03d359
commit b4916e0
Show file tree

Hide file tree

Showing 16 changed files with 127 additions and 0 deletions.
diff --git a/fixtures/Fixtures_for_Kodiaq_Style_2023.yaml b/fixtures/Fixtures_for_Kodiaq_Style_2023.yaml
@@ -518,6 +518,7 @@ reports:
       detailed_statistics:
         - date: "2024-12-02"
           average_fuel_consumption: 12.53
+          average_gas_consumption:
           average_speed_in_kmph: 20
           average_electric_consumption:
           average_recuperation:
@@ -530,6 +531,7 @@ reports:
             - 3622867909
         - date: "2024-12-03"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -539,6 +541,7 @@ reports:
           trip_ids:
         - date: "2024-12-04"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -548,6 +551,7 @@ reports:
           trip_ids:
         - date: "2024-12-05"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -557,6 +561,7 @@ reports:
           trip_ids:
         - date: "2024-12-06"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -566,6 +571,7 @@ reports:
           trip_ids:
         - date: "2024-12-07"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -575,6 +581,7 @@ reports:
           trip_ids:
         - date: "2024-12-08"
           average_fuel_consumption:
+          average_gas_consumption:
           average_speed_in_kmph:
           average_electric_consumption:
           average_recuperation:
@@ -584,6 +591,7 @@ reports:
           trip_ids:
       overall_average_electric_consumption:
       overall_average_fuel_consumption: 12.53
+      overall_average_gas_consumption:
       overall_average_mileage_in_km: 26
       overall_average_speed_in_kmph: 20
       overall_average_travel_time_in_min: 81

diff --git a/fixtures/Octavia2023_w_aux_heating.yaml b/fixtures/Octavia2023_w_aux_heating.yaml
@@ -519,6 +519,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 9.8
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 23
       date: '2024-11-11'
@@ -530,6 +531,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 7.39
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 30
       date: '2024-11-12'
@@ -541,6 +543,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 13.1
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 21
       date: '2024-11-13'
@@ -551,6 +554,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-14'
@@ -560,6 +564,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-15'
@@ -569,6 +574,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-16'
@@ -578,6 +584,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-17'
@@ -586,6 +593,7 @@ reports:
       trip_ids: null
     overall_average_electric_consumption: null
     overall_average_fuel_consumption: 8.24
+    overall_average_gas_consumption: null
     overall_average_mileage_in_km: 12
     overall_average_speed_in_kmph: 28
     overall_average_travel_time_in_min: 27

diff --git a/fixtures/citigoe_iv_2021_ne142e2_best_of.yaml b/fixtures/citigoe_iv_2021_ne142e2_best_of.yaml
@@ -482,6 +482,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-25'
@@ -491,6 +492,7 @@ reports:
     - average_aux_consumption: 1.0
       average_electric_consumption: 11.4
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: 2.3
       average_speed_in_kmph: 63
       date: '2024-11-26'
@@ -501,6 +503,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-27'
@@ -510,6 +513,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-28'
@@ -519,6 +523,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-29'
@@ -528,6 +533,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-30'
@@ -537,6 +543,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-12-01'
@@ -545,6 +552,7 @@ reports:
       trip_ids: null
     overall_average_electric_consumption: 11.4
     overall_average_fuel_consumption: null
+    overall_average_gas_consumption: null
     overall_average_mileage_in_km: 13
     overall_average_speed_in_kmph: 63
     overall_average_travel_time_in_min: 13

diff --git a/fixtures/kamiq.yaml b/fixtures/kamiq.yaml
@@ -458,6 +458,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 7.1
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 42
       date: '2024-11-04'
@@ -468,6 +469,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 5.3
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 71
       date: '2024-11-05'
@@ -479,6 +481,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 8.3
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 30
       date: '2024-11-06'
@@ -489,6 +492,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 5.75
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 86
       date: '2024-11-07'
@@ -500,6 +504,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 5.97
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 55
       date: '2024-11-08'
@@ -511,6 +516,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 14.2
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 17
       date: '2024-11-09'
@@ -521,6 +527,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-10'
@@ -529,6 +536,7 @@ reports:
       trip_ids: null
     overall_average_electric_consumption: null
     overall_average_fuel_consumption: 5.79
+    overall_average_gas_consumption: null
     overall_average_mileage_in_km: 83
     overall_average_speed_in_kmph: 71
     overall_average_travel_time_in_min: 77

diff --git a/fixtures/karoq-se-l_2023.yaml b/fixtures/karoq-se-l_2023.yaml
@@ -425,6 +425,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-04'
@@ -434,6 +435,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-05'
@@ -443,6 +445,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: 7.22
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: 40
       date: '2024-11-06'
@@ -454,6 +457,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-07'
@@ -463,6 +467,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-08'
@@ -472,6 +477,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-09'
@@ -481,6 +487,7 @@ reports:
     - average_aux_consumption: null
       average_electric_consumption: null
       average_fuel_consumption: null
+      average_gas_consumption: null
       average_recuperation: null
       average_speed_in_kmph: null
       date: '2024-11-10'
@@ -489,6 +496,7 @@ reports:
       trip_ids: null
     overall_average_electric_consumption: null
     overall_average_fuel_consumption: 7.22
+    overall_average_gas_consumption: null
     overall_average_mileage_in_km: 14
     overall_average_speed_in_kmph: 40
     overall_average_travel_time_in_min: 24

diff --git a/fixtures/nx53l5_octavia_2024_combi_deepsleep_0.8.3.yaml b/fixtures/nx53l5_octavia_2024_combi_deepsleep_0.8.3.yaml
@@ -513,6 +513,7 @@ reports:
   result:
     detailed_statistics:
     - average_fuel_consumption: 5.1
+      average_gas_consumption: null
       average_aux_consumption: null
       average_electric_consumption: null
       average_recuperation: null
@@ -523,6 +524,7 @@ reports:
       trip_ids:
       - 3423108886
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -532,6 +534,7 @@ reports:
       travel_time_in_min: null
       trip_ids: null
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -541,6 +544,7 @@ reports:
       travel_time_in_min: null
       trip_ids: null
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -550,6 +554,7 @@ reports:
       travel_time_in_min: null
       trip_ids: null
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -559,6 +564,7 @@ reports:
       travel_time_in_min: null
       trip_ids: null
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -568,6 +574,7 @@ reports:
       travel_time_in_min: null
       trip_ids: null
     - average_fuel_consumption: null
+      average_gas_consumption: null
       average_speed_in_kmph: null
       average_aux_consumption: null
       average_electric_consumption: null
@@ -578,6 +585,7 @@ reports:
       trip_ids: null
     overall_average_electric_consumption: null
     overall_average_fuel_consumption: 5.1
+    overall_average_gas_consumption: null
     overall_average_mileage_in_km: 58
     overall_average_speed_in_kmph: 51
     overall_average_travel_time_in_min: 69