From d54731fdef2ed1c691eaaf71bd0e713f3e363dc2 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Sat, 21 Oct 2023 16:22:41 -0600 Subject: [PATCH 1/2] add hybrid car added hybrid car to label-options file and to en i18n --- www/i18n/en.json | 2 ++ www/json/label-options.json.sample | 2 ++ 2 files changed, 4 insertions(+) diff --git a/www/i18n/en.json b/www/i18n/en.json index 9217339f7..a3f4642f3 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -154,6 +154,8 @@ "scootershare": "Scooter share", "drove_alone": "Gas Car Drove Alone", "shared_ride": "Gas Car Shared Ride", + "hybrid_drove_alone": "Hybrid Drove Alone", + "hybrid_shared_ride": "Hybrid Shared Ride", "e_car_drove_alone": "E-Car Drove Alone", "e_car_shared_ride": "E-Car Shared Ride", "moped": "Moped", diff --git a/www/json/label-options.json.sample b/www/json/label-options.json.sample index 9870b744f..bd428628c 100644 --- a/www/json/label-options.json.sample +++ b/www/json/label-options.json.sample @@ -7,6 +7,8 @@ {"value":"scootershare", "baseMode":"E_SCOOTER", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.00894}, {"value":"drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031}, {"value":"shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.11015}, + {"value":"hybrid_drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.138}, + {"value":"hybrid_shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.069}, {"value":"e_car_drove_alone", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216}, {"value":"e_car_shared_ride", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.04108}, {"value":"moped", "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.05555}, From 6dc7e4f674e7f55fdceb0f32f676201ad62fbb30 Mon Sep 17 00:00:00 2001 From: Abby Wheelis <54848919+Abby-Wheelis@users.noreply.github.com> Date: Mon, 23 Oct 2023 10:52:06 -0600 Subject: [PATCH 2/2] update hybrid kgCo2PerKm https://github.com/e-mission/e-mission-docs/issues/1013#issuecomment-1773461173 --- www/json/label-options.json.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/json/label-options.json.sample b/www/json/label-options.json.sample index bd428628c..a2b49258c 100644 --- a/www/json/label-options.json.sample +++ b/www/json/label-options.json.sample @@ -7,8 +7,8 @@ {"value":"scootershare", "baseMode":"E_SCOOTER", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.00894}, {"value":"drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031}, {"value":"shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.11015}, - {"value":"hybrid_drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.138}, - {"value":"hybrid_shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.069}, + {"value":"hybrid_drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.127}, + {"value":"hybrid_shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.0635}, {"value":"e_car_drove_alone", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216}, {"value":"e_car_shared_ride", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.04108}, {"value":"moped", "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.05555}, @@ -53,4 +53,4 @@ {"value":"free_shuttle"}, {"value":"other"} ] -} \ No newline at end of file +}