Merge remote-tracking branch 'upstream/service_rewrite_2023' into pus…

…hnotify-rewrite
e-mission · Oct 30, 2023 · 2e40916 · 2e40916
2 parents eb4ba22 + 5b725a1
commit 2e40916
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/www/i18n/en.json b/www/i18n/en.json
@@ -155,6 +155,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
@@ -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.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},
@@ -51,4 +53,4 @@
     {"value":"free_shuttle"},
     {"value":"other"}
   ]
-}
+}