diff --git a/fixtures/Fixtures_for_Kodiaq_Style_2023.yaml b/fixtures/Fixtures_for_Kodiaq_Style_2023.yaml index c8a47ac..25815a1 100755 --- 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 index c7ca69e..95e6c1b 100644 --- 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 index d4caa06..fcb5586 100644 --- 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 index 716038a..344bd21 100755 --- 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 index d6b75e7..50749e4 100644 --- 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 index 5371f98..2e4142e 100644 --- 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 diff --git a/fixtures/octavia_2022.yaml b/fixtures/octavia_2022.yaml index bc17918..f4158e0 100644 --- a/fixtures/octavia_2022.yaml +++ b/fixtures/octavia_2022.yaml @@ -520,6 +520,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-18' @@ -529,6 +530,7 @@ reports: - average_aux_consumption: null average_electric_consumption: null average_fuel_consumption: 22.9 + average_gas_consumption: null average_recuperation: null average_speed_in_kmph: 15 date: '2024-11-19' @@ -539,6 +541,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-20' @@ -548,6 +551,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-21' @@ -557,6 +561,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-22' @@ -566,6 +571,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-23' @@ -575,6 +581,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-24' @@ -583,6 +590,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: 22.9 + overall_average_gas_consumption: null overall_average_mileage_in_km: 1 overall_average_speed_in_kmph: 15 overall_average_travel_time_in_min: 2 diff --git a/fixtures/octavia_iv_2021_nx56xc_combi_rs.yaml b/fixtures/octavia_iv_2021_nx56xc_combi_rs.yaml index 4571ed3..3b22c31 100644 --- a/fixtures/octavia_iv_2021_nx56xc_combi_rs.yaml +++ b/fixtures/octavia_iv_2021_nx56xc_combi_rs.yaml @@ -678,6 +678,7 @@ reports: detailed_statistics: - date: '2024-11-25' average_fuel_consumption: 1.02 + average_gas_consumption: null average_speed_in_kmph: 42 average_electric_consumption: 21.16 average_recuperation: null @@ -689,6 +690,7 @@ reports: - 3588552460 - date: '2024-11-26' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -698,6 +700,7 @@ reports: trip_ids: null - date: '2024-11-27' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -707,6 +710,7 @@ reports: trip_ids: null - date: '2024-11-28' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -716,6 +720,7 @@ reports: trip_ids: null - date: '2024-11-29' average_fuel_consumption: 0 + average_gas_consumption: null average_speed_in_kmph: 43 average_electric_consumption: 25.66 average_recuperation: null @@ -727,6 +732,7 @@ reports: - 3607030751 - date: '2024-11-30' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -736,6 +742,7 @@ reports: trip_ids: null - date: '2024-12-01' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -745,6 +752,7 @@ reports: trip_ids: null overall_average_electric_consumption: 23.65 overall_average_fuel_consumption: 0.46 + overall_average_gas_consumption: null overall_average_mileage_in_km: 11 overall_average_speed_in_kmph: 43 overall_average_travel_time_in_min: 16 diff --git a/fixtures/octavia_iv_2022_nx34vc_liftback_style.yaml b/fixtures/octavia_iv_2022_nx34vc_liftback_style.yaml index de33ea1..7c22ca5 100644 --- a/fixtures/octavia_iv_2022_nx34vc_liftback_style.yaml +++ b/fixtures/octavia_iv_2022_nx34vc_liftback_style.yaml @@ -747,6 +747,7 @@ reports: detailed_statistics: - date: '2024-12-02' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -756,6 +757,7 @@ reports: trip_ids: null - date: '2024-12-03' average_fuel_consumption: 1.6 + average_gas_consumption: null average_speed_in_kmph: 45 average_electric_consumption: 14.3 average_recuperation: null @@ -766,6 +768,7 @@ reports: - 3627768439 - date: '2024-12-04' average_fuel_consumption: 0.3 + average_gas_consumption: null average_speed_in_kmph: 36 average_electric_consumption: 23.9 average_recuperation: null @@ -777,6 +780,7 @@ reports: - 3633053531 - date: '2024-12-05' average_fuel_consumption: 0.74 + average_gas_consumption: null average_speed_in_kmph: 34 average_electric_consumption: 24.69 average_recuperation: null @@ -788,6 +792,7 @@ reports: - 3636194329 - date: '2024-12-06' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -797,6 +802,7 @@ reports: trip_ids: null - date: '2024-12-07' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -806,6 +812,7 @@ reports: trip_ids: null - date: '2024-12-08' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -815,6 +822,7 @@ reports: trip_ids: null overall_average_electric_consumption: 19.1 overall_average_fuel_consumption: 1.09 + overall_average_gas_consumption: overall_average_mileage_in_km: 29 overall_average_speed_in_kmph: 40 overall_average_travel_time_in_min: 45 diff --git a/fixtures/prior99_octavia_2018.yaml b/fixtures/prior99_octavia_2018.yaml index 8e5ecec..f68d398 100644 --- a/fixtures/prior99_octavia_2018.yaml +++ b/fixtures/prior99_octavia_2018.yaml @@ -393,6 +393,7 @@ reports: result: detailed_statistics: - average_fuel_consumption: 8.48 + average_gas_consumption: null average_speed_in_kmph: 75 average_aux_consumption: null average_recuperation: null @@ -404,6 +405,7 @@ reports: - 2804340647 - 2804697197 - average_fuel_consumption: 4.89 + average_gas_consumption: null average_speed_in_kmph: 49 average_aux_consumption: null average_recuperation: null @@ -415,6 +417,7 @@ reports: - 2804930587 - 2805168290 - average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_aux_consumption: null average_recuperation: null @@ -424,6 +427,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_recuperation: null @@ -433,6 +437,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_recuperation: null @@ -442,6 +447,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_recuperation: null @@ -451,6 +457,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_recuperation: null @@ -461,6 +468,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: 7.36 + overall_average_gas_consumption: null overall_average_mileage_in_km: 27 overall_average_speed_in_kmph: 67 overall_average_travel_time_in_min: 25 diff --git a/fixtures/skoda_octavia_combi_2023.yaml b/fixtures/skoda_octavia_combi_2023.yaml index 908c615..b247165 100644 --- a/fixtures/skoda_octavia_combi_2023.yaml +++ b/fixtures/skoda_octavia_combi_2023.yaml @@ -473,6 +473,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' @@ -482,6 +483,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' @@ -491,6 +493,7 @@ reports: - average_aux_consumption: null average_electric_consumption: null average_fuel_consumption: 8.6 + average_gas_consumption: null average_recuperation: null average_speed_in_kmph: 24 date: '2024-11-06' @@ -501,6 +504,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' @@ -510,6 +514,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' @@ -519,6 +524,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' @@ -528,6 +534,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' @@ -536,6 +543,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: 8.6 + overall_average_gas_consumption: null overall_average_mileage_in_km: 1 overall_average_speed_in_kmph: 24 overall_average_travel_time_in_min: 2 diff --git a/fixtures/superb_2024_3v35wz_liftback_l_and_k.yaml b/fixtures/superb_2024_3v35wz_liftback_l_and_k.yaml index d959a91..e3a6237 100644 --- a/fixtures/superb_2024_3v35wz_liftback_l_and_k.yaml +++ b/fixtures/superb_2024_3v35wz_liftback_l_and_k.yaml @@ -728,6 +728,7 @@ reports: detailed_statistics: - date: '2024-11-25' average_fuel_consumption: 13.45 + average_gas_consumption: null average_speed_in_kmph: 23 average_electric_consumption: null average_recuperation: null @@ -740,6 +741,7 @@ reports: - 3590093673 - date: '2024-11-26' average_fuel_consumption: 13.54 + average_gas_consumption: null average_speed_in_kmph: 24 average_electric_consumption: null average_recuperation: null @@ -752,6 +754,7 @@ reports: - 3593893861 - date: '2024-11-27' average_fuel_consumption: 14.7 + average_gas_consumption: null average_speed_in_kmph: 17 average_electric_consumption: null average_recuperation: null @@ -762,6 +765,7 @@ reports: - 3596665716 - date: '2024-11-28' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -771,6 +775,7 @@ reports: trip_ids: null - date: '2024-11-29' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -780,6 +785,7 @@ reports: trip_ids: null - date: '2024-11-30' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -789,6 +795,7 @@ reports: trip_ids: null - date: '2024-12-01' average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_electric_consumption: null average_recuperation: null @@ -798,6 +805,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: 13.62 + overall_average_gas_consumption: null overall_average_mileage_in_km: 16 overall_average_speed_in_kmph: 23 overall_average_travel_time_in_min: 50 diff --git a/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml b/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml index 4b690f6..a5836a6 100644 --- a/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml +++ b/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml @@ -536,6 +536,7 @@ reports: result: detailed_statistics: - average_fuel_consumption: 0.0 + average_gas_consumption: null average_speed_in_kmph: 49 average_aux_consumption: null average_electric_consumption: 21.0 @@ -546,6 +547,7 @@ reports: trip_ids: - 3390168222 - average_fuel_consumption: 0.0 + average_gas_consumption: null average_speed_in_kmph: 30 average_aux_consumption: null average_electric_consumption: 10.35 @@ -557,6 +559,7 @@ reports: - 3393116584 - 3398500831 - average_fuel_consumption: 0.0 + average_gas_consumption: null average_speed_in_kmph: 31 average_aux_consumption: null average_electric_consumption: 25.8 @@ -567,6 +570,7 @@ reports: trip_ids: - 3403348176 - average_fuel_consumption: null + average_gas_consumption: null average_speed_in_kmph: null average_aux_consumption: null average_electric_consumption: null @@ -576,6 +580,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 @@ -585,6 +590,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 @@ -594,6 +600,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 @@ -604,6 +611,7 @@ reports: trip_ids: null overall_average_electric_consumption: 17.99 overall_average_fuel_consumption: 0.0 + overall_average_gas_consumption: null overall_average_mileage_in_km: 14 overall_average_speed_in_kmph: 36 overall_average_travel_time_in_min: 24 diff --git a/fixtures/superb_iv_2021_3v54xc.yaml b/fixtures/superb_iv_2021_3v54xc.yaml index fcae5e8..30d9eb4 100644 --- a/fixtures/superb_iv_2021_3v54xc.yaml +++ b/fixtures/superb_iv_2021_3v54xc.yaml @@ -510,6 +510,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-11' @@ -519,6 +520,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-12' @@ -528,6 +530,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-13' @@ -537,6 +540,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' @@ -546,6 +550,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' @@ -555,6 +560,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' @@ -564,6 +570,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' @@ -572,6 +579,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: null + overall_average_gas_consumption: null overall_average_mileage_in_km: null overall_average_speed_in_kmph: null overall_average_travel_time_in_min: null diff --git a/fixtures/superb_iv_combi_2022_3V53XC_standing_still.yaml b/fixtures/superb_iv_combi_2022_3V53XC_standing_still.yaml index 4ff79d0..2bef8c1 100644 --- a/fixtures/superb_iv_combi_2022_3V53XC_standing_still.yaml +++ b/fixtures/superb_iv_combi_2022_3V53XC_standing_still.yaml @@ -512,6 +512,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' @@ -521,6 +522,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' @@ -530,6 +532,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-06' @@ -539,6 +542,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' @@ -548,6 +552,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' @@ -557,6 +562,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' @@ -566,6 +572,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' @@ -574,6 +581,7 @@ reports: trip_ids: null overall_average_electric_consumption: null overall_average_fuel_consumption: null + overall_average_gas_consumption: null overall_average_mileage_in_km: null overall_average_speed_in_kmph: null overall_average_travel_time_in_min: null diff --git a/myskoda/models/trip_statistics.py b/myskoda/models/trip_statistics.py index 7eaa1e7..f5db770 100644 --- a/myskoda/models/trip_statistics.py +++ b/myskoda/models/trip_statistics.py @@ -12,6 +12,7 @@ class VehicleType(StrEnum): FUEL = "FUEL" HYBRID = "HYBRID" ELECTRIC = "ELECTRIC" + GAS = "GAS" @dataclass @@ -20,6 +21,9 @@ class StatisticsEntry(DataClassORJSONMixin): average_fuel_consumption: float | None = field( default=None, metadata=field_options(alias="averageFuelConsumption") ) + average_gas_consumption: float | None = field( + default=None, metadata=field_options(alias="averageGasConsumption") + ) average_speed_in_kmph: int | None = field( default=None, metadata=field_options(alias="averageSpeedInKmph") ) @@ -51,6 +55,9 @@ class TripStatistics(DataClassORJSONMixin): overall_average_fuel_consumption: float | None = field( default=None, metadata=field_options(alias="overallAverageFuelConsumption") ) + overall_average_gas_consumption: float | None = field( + default=None, metadata=field_options(alias="overallAverageGasConsumption") + ) overall_average_mileage_in_km: int | None = field( default=None, metadata=field_options(alias="overallAverageMileageInKm") )