From 156ae7025b6656c8fda9f01777fb9c204fe2dbf2 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Tue, 22 Oct 2024 16:24:17 -0600 Subject: [PATCH 01/10] first pass at cutting down modes needs help from a translator! --- .../usaid-laos-ev-label-options.json | 92 +++++-------------- 1 file changed, 21 insertions(+), 71 deletions(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index 3b3cbde..8cb2fa1 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -2,122 +2,72 @@ "MODE": [ {"value":"walk", "base_mode": "WALKING", "baseMode":"WALKING", "met_equivalent":"WALKING", "kgCo2PerKm": 0}, - {"value":"e-auto_rickshaw", "base_mode": "MOPED", "icon": "rickshaw-electric", "footprint": { "electric": { "wh_per_km": 341.82 }}, - "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.085416859}, - {"value":"auto_rickshaw", "base_mode": "MOPED", "icon": "rickshaw", "footprint": { "gasoline": { "wh_per_km": 970 }}, - "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.231943784}, {"value":"motorcycle", "base_mode": "MOPED", "footprint": { "gasoline": { "wh_per_km": 473.17 }}, "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.113143309}, - {"value":"e-bike", "base_mode": "E_BIKE", - "baseMode":"E_BIKE", "met": {"ALL": {"range": [0, -1], "mets": 4.9}}, "kgCo2PerKm": 0.00728}, {"value":"bike", "base_mode": "BICYCLING", "baseMode":"BICYCLING", "met_equivalent":"BICYCLING", "kgCo2PerKm": 0}, - {"value":"drove_alone", "base_mode": "CAR", + {"value":"gas_car", "base_mode": "CAR", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031}, - {"value":"shared_ride", "base_mode": "CAR", "passengers": 2, - "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.11015}, - {"value":"e_car_drove_alone", "base_mode": "E_CAR", + {"value":"e_car", "base_mode": "E_CAR", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216}, - {"value":"e_car_shared_ride", "base_mode": "E_CAR", "passengers": 2, - "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.04108}, {"value":"taxi", "base_mode": "TAXI", "baseMode":"TAXI", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.30741}, - {"value":"bus", "base_mode": "BUS", - "baseMode":"BUS", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.20727}, - {"value":"train", "base_mode": "TRAIN", - "baseMode":"TRAIN", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.12256}, - {"value":"free_shuttle", "base_mode": "BUS", + {"value":"public_transit", "base_mode": "BUS", "baseMode":"BUS", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.20727}, {"value":"air", "base_mode": "AIR", "baseMode":"AIR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.09975}, {"value":"not_a_trip", "base_mode": "NONE", "baseMode":"UNKNOWN", "met_equivalent":"UNKNOWN", "kgCo2PerKm": 0}, - {"value":"other", "base_mode": "OTHER", + {"value":"other_mode", "base_mode": "OTHER", "baseMode":"OTHER", "met_equivalent":"UNKNOWN", "kgCo2PerKm": 0} ], "PURPOSE": [ {"value":"home"}, - {"value":"work"}, - {"value":"at_work"}, - {"value":"school"}, + {"value":"work_school"}, {"value":"transit_transfer"}, {"value":"shopping"}, {"value":"meal"}, - {"value":"pick_drop_person"}, - {"value":"pick_drop_item"}, - {"value":"personal_med"}, - {"value":"access_recreation"}, - {"value":"exercise"}, - {"value":"entertainment"}, - {"value":"religious"}, - {"value":"other"} + {"value":"pick_drop"}, + {"value":"other_reason"} ], "translations": { "en": { "walk": "Walk", - "e-auto_rickshaw":"E-tuk tuk", - "auto_rickshaw":"Tuk Tuk", "motorcycle":"Motorcycle", - "e-bike": "E-bike", "bike": "Bicycle", - "drove_alone": "Car Drove Alone", - "shared_ride": "Car Shared Ride", - "e_car_drove_alone": "E-Car Drove Alone", - "e_car_shared_ride": "E-Car Shared Ride", + "gas_car": "Car", + "e_car": "E-Car", "taxi": "Taxi/Loca/inDrive", - "bus": "Bus", - "train": "Train", - "free_shuttle": "Free Shuttle", + "public_transit": "Public Transportation", "air": "Airplane", "not_a_trip": "Not a trip", + "other_mode" : "Other", "home": "Home", - "work": "To Work", - "at_work": "At Work", - "school": "School", + "work_school": "Work or School", "transit_transfer": "Transit transfer", "shopping": "Shopping", "meal": "Meal", - "pick_drop_person": "Pick-up/ Drop off Person", - "pick_drop_item": "Pick-up/ Drop off Item", - "personal_med": "Personal/ Medical", - "access_recreation": "Access Recreation", - "exercise": "Recreation/ Exercise", - "entertainment": "Entertainment/ Social", - "religious": "Religious", - "other": "Other" + "pick_drop": "Pick-up/ Drop off", + "other_reason": "Other" }, "lo": { "walk": "ດ້ວຍການຍ່າງ", - "e-auto_rickshaw":"ລົດ 3 ລໍ້ໄຟຟ້າ ຫລື ຕຸກຕຸກໄຟຟ້າ", - "auto_rickshaw":"ເດີນທາດ້ວຍ ລົດຕຸກຕຸກ ຫລື ລົດສາມລໍ້", "motorcycle":"ລົດຈັກ", - "e-bike": "ວຍລົດຈັກໄຟຟ້າ", "bike": "ລົດຖີບ", - "drove_alone": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍ ເຊີ່ງເປັນລົດທີ່ຂັບເອງ", - "shared_ride": "ເດີນທາງດ້ວຍລົດໃຫ່ຍ ຮ່ວມກັບລົດຄົນອຶ່ນ", - "e_car_drove_alone": "ດ້ວຍການຂັບລົດໄຟຟ້າໄປເອງ", - "e_car_shared_ride": "ດ້ວຍການຈ້າງລົດໄຟຟ້າໄປ", + "gas_car": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍ", + "e_car": "ດ້ວຍການຂັບລົດໄຟຟ້າໄປເ", "taxi": "ແທັກຊີ", - "bus": "ລົດເມ", - "train": "ລົດໄຟ", - "free_shuttle": "ລົດຮັບສົ່ງຟຣີ", + "public_transit": "ລົດເມ", "air": "ຍົນ", "not_a_trip": "ບໍ່ແມ່ນການເດີນທາງ", + "other_mode" : "ອື່ນໆ", "home": "ບ້ານ", - "work": "ໄປເຮັດວຽກ", - "at_work": "ຢູ່ບ່ອນເຮັດວຽກ", - "school": "ໄປໂຮງຮຽນ", + "work_or_school": "ໄປເຮັດວຽກ/ໄປໂຮງຮຽນ", "transit_transfer": "ການຖ່າຍໂອນການເດີນທາງ", "shopping": "ຊອບປິ້ງ", "meal": "ອາຫານ", - "pick_drop_person": "ໄປຮັບ ຫລື ສົນ ຄົນ", - "pick_drop_item": "ໄປຮັບ ຫລື ສົ່ງສິນຄ້າ", - "personal_med": "ໄປຫາໝໍ", - "access_recreation": "ເຂົ້າເຖິງການພັກຜ່ອນ", - "exercise": "ພັກຜ່ອນ/ອອກກຳລັງກາຍ", - "entertainment": "ບັນເທີງ/ສັງຄົມ", - "religious": "ຈຸດປະສົງທາງສາດສະໜາ", - "other": "ອື່ນໆ" + "pick_drop": "ໄປຮັບ ຫລື ສົນ ຄົນ", + "other_reason": "ອື່ນໆ" } } } \ No newline at end of file From 0e00e833d6d7e74d71adbdefe6e8a874c99b6651 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Tue, 22 Oct 2024 16:39:46 -0600 Subject: [PATCH 02/10] E-car -> electric Car likely more clear than abbreviating, for those who don't have their phone in Lao --- label_options/usaid-laos-ev-label-options.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index 8cb2fa1..eb8fa27 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -36,7 +36,7 @@ "motorcycle":"Motorcycle", "bike": "Bicycle", "gas_car": "Car", - "e_car": "E-Car", + "e_car": "Electric Car", "taxi": "Taxi/Loca/inDrive", "public_transit": "Public Transportation", "air": "Airplane", From 1e9dea7dec47de56bd56f9c73a16f5db82df42f5 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 09:27:27 -0600 Subject: [PATCH 03/10] update translations --- label_options/usaid-laos-ev-label-options.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index eb8fa27..9147cec 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -54,11 +54,11 @@ "walk": "ດ້ວຍການຍ່າງ", "motorcycle":"ລົດຈັກ", "bike": "ລົດຖີບ", - "gas_car": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍ", - "e_car": "ດ້ວຍການຂັບລົດໄຟຟ້າໄປເ", + "gas_car": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍ ທີ່ແລ່ນດ້ວຍນໍ້າມັນ", + "e_car": "ເດີນທາງ ດ້ວຍລົດໃຫ່ຍໄຟຟ້າ", "taxi": "ແທັກຊີ", "public_transit": "ລົດເມ", - "air": "ຍົນ", + "air": "ດ້ວຍ ຍົນ", "not_a_trip": "ບໍ່ແມ່ນການເດີນທາງ", "other_mode" : "ອື່ນໆ", "home": "ບ້ານ", @@ -66,7 +66,7 @@ "transit_transfer": "ການຖ່າຍໂອນການເດີນທາງ", "shopping": "ຊອບປິ້ງ", "meal": "ອາຫານ", - "pick_drop": "ໄປຮັບ ຫລື ສົນ ຄົນ", + "pick_drop": "ໄປຮັບ ຫລື ໄປສົ່ງ", "other_reason": "ອື່ນໆ" } } From a108a000337fd1fa1395d6fb3874c5e0b1551592 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 09:30:27 -0600 Subject: [PATCH 04/10] reorder the label options aiming to present most common first to make labeling even faster --- label_options/usaid-laos-ev-label-options.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index 9147cec..241aa0d 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -1,19 +1,19 @@ { "MODE": [ - {"value":"walk", "base_mode": "WALKING", - "baseMode":"WALKING", "met_equivalent":"WALKING", "kgCo2PerKm": 0}, + {"value":"gas_car", "base_mode": "CAR", + "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031}, {"value":"motorcycle", "base_mode": "MOPED", "footprint": { "gasoline": { "wh_per_km": 473.17 }}, "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.113143309}, + {"value":"walk", "base_mode": "WALKING", + "baseMode":"WALKING", "met_equivalent":"WALKING", "kgCo2PerKm": 0}, + {"value":"e_car", "base_mode": "E_CAR", + "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216}, {"value":"bike", "base_mode": "BICYCLING", "baseMode":"BICYCLING", "met_equivalent":"BICYCLING", "kgCo2PerKm": 0}, - {"value":"gas_car", "base_mode": "CAR", - "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031}, - {"value":"e_car", "base_mode": "E_CAR", - "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216}, + {"value":"public_transit", "base_mode": "BUS", + "baseMode":"BUS", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.20727}, {"value":"taxi", "base_mode": "TAXI", "baseMode":"TAXI", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.30741}, - {"value":"public_transit", "base_mode": "BUS", - "baseMode":"BUS", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.20727}, {"value":"air", "base_mode": "AIR", "baseMode":"AIR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.09975}, {"value":"not_a_trip", "base_mode": "NONE", @@ -24,10 +24,10 @@ "PURPOSE": [ {"value":"home"}, {"value":"work_school"}, - {"value":"transit_transfer"}, {"value":"shopping"}, {"value":"meal"}, {"value":"pick_drop"}, + {"value":"transit_transfer"}, {"value":"other_reason"} ], "translations": { From c6db0d17f60080e5880427bea837822af78513a2 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 11:00:12 -0600 Subject: [PATCH 05/10] temporarily remove server for testing --- configs/usaid-laos-ev.nrel-op.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/usaid-laos-ev.nrel-op.json b/configs/usaid-laos-ev.nrel-op.json index afc2fb0..e762df6 100644 --- a/configs/usaid-laos-ev.nrel-op.json +++ b/configs/usaid-laos-ev.nrel-op.json @@ -1,10 +1,6 @@ { "version": 1, "ts": 1655143472, - "server": { - "connectUrl": "https://USAID-laos-EV-openpath.nrel.gov/api/", - "aggregate_call_auth": "user_only" - }, "intro": { "program_or_study": "study", "start_month": "05", From f9fa6825f71a3d35290b4ca494beccaa941b307b Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 11:04:50 -0600 Subject: [PATCH 06/10] use my label options --- configs/usaid-laos-ev.nrel-op.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/usaid-laos-ev.nrel-op.json b/configs/usaid-laos-ev.nrel-op.json index e762df6..11e5f7c 100644 --- a/configs/usaid-laos-ev.nrel-op.json +++ b/configs/usaid-laos-ev.nrel-op.json @@ -30,7 +30,7 @@ } } }, - "label_options": "https://raw.githubusercontent.com/e-mission/nrel-openpath-deploy-configs/main/label_options/usaid-laos-ev-label-options.json", + "label_options": "https://raw.githubusercontent.com/Abby-Wheelis/nrel-openpath-deploy-configs/cut-laos-labels/label_options/usaid-laos-ev-label-options.json", "survey_info": { "surveys": { "UserProfileSurvey": { From ec96fffb1ef4327eb38e92a2d2e69e981fc2eec9 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 11:46:21 -0600 Subject: [PATCH 07/10] fix key --- label_options/usaid-laos-ev-label-options.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index 241aa0d..2632689 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -62,7 +62,7 @@ "not_a_trip": "ບໍ່ແມ່ນການເດີນທາງ", "other_mode" : "ອື່ນໆ", "home": "ບ້ານ", - "work_or_school": "ໄປເຮັດວຽກ/ໄປໂຮງຮຽນ", + "work_school": "ໄປເຮັດວຽກ/ໄປໂຮງຮຽນ", "transit_transfer": "ການຖ່າຍໂອນການເດີນທາງ", "shopping": "ຊອບປິ້ງ", "meal": "ອາຫານ", From 296a3f06521aa6519c5c0e512f1f851cc7139b58 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 11:53:08 -0600 Subject: [PATCH 08/10] Revert "use my label options" This reverts commit f9fa6825f71a3d35290b4ca494beccaa941b307b. --- configs/usaid-laos-ev.nrel-op.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/usaid-laos-ev.nrel-op.json b/configs/usaid-laos-ev.nrel-op.json index 11e5f7c..e762df6 100644 --- a/configs/usaid-laos-ev.nrel-op.json +++ b/configs/usaid-laos-ev.nrel-op.json @@ -30,7 +30,7 @@ } } }, - "label_options": "https://raw.githubusercontent.com/Abby-Wheelis/nrel-openpath-deploy-configs/cut-laos-labels/label_options/usaid-laos-ev-label-options.json", + "label_options": "https://raw.githubusercontent.com/e-mission/nrel-openpath-deploy-configs/main/label_options/usaid-laos-ev-label-options.json", "survey_info": { "surveys": { "UserProfileSurvey": { From 1ac8c0a811fcaca12753c7dc4b28c249a6ddbe07 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 11:53:14 -0600 Subject: [PATCH 09/10] Revert "temporarily remove server for testing" This reverts commit c6db0d17f60080e5880427bea837822af78513a2. --- configs/usaid-laos-ev.nrel-op.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/usaid-laos-ev.nrel-op.json b/configs/usaid-laos-ev.nrel-op.json index e762df6..afc2fb0 100644 --- a/configs/usaid-laos-ev.nrel-op.json +++ b/configs/usaid-laos-ev.nrel-op.json @@ -1,6 +1,10 @@ { "version": 1, "ts": 1655143472, + "server": { + "connectUrl": "https://USAID-laos-EV-openpath.nrel.gov/api/", + "aggregate_call_auth": "user_only" + }, "intro": { "program_or_study": "study", "start_month": "05", From 56674a09ff1a20600f22d6b2e8891d3b573da578 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Wed, 23 Oct 2024 21:04:45 -0600 Subject: [PATCH 10/10] just taxi --- label_options/usaid-laos-ev-label-options.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label_options/usaid-laos-ev-label-options.json b/label_options/usaid-laos-ev-label-options.json index 2632689..61b8762 100644 --- a/label_options/usaid-laos-ev-label-options.json +++ b/label_options/usaid-laos-ev-label-options.json @@ -37,7 +37,7 @@ "bike": "Bicycle", "gas_car": "Car", "e_car": "Electric Car", - "taxi": "Taxi/Loca/inDrive", + "taxi": "Taxi", "public_transit": "Public Transportation", "air": "Airplane", "not_a_trip": "Not a trip",