diff --git a/emcommon_js/.js b/emcommon_js/.js index df53274..d3eb0eb 100644 --- a/emcommon_js/.js +++ b/emcommon_js/.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; var __name__ = ''; diff --git a/emcommon_js/dist/emcommon.diary.base_modes.d.ts b/emcommon_js/dist/emcommon.diary.base_modes.d.ts index 7be279d..b5c73a8 100644 --- a/emcommon_js/dist/emcommon.diary.base_modes.d.ts +++ b/emcommon_js/dist/emcommon.diary.base_modes.d.ts @@ -30,7 +30,7 @@ export function get_rich_mode_for_value(value: any, label_options: any): any; export function get_rich_mode(label_option: any): {}; export function scale_lightness(hex_color: any, factor: any): any; export function dedupe_colors(colors: any, adjustment_range: any): {}; -import { mpge_to_wh_per_km } from './emcommon.metrics.footprint.util.js'; import * as Log from './emcommon.logger.js'; -export { mpge_to_wh_per_km, Log }; +import { mpge_to_wh_per_km } from './emcommon.metrics.footprint.util.js'; +export { Log, mpge_to_wh_per_km }; //# sourceMappingURL=emcommon.diary.base_modes.d.ts.map \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.diary.base_modes.d.ts.map b/emcommon_js/dist/emcommon.diary.base_modes.d.ts.map index 7a70e1d..321a391 100644 --- a/emcommon_js/dist/emcommon.diary.base_modes.d.ts.map +++ b/emcommon_js/dist/emcommon.diary.base_modes.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emcommon.diary.base_modes.d.ts","sourceRoot":"","sources":["../emcommon.diary.base_modes.js"],"names":[],"mappings":"AAOA,6BAAwN;AACxN,8BAAklB;AACllB,6BAAia;AACja,+BAA6F;AAC7F,oCAAmC;AACnC,mCAAkC;AAClC,yCAAuC;AACvC,wCAAsC;AACtC,mCAAiC;AACjC,wCAAwC;AACxC,mCAAkC;AAClC,sCAAoC;AACpC,2CAAsC;AACtC,4CAA0C;AAC1C,8CAA0C;AAC1C,qCAAqD;AACrD,6BAA0B;AAC1B,+BAAoF;AACpF,+BAAqF;AACrF,iCAAsF;AACtF,oCAA+L;AAC/L,kCAA0F;AAC1F,qCAA4I;AAC5I,qCAAkG;AAClG,iCAAwF;AACxF,gCAA0F;AAC1F,4BAA86F;AACv6F,2DAIN;AACM,6EAWN;AACM,qDAkCN;AACM,kEAWN;AACM,sEAgCN;kCAhI+B,sCAAsC;qBACjD,sBAAsB"} \ No newline at end of file +{"version":3,"file":"emcommon.diary.base_modes.d.ts","sourceRoot":"","sources":["../emcommon.diary.base_modes.js"],"names":[],"mappings":"AAOA,6BAAwN;AACxN,8BAAklB;AACllB,6BAAia;AACja,+BAA6F;AAC7F,oCAAmC;AACnC,mCAAkC;AAClC,yCAAuC;AACvC,wCAAsC;AACtC,mCAAiC;AACjC,wCAAwC;AACxC,mCAAkC;AAClC,sCAAoC;AACpC,2CAAsC;AACtC,4CAA0C;AAC1C,8CAA0C;AAC1C,qCAAqD;AACrD,6BAA0B;AAC1B,+BAAoF;AACpF,+BAAqF;AACrF,iCAAsF;AACtF,oCAA+L;AAC/L,kCAA0F;AAC1F,qCAA4I;AAC5I,qCAAkG;AAClG,iCAAwF;AACxF,gCAA0F;AAC1F,4BAA86F;AACv6F,2DAIN;AACM,6EAWN;AACM,qDAkCN;AACM,kEAWN;AACM,sEAgCN;qBA/HoB,sBAAsB;kCADX,sCAAsC"} \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts b/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts index 052d09f..978b97f 100644 --- a/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts +++ b/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts @@ -1,5 +1,5 @@ export function get_mets_mode_map(label_options: any): {}; -import { BASE_MODES } from './emcommon.diary.base_modes.js'; import * as Log from './emcommon.logger.js'; -export { BASE_MODES, Log }; +import { BASE_MODES } from './emcommon.diary.base_modes.js'; +export { Log, BASE_MODES }; //# sourceMappingURL=emcommon.metrics.active_travel.active_travel_calculations.d.ts.map \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts.map b/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts.map index a0ef982..d2da2b9 100644 --- a/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts.map +++ b/emcommon_js/dist/emcommon.metrics.active_travel.active_travel_calculations.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emcommon.metrics.active_travel.active_travel_calculations.d.ts","sourceRoot":"","sources":["../emcommon.metrics.active_travel.active_travel_calculations.js"],"names":[],"mappings":"AAMO,0DA0BN;2BA9BwB,gCAAgC;qBACpC,sBAAsB"} \ No newline at end of file +{"version":3,"file":"emcommon.metrics.active_travel.active_travel_calculations.d.ts","sourceRoot":"","sources":["../emcommon.metrics.active_travel.active_travel_calculations.js"],"names":[],"mappings":"AAMO,0DA0BN;qBA7BoB,sBAAsB;2BADlB,gCAAgC"} \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts b/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts index a58a66b..7240ba3 100644 --- a/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts +++ b/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts @@ -1,14 +1,13 @@ -export function merge_metadatas(meta_a: any, meta_b: any): void; -export function calc_footprint_for_trip(trip: any, label_options: any, mode_value: any, labels_map: any): Promise; +export function calc_footprint_for_trip(trip: any, label_options: any, mode_key: any, mode_value: any, labels_map: any): Promise; export function calc_footprint(mode_footprint: any, distance: any, year: any, coords: any, uace: any, egrid_region: any, passengers: any, metadata: any): Promise; export const _worst_rich_mode: any; export const _worst_wh_per_km: number; export function find_worst_rich_mode(label_options: any): any; -import * as emcdb from './emcommon.diary.base_modes.js'; +import * as emcmfu from './emcommon.metrics.footprint.util.js'; import * as emcmfe from './emcommon.metrics.footprint.egrid.js'; import * as emcmft from './emcommon.metrics.footprint.transit.js'; -import * as emcmfu from './emcommon.metrics.footprint.util.js'; -import * as emcdu from './emcommon.diary.util.js'; import * as Log from './emcommon.logger.js'; -export { emcdb, emcmfe, emcmft, emcmfu, emcdu, Log }; +import * as emcdb from './emcommon.diary.base_modes.js'; +import * as emcdu from './emcommon.diary.util.js'; +export { emcmfu, emcmfe, emcmft, Log, emcdb, emcdu }; //# sourceMappingURL=emcommon.metrics.footprint.footprint_calculations.d.ts.map \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts.map b/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts.map index ac51b8d..d35f67e 100644 --- a/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts.map +++ b/emcommon_js/dist/emcommon.metrics.footprint.footprint_calculations.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emcommon.metrics.footprint.footprint_calculations.d.ts","sourceRoot":"","sources":["../emcommon.metrics.footprint.footprint_calculations.js"],"names":[],"mappings":"AAUO,gEAmCN;AACM,uHAyBN;AACM,uKAmDN;AACD,mCAAmC;AACnC,sCAAgC;AACzB,8DAsBN;uBA9IsB,gCAAgC;wBAF/B,uCAAuC;wBADvC,yCAAyC;wBADzC,sCAAsC;uBAGvC,0BAA0B;qBAE5B,sBAAsB"} \ No newline at end of file +{"version":3,"file":"emcommon.metrics.footprint.footprint_calculations.d.ts","sourceRoot":"","sources":["../emcommon.metrics.footprint.footprint_calculations.js"],"names":[],"mappings":"AAUO,sIA4BN;AACM,uKAmDN;AACD,mCAAmC;AACnC,sCAAgC;AACzB,8DAsBN;wBAjHuB,sCAAsC;wBAEtC,uCAAuC;wBADvC,yCAAyC;qBAI5C,sBAAsB;uBADpB,gCAAgC;uBADhC,0BAA0B"} \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts b/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts index db9ef0c..ce3e8e4 100644 --- a/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts +++ b/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts @@ -18,6 +18,7 @@ export const latest_ntd_year: any; export function get_egrid_region(coords: any, year: any): any; export function get_uace_by_coords(coords: any, year: any): Promise; export function get_intensities_data(year: any, dataset: any): any; +export function merge_metadatas(meta_a: any, meta_b: any): void; import { fetch_url } from './emcommon.util.js'; import { read_json_resource } from './emcommon.util.js'; import * as Log from './emcommon.logger.js'; diff --git a/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts.map b/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts.map index 60883ad..5b4d820 100644 --- a/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts.map +++ b/emcommon_js/dist/emcommon.metrics.footprint.util.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emcommon.metrics.footprint.util.d.ts","sourceRoot":"","sources":["../emcommon.metrics.footprint.util.js"],"names":[],"mappings":"AAMA,+BAAgC;AAChC,iCAA+B;AAC/B,sCAAmC;AACnC,0CAAoD;AACpD,wCAAmD;AACnD,2CAAsD;AACtD,qCAAgD;AAChD,qCAAgD;AAChD,yCAAmD;AACnD,uCAAiD;AACjD,sCAA4J;AACrJ,qDAEN;AACM,gDAEN;AACM,mEAoBN;AACM,yEAeN;AACD,oCAAoC;AACpC,kCAAkC;AAC3B,8DA0BN;AACM,yEAwBN;AACM,mEA4BN;0BA5I2C,oBAAoB;mCAApB,oBAAoB;qBAC3C,sBAAsB"} \ No newline at end of file +{"version":3,"file":"emcommon.metrics.footprint.util.d.ts","sourceRoot":"","sources":["../emcommon.metrics.footprint.util.js"],"names":[],"mappings":"AAMA,+BAAgC;AAChC,iCAA+B;AAC/B,sCAAmC;AACnC,0CAAoD;AACpD,wCAAmD;AACnD,2CAAsD;AACtD,qCAAgD;AAChD,qCAAgD;AAChD,yCAAmD;AACnD,uCAAiD;AACjD,sCAA4J;AACrJ,qDAEN;AACM,gDAEN;AACM,mEAoBN;AACM,yEAeN;AACD,oCAAoC;AACpC,kCAAkC;AAC3B,8DA0BN;AACM,yEAwBN;AACM,mEA4BN;AACM,gEAmCN;0BAhL2C,oBAAoB;mCAApB,oBAAoB;qBAC3C,sBAAsB"} \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts b/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts index 7c297f8..98e0fad 100644 --- a/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts +++ b/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts @@ -6,13 +6,13 @@ export function acc_value_of_metric(metric_name: any, acc: any, new_val: any): a export function get_summary_for_metric(metric: any, confirmed_trips: any): Promise; export const grouping_field_fns: {}; export function metric_summary_for_trips(metric: any, confirmed_trips: any): Promise<{}>; -import * as emcsc from './emcommon.survey.conditional_surveys.js'; -import * as emcdb from './emcommon.diary.base_modes.js'; +import * as emcmfu from './emcommon.metrics.footprint.util.js'; import * as emcble from './emcommon.bluetooth.ble_matching.js'; -import * as emcmff from './emcommon.metrics.footprint.footprint_calculations.js'; -import * as emcfu from './emcommon.metrics.footprint.util.js'; -import * as emcdu from './emcommon.diary.util.js'; import * as util from './emcommon.util.js'; import * as Log from './emcommon.logger.js'; -export { emcsc, emcdb, emcble, emcmff, emcfu, emcdu, util, Log }; +import * as emcdu from './emcommon.diary.util.js'; +import * as emcdb from './emcommon.diary.base_modes.js'; +import * as emcsc from './emcommon.survey.conditional_surveys.js'; +import * as emcmff from './emcommon.metrics.footprint.footprint_calculations.js'; +export { emcmfu, emcble, util, Log, emcdu, emcdb, emcsc, emcmff }; //# sourceMappingURL=emcommon.metrics.metrics_summaries.d.ts.map \ No newline at end of file diff --git a/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts.map b/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts.map index 18485a3..79cb3c7 100644 --- a/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts.map +++ b/emcommon_js/dist/emcommon.metrics.metrics_summaries.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emcommon.metrics.metrics_summaries.d.ts","sourceRoot":"","sources":["../emcommon.metrics.metrics_summaries.js"],"names":[],"mappings":"AAYA,6BAA6B;AAC7B,6BAA6B;AACtB,kHAkCN;AACM,4HA+BN;AACM,mFA0BN;AACM,0FAsBN;AACD,oCAYK;AACE,yFAuBN;uBAjKsB,0CAA0C;uBAH1C,gCAAgC;wBAI/B,sCAAsC;wBAFtC,wDAAwD;uBADzD,sCAAsC;uBAFtC,0BAA0B;sBAM3B,oBAAoB;qBACrB,sBAAsB"} \ No newline at end of file +{"version":3,"file":"emcommon.metrics.metrics_summaries.d.ts","sourceRoot":"","sources":["../emcommon.metrics.metrics_summaries.js"],"names":[],"mappings":"AAYA,6BAA6B;AAC7B,6BAA6B;AACtB,kHAkCN;AACM,4HA+BN;AACM,mFA0BN;AACM,0FAsBN;AACD,oCAYK;AACE,yFAuBN;wBAnKuB,sCAAsC;wBAGtC,sCAAsC;sBACxC,oBAAoB;qBACrB,sBAAsB;uBAPpB,0BAA0B;uBAC1B,gCAAgC;uBAGhC,0CAA0C;wBADzC,wDAAwD"} \ No newline at end of file diff --git a/emcommon_js/dist/index.d.ts b/emcommon_js/dist/index.d.ts index 415b202..4f07242 100644 --- a/emcommon_js/dist/index.d.ts +++ b/emcommon_js/dist/index.d.ts @@ -1,10 +1,10 @@ export function dict_to_js_obj(py_dict: any): {}; -import * as ble_matching from './emcommon.bluetooth.ble_matching.js'; -import * as footprint_calculations from './emcommon.metrics.footprint.footprint_calculations.js'; -import * as active_travel_calculations from './emcommon.metrics.active_travel.active_travel_calculations.js'; import * as conditional_surveys from './emcommon.survey.conditional_surveys.js'; -import * as Log from './emcommon.logger.js'; import * as metrics_summaries from './emcommon.metrics.metrics_summaries.js'; +import * as footprint_calculations from './emcommon.metrics.footprint.footprint_calculations.js'; +import * as ble_matching from './emcommon.bluetooth.ble_matching.js'; import * as base_modes from './emcommon.diary.base_modes.js'; -export { ble_matching, footprint_calculations, active_travel_calculations, conditional_surveys, Log, metrics_summaries, base_modes }; +import * as Log from './emcommon.logger.js'; +import * as active_travel_calculations from './emcommon.metrics.active_travel.active_travel_calculations.js'; +export { conditional_surveys, metrics_summaries, footprint_calculations, ble_matching, base_modes, Log, active_travel_calculations }; //# sourceMappingURL=index.d.ts.map \ No newline at end of file diff --git a/emcommon_js/dist/index.d.ts.map b/emcommon_js/dist/index.d.ts.map index 7567efe..227aab2 100644 --- a/emcommon_js/dist/index.d.ts.map +++ b/emcommon_js/dist/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":"AAWO,iDAWN;8BAlB6B,sCAAsC;wCAD5B,wDAAwD;4CAGpD,gEAAgE;qCADvE,0CAA0C;qBAG1D,sBAAsB;mCADR,yCAAyC;4BALhD,gCAAgC"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":"AAWO,iDAWN;qCAjBoC,0CAA0C;mCAE5C,yCAAyC;wCAJpC,wDAAwD;8BAClE,sCAAsC;4BAFxC,gCAAgC;qBAMvC,sBAAsB;4CAFC,gEAAgE"} \ No newline at end of file diff --git a/emcommon_js/emcommon.bluetooth.ble_matching.js b/emcommon_js/emcommon.bluetooth.ble_matching.js index 4491b01..2faa22d 100644 --- a/emcommon_js/emcommon.bluetooth.ble_matching.js +++ b/emcommon_js/emcommon.bluetooth.ble_matching.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as Log from './emcommon.logger.js'; export {Log}; diff --git a/emcommon_js/emcommon.diary.base_modes.js b/emcommon_js/emcommon.diary.base_modes.js index 3c27108..872f498 100644 --- a/emcommon_js/emcommon.diary.base_modes.js +++ b/emcommon_js/emcommon.diary.base_modes.js @@ -1,8 +1,8 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import {mpge_to_wh_per_km} from './emcommon.metrics.footprint.util.js'; import * as Log from './emcommon.logger.js'; -export {mpge_to_wh_per_km, Log}; +export {Log, mpge_to_wh_per_km}; var __name__ = 'emcommon.diary.base_modes'; import color from 'color' export var mode_colors = dict ({'pink': '#c32e85', 'red': '#c21725', 'orange': '#bf5900', 'green': '#008148', 'blue': '#0074b7', 'periwinkle': '#6356bf', 'magenta': '#9240a4', 'grey': '#555555', 'taupe': '#7d585a'}); diff --git a/emcommon_js/emcommon.diary.util.js b/emcommon_js/emcommon.diary.util.js index 2b7c3e8..f8079c5 100644 --- a/emcommon_js/emcommon.diary.util.js +++ b/emcommon_js/emcommon.diary.util.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as emcble from './emcommon.bluetooth.ble_matching.js'; import * as Log from './emcommon.logger.js'; diff --git a/emcommon_js/emcommon.logger.js b/emcommon_js/emcommon.logger.js index 16cb943..a335067 100644 --- a/emcommon_js/emcommon.logger.js +++ b/emcommon_js/emcommon.logger.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; var __name__ = 'emcommon.logger'; export var debug = function () { diff --git a/emcommon_js/emcommon.metrics.active_travel.active_travel_calculations.js b/emcommon_js/emcommon.metrics.active_travel.active_travel_calculations.js index f0bce7a..c7004c9 100644 --- a/emcommon_js/emcommon.metrics.active_travel.active_travel_calculations.js +++ b/emcommon_js/emcommon.metrics.active_travel.active_travel_calculations.js @@ -1,8 +1,8 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import {BASE_MODES} from './emcommon.diary.base_modes.js'; import * as Log from './emcommon.logger.js'; -export {BASE_MODES, Log}; +export {Log, BASE_MODES}; var __name__ = 'emcommon.metrics.active_travel.active_travel_calculations'; export var get_mets_mode_map = function (label_options) { var mode_options = label_options ['MODE']; diff --git a/emcommon_js/emcommon.metrics.footprint.egrid.js b/emcommon_js/emcommon.metrics.footprint.egrid.js index 5265b15..b12379a 100644 --- a/emcommon_js/emcommon.metrics.footprint.egrid.js +++ b/emcommon_js/emcommon.metrics.footprint.egrid.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as emcmfu from './emcommon.metrics.footprint.util.js'; import * as Log from './emcommon.logger.js'; diff --git a/emcommon_js/emcommon.metrics.footprint.footprint_calculations.js b/emcommon_js/emcommon.metrics.footprint.footprint_calculations.js index 88441d9..ca2cbab 100644 --- a/emcommon_js/emcommon.metrics.footprint.footprint_calculations.js +++ b/emcommon_js/emcommon.metrics.footprint.footprint_calculations.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as emcmfu from './emcommon.metrics.footprint.util.js'; import * as emcmft from './emcommon.metrics.footprint.transit.js'; @@ -6,45 +6,12 @@ import * as emcmfe from './emcommon.metrics.footprint.egrid.js'; import * as emcdu from './emcommon.diary.util.js'; import * as emcdb from './emcommon.diary.base_modes.js'; import * as Log from './emcommon.logger.js'; -export {emcdb, emcmfe, emcmft, emcmfu, emcdu, Log}; +export {emcmfu, emcmfe, emcmft, Log, emcdb, emcdu}; var __name__ = 'emcommon.metrics.footprint.footprint_calculations'; -export var merge_metadatas = function (meta_a, meta_b) { - for (var key in meta_b) { - var value = meta_b [key]; - if (!__in__ (key, meta_a)) { - meta_a [key] = value; - } - else if (hasattr (meta_a [key], 'concat')) { - meta_a [key] = meta_a [key].concat ((function () { - var __accu0__ = []; - for (var v of value) { - if (!__in__ (v, meta_a [key])) { - __accu0__.append (v); - } - } - return __accu0__; - }) ()); - } - else if (isinstance (value, list)) { - meta_a [key] = meta_a [key] + (function () { - var __accu0__ = []; - for (var v of value) { - if (!__in__ (v, meta_a [key])) { - __accu0__.append (v); - } - } - return __accu0__; - }) (); - } - else if (isinstance (value, bool)) { - meta_a [key] = meta_a [key] || value; - } - else { - meta_a [key] = value; - } - } -}; -export var calc_footprint_for_trip = async function (trip, label_options, mode_value, labels_map) { +export var calc_footprint_for_trip = async function (trip, label_options, mode_key, mode_value, labels_map) { + if (typeof mode_key == 'undefined' || (mode_key != null && mode_key.hasOwnProperty ("__kwargtrans__"))) {; + mode_key = 'mode'; + }; if (typeof mode_value == 'undefined' || (mode_value != null && mode_value.hasOwnProperty ("__kwargtrans__"))) {; mode_value = null; }; @@ -52,7 +19,7 @@ export var calc_footprint_for_trip = async function (trip, label_options, mode_v labels_map = null; }; trip = dict (trip); - mode_value = mode_value || emcdu.label_for_trip (trip, 'mode', labels_map); + mode_value = mode_value || emcdu.label_for_trip (trip, mode_key, labels_map); var rich_mode = mode_value && emcdb.get_rich_mode_for_value (mode_value, label_options); var is_uncertain = false; if (rich_mode === null || !__in__ ('footprint', rich_mode)) { @@ -88,7 +55,7 @@ export var calc_footprint = async function (mode_footprint, distance, year, coor var __left0__ = await emcmft.get_transit_intensities (year, coords, uace, mode_footprint ['transit']); mode_footprint = __left0__ [0]; var transit_metadata = __left0__ [1]; - merge_metadatas (metadata, transit_metadata); + emcmfu.merge_metadatas (metadata, transit_metadata); } var kwh_total = 0; var kg_co2_total = 0; @@ -108,7 +75,7 @@ export var calc_footprint = async function (mode_footprint, distance, year, coor var __left0__ = await emcmfe.get_egrid_intensity (year, coords, egrid_region); var kg_per_mwh = __left0__ [0]; var egrid_metadata = __left0__ [1]; - merge_metadatas (metadata, egrid_metadata); + emcmfu.merge_metadatas (metadata, egrid_metadata); var kg_co2 = (kwh * kg_per_mwh) / 1000; } else if (fuel_type != 'overall') { diff --git a/emcommon_js/emcommon.metrics.footprint.transit.js b/emcommon_js/emcommon.metrics.footprint.transit.js index fafff73..0b54527 100644 --- a/emcommon_js/emcommon.metrics.footprint.transit.js +++ b/emcommon_js/emcommon.metrics.footprint.transit.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as util from './emcommon.metrics.footprint.util.js'; import * as Log from './emcommon.logger.js'; diff --git a/emcommon_js/emcommon.metrics.footprint.util.js b/emcommon_js/emcommon.metrics.footprint.util.js index 5221e69..95215e5 100644 --- a/emcommon_js/emcommon.metrics.footprint.util.js +++ b/emcommon_js/emcommon.metrics.footprint.util.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import {fetch_url, read_json_resource} from './emcommon.util.js'; import * as Log from './emcommon.logger.js'; @@ -141,5 +141,41 @@ export var get_intensities_data = async function (year, dataset) { return null; } }; +export var merge_metadatas = function (meta_a, meta_b) { + for (var key in meta_b) { + var value = meta_b [key]; + if (!__in__ (key, meta_a)) { + meta_a [key] = value; + } + else if (hasattr (meta_a [key], 'concat')) { + meta_a [key] = meta_a [key].concat ((function () { + var __accu0__ = []; + for (var v of value) { + if (!__in__ (v, meta_a [key])) { + __accu0__.append (v); + } + } + return __accu0__; + }) ()); + } + else if (isinstance (value, list)) { + meta_a [key] = meta_a [key] + (function () { + var __accu0__ = []; + for (var v of value) { + if (!__in__ (v, meta_a [key])) { + __accu0__.append (v); + } + } + return __accu0__; + }) (); + } + else if (isinstance (value, bool)) { + meta_a [key] = meta_a [key] || value; + } + else { + meta_a [key] = value; + } + } +}; //# sourceMappingURL=emcommon.metrics.footprint.util.map \ No newline at end of file diff --git a/emcommon_js/emcommon.metrics.metrics_summaries.js b/emcommon_js/emcommon.metrics.metrics_summaries.js index 2ccc11c..9d3fcd0 100644 --- a/emcommon_js/emcommon.metrics.metrics_summaries.js +++ b/emcommon_js/emcommon.metrics.metrics_summaries.js @@ -1,14 +1,14 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as emcdu from './emcommon.diary.util.js'; import * as emcdb from './emcommon.diary.base_modes.js'; -import * as emcfu from './emcommon.metrics.footprint.util.js'; +import * as emcmfu from './emcommon.metrics.footprint.util.js'; import * as emcmff from './emcommon.metrics.footprint.footprint_calculations.js'; import * as emcsc from './emcommon.survey.conditional_surveys.js'; import * as emcble from './emcommon.bluetooth.ble_matching.js'; import * as util from './emcommon.util.js'; import * as Log from './emcommon.logger.js'; -export {emcsc, emcdb, emcble, emcmff, emcfu, emcdu, util, Log}; +export {emcmfu, emcble, util, Log, emcdu, emcdb, emcsc, emcmff}; var __name__ = 'emcommon.metrics.metrics_summaries'; export var app_config = null; export var labels_map = null; @@ -71,7 +71,7 @@ export var value_of_metric_for_trip = async function (metric_name, grouping_fiel } } else if (metric_name == 'footprint') { - var __left0__ = await emcmff.calc_footprint_for_trip (trip, app_config ['label_options'], grouping_val, labels_map); + var __left0__ = await emcmff.calc_footprint_for_trip (trip, app_config ['label_options'], 'mode', grouping_val, labels_map); var footprint = __left0__ [0]; var metadata = __left0__ [1]; footprint.py_update (dict ({'metadata': metadata})); @@ -97,7 +97,7 @@ export var acc_value_of_metric = function (metric_name, acc, new_val) { new_val = dict (new_val); for (var key of new_val.py_keys ()) { if (key == 'metadata') { - emcmff.merge_metadatas (acc ['metadata'], new_val [key]); + emcmfu.merge_metadatas (acc ['metadata'], new_val [key]); } else { acc [key] = acc.py_get (key, 0) + new_val [key]; diff --git a/emcommon_js/emcommon.survey.conditional_surveys.js b/emcommon_js/emcommon.survey.conditional_surveys.js index d9af464..d5a0e50 100644 --- a/emcommon_js/emcommon.survey.conditional_surveys.js +++ b/emcommon_js/emcommon.survey.conditional_surveys.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:20 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as Log from './emcommon.logger.js'; export {Log}; diff --git a/emcommon_js/emcommon.util.js b/emcommon_js/emcommon.util.js index 516d47c..6c5cb0f 100644 --- a/emcommon_js/emcommon.util.js +++ b/emcommon_js/emcommon.util.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; var __name__ = 'emcommon.util'; export var memoize = function (fn) { diff --git a/emcommon_js/index.js b/emcommon_js/index.js index 1a49f61..c96a01b 100644 --- a/emcommon_js/index.js +++ b/emcommon_js/index.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {AssertionError, AttributeError, BaseException, DeprecationWarning, Exception, IndexError, IterableError, KeyError, NotImplementedError, RuntimeWarning, StopIteration, UserWarning, ValueError, Warning, __JsIterator__, __PyIterator__, __Terminal__, __add__, __and__, __call__, __class__, __envir__, __eq__, __floordiv__, __ge__, __get__, __getcm__, __getitem__, __getslice__, __getsm__, __gt__, __i__, __iadd__, __iand__, __idiv__, __ijsmod__, __ilshift__, __imatmul__, __imod__, __imul__, __in__, __init__, __ior__, __ipow__, __irshift__, __isub__, __ixor__, __jsUsePyNext__, __jsmod__, __k__, __kwargtrans__, __le__, __lshift__, __lt__, __matmul__, __mergefields__, __mergekwargtrans__, __mod__, __mul__, __ne__, __neg__, __nest__, __or__, __pow__, __pragma__, __pyUseJsNext__, __rshift__, __setitem__, __setproperty__, __setslice__, __sort__, __specialattrib__, __sub__, __super__, __t__, __terminal__, __truediv__, __withblock__, __xor__, _copy, _sort, abs, all, any, assert, bin, bool, bytearray, bytes, callable, chr, delattr, dict, dir, divmod, enumerate, filter, float, getattr, hasattr, hex, input, int, isinstance, issubclass, len, list, map, max, min, object, oct, ord, pow, print, property, py_TypeError, py_iter, py_metatype, py_next, py_reversed, py_typeof, range, repr, round, set, setattr, sorted, str, sum, tuple, zip} from './org.transcrypt.__runtime__.js'; import * as base_modes from './emcommon.diary.base_modes.js'; import * as footprint_calculations from './emcommon.metrics.footprint.footprint_calculations.js'; @@ -7,7 +7,7 @@ import * as conditional_surveys from './emcommon.survey.conditional_surveys.js'; import * as active_travel_calculations from './emcommon.metrics.active_travel.active_travel_calculations.js'; import * as metrics_summaries from './emcommon.metrics.metrics_summaries.js'; import * as Log from './emcommon.logger.js'; -export {ble_matching, footprint_calculations, active_travel_calculations, conditional_surveys, Log, metrics_summaries, base_modes}; +export {conditional_surveys, metrics_summaries, footprint_calculations, ble_matching, base_modes, Log, active_travel_calculations}; var __name__ = '__main__'; export var dict_to_js_obj = function (py_dict) { var js_obj = {}; diff --git a/emcommon_js/org.transcrypt.__runtime__.js b/emcommon_js/org.transcrypt.__runtime__.js index 3e03554..2a5015d 100644 --- a/emcommon_js/org.transcrypt.__runtime__.js +++ b/emcommon_js/org.transcrypt.__runtime__.js @@ -1,4 +1,4 @@ -// Transcrypt'ed from Python, 2024-09-16 11:51:19 +// Transcrypt'ed from Python, 2024-09-17 17:17:16 import {copy as _copy} from './copy.js'; export {_copy}; var __name__ = 'org.transcrypt.__runtime__';