@glandais/vcyclist-engine 1.1.1 → 1.2.1

package/vcyclist-engine.js

@@ -22,80 +22,82 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.f5;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.t4;
+  var protoOf = kotlin_kotlin.$_$.h5;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.v4;
   var VOID = kotlin_kotlin.$_$.a;
-  var getNumberHashCode = kotlin_kotlin.$_$.o4;
-  var equals = kotlin_kotlin.$_$.m4;
-  var initMetadataForClass = kotlin_kotlin.$_$.s4;
-  var toString = kotlin_kotlin.$_$.h5;
-  var hashCode = kotlin_kotlin.$_$.r4;
-  var getBooleanHashCode = kotlin_kotlin.$_$.n4;
-  var CoroutineImpl = kotlin_kotlin.$_$.m3;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.x2;
-  var Unit_instance = kotlin_kotlin.$_$.g;
-  var initMetadataForCoroutine = kotlin_kotlin.$_$.u4;
-  var initMetadataForObject = kotlin_kotlin.$_$.y4;
-  var getStringHashCode = kotlin_kotlin.$_$.q4;
-  var toString_0 = kotlin_kotlin.$_$.b7;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.i;
+  var getNumberHashCode = kotlin_kotlin.$_$.q4;
+  var equals = kotlin_kotlin.$_$.o4;
+  var initMetadataForClass = kotlin_kotlin.$_$.u4;
+  var toString = kotlin_kotlin.$_$.j5;
+  var hashCode = kotlin_kotlin.$_$.t4;
+  var getBooleanHashCode = kotlin_kotlin.$_$.p4;
+  var CoroutineImpl = kotlin_kotlin.$_$.p3;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.a3;
+  var Unit_instance = kotlin_kotlin.$_$.r;
+  var initMetadataForCoroutine = kotlin_kotlin.$_$.w4;
+  var initMetadataForObject = kotlin_kotlin.$_$.a5;
+  var getStringHashCode = kotlin_kotlin.$_$.s4;
+  var toString_0 = kotlin_kotlin.$_$.n7;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.t;
   var MathConstants_getInstance = kotlin_io_github_glandais_elevation.$_$.d;
-  var isNaN_0 = kotlin_kotlin.$_$.w6;
-  var numberToLong = kotlin_kotlin.$_$.a4;
-  var Long = kotlin_kotlin.$_$.m6;
-  var compare = kotlin_kotlin.$_$.t3;
-  var roundToInt = kotlin_kotlin.$_$.i5;
-  var listOf = kotlin_kotlin.$_$.p2;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.y;
+  var isNaN_0 = kotlin_kotlin.$_$.i7;
+  var numberToLong = kotlin_kotlin.$_$.c4;
+  var Long = kotlin_kotlin.$_$.y6;
+  var compare = kotlin_kotlin.$_$.v3;
+  var roundToInt = kotlin_kotlin.$_$.k5;
+  var listOf = kotlin_kotlin.$_$.q2;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.j1;
   var EventType_START_ELEMENT_getInstance = kotlin_io_github_pdvrieze_xmlutil_core.$_$.a;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.j;
-  var THROW_CCE = kotlin_kotlin.$_$.q6;
-  var isCharSequence = kotlin_kotlin.$_$.z4;
-  var trim = kotlin_kotlin.$_$.g6;
-  var charSequenceLength = kotlin_kotlin.$_$.j4;
-  var isBlank = kotlin_kotlin.$_$.w5;
-  var toDoubleOrNull = kotlin_kotlin.$_$.a6;
-  var numberToInt = kotlin_kotlin.$_$.d5;
-  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.s;
-  var Companion_getInstance = kotlin_kotlin.$_$.e;
-  var IllegalArgumentException = kotlin_kotlin.$_$.l6;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.u;
+  var THROW_CCE = kotlin_kotlin.$_$.c7;
+  var isCharSequence = kotlin_kotlin.$_$.b5;
+  var trim = kotlin_kotlin.$_$.s6;
+  var charSequenceLength = kotlin_kotlin.$_$.k4;
+  var isBlank = kotlin_kotlin.$_$.h6;
+  var toDoubleOrNull = kotlin_kotlin.$_$.p6;
+  var numberToInt = kotlin_kotlin.$_$.f5;
+  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.d1;
+  var Companion_getInstance = kotlin_kotlin.$_$.p;
+  var IllegalArgumentException = kotlin_kotlin.$_$.x6;
   var get_xmlStreaming = kotlin_io_github_pdvrieze_xmlutil_core.$_$.e;
-  var IllegalArgumentException_init_$Create$_0 = kotlin_kotlin.$_$.z;
+  var IllegalArgumentException_init_$Create$_0 = kotlin_kotlin.$_$.k1;
   var XmlException = kotlin_io_github_pdvrieze_xmlutil_core.$_$.c;
-  var firstOrNull = kotlin_kotlin.$_$.l2;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.a1;
-  var toNumber = kotlin_kotlin.$_$.c4;
+  var firstOrNull = kotlin_kotlin.$_$.m2;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.l1;
+  var toNumber = kotlin_kotlin.$_$.e4;
   var XmlDeclMode_None_getInstance = kotlin_io_github_pdvrieze_xmlutil_core.$_$.b;
   var newGenericWriter = kotlin_io_github_pdvrieze_xmlutil_core.$_$.d;
   var LatLon = kotlin_io_github_glandais_elevation.$_$.g;
   var ElevationSmoother_instance = kotlin_io_github_glandais_elevation.$_$.c;
-  var until = kotlin_kotlin.$_$.p5;
+  var until = kotlin_kotlin.$_$.r5;
   var LatLonElevation = kotlin_io_github_glandais_elevation.$_$.f;
   var arrayCopy = kotlin_kotlin.$_$.a2;
   var Distance_instance = kotlin_io_github_glandais_elevation.$_$.a;
   var DouglasPeucker_instance = kotlin_io_github_glandais_elevation.$_$.b;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.c2;
-  var mapCapacity = kotlin_kotlin.$_$.r2;
-  var coerceAtLeast = kotlin_kotlin.$_$.l5;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.m;
-  var enumEntries = kotlin_kotlin.$_$.o3;
-  var Enum = kotlin_kotlin.$_$.i6;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.y6;
-  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.n;
-  var multiply = kotlin_kotlin.$_$.z3;
-  var subtract = kotlin_kotlin.$_$.b4;
-  var equalsLong = kotlin_kotlin.$_$.w3;
-  var add = kotlin_kotlin.$_$.s3;
-  var get_ONE = kotlin_kotlin.$_$.r3;
-  var sorted = kotlin_kotlin.$_$.t2;
-  var Default_getInstance = kotlin_kotlin.$_$.d;
-  var emptyList = kotlin_kotlin.$_$.j2;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.e2;
+  var mapCapacity = kotlin_kotlin.$_$.s2;
+  var coerceAtLeast = kotlin_kotlin.$_$.m5;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.x;
+  var enumEntries = kotlin_kotlin.$_$.r3;
+  var Enum = kotlin_kotlin.$_$.u6;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.k7;
+  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.y;
+  var multiply = kotlin_kotlin.$_$.b4;
+  var subtract = kotlin_kotlin.$_$.d4;
+  var equalsLong = kotlin_kotlin.$_$.y3;
+  var add = kotlin_kotlin.$_$.u3;
+  var get_ONE = kotlin_kotlin.$_$.t3;
+  var sorted = kotlin_kotlin.$_$.v2;
+  var Default_getInstance = kotlin_kotlin.$_$.o;
+  var emptyList = kotlin_kotlin.$_$.k2;
   var GlobalScope_instance = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.a;
   var promise = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.j;
+  var copyToArray = kotlin_kotlin.$_$.j2;
   var CoroutineScope = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.h;
-  var isInterface = kotlin_kotlin.$_$.a5;
+  var isInterface = kotlin_kotlin.$_$.c5;
   var ElevationProvider = kotlin_io_github_glandais_elevation.$_$.e;
-  var initMetadataForLambda = kotlin_kotlin.$_$.x4;
+  var initMetadataForLambda = kotlin_kotlin.$_$.z4;
+  var constructCallableReference = kotlin_kotlin.$_$.m4;
   //endregion
   //region block: pre-declaration
   initMetadataForCompanion(Companion);
@@ -143,6 +145,8 @@
   initMetadataForObject(MuscularPowerProvider, 'MuscularPowerProvider');
   initMetadataForObject(PowerComputer, 'PowerComputer');
   initMetadataForClass(PowerProviderConstant, 'PowerProviderConstant', VOID, CyclistPowerProviderBase);
+  initMetadataForClass(PowerProviderConstantWithTiring, 'PowerProviderConstantWithTiring', VOID, CyclistPowerProviderBase);
+  initMetadataForObject(PowerProviderFromData, 'PowerProviderFromData');
   initMetadataForObject(RhoProviderDefault, 'RhoProviderDefault');
   initMetadataForObject(RhoProviderEstimate, 'RhoProviderEstimate');
   initMetadataForObject(RollingResistancePowerProvider, 'RollingResistancePowerProvider');
@@ -151,11 +155,13 @@
   initMetadataForCompanion(Companion_7);
   initMetadataForClass(Wind, 'Wind');
   initMetadataForObject(WindProviderNone, 'WindProviderNone');
+  initMetadataForClass(WindProviderConstant, 'WindProviderConstant');
   initMetadataForLambda(enhance$slambda, CoroutineImpl, VOID, [1]);
+  initMetadataForLambda(enhanceWithCourse$slambda, CoroutineImpl, VOID, [1]);
   //endregion
   function Companion() {
     Companion_instance = this;
-    this.r1e_1 = new Bike();
+    this.x1o_1 = new Bike();
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -170,21 +176,21 @@
     inertiaRear = inertiaRear === VOID ? 0.07 : inertiaRear;
     wheelRadiusM = wheelRadiusM === VOID ? 0.7 : wheelRadiusM;
     efficiency = efficiency === VOID ? 0.976 : efficiency;
-    this.s1e_1 = crr;
-    this.t1e_1 = inertiaFront;
-    this.u1e_1 = inertiaRear;
-    this.v1e_1 = wheelRadiusM;
-    this.w1e_1 = efficiency;
+    this.y1o_1 = crr;
+    this.z1o_1 = inertiaFront;
+    this.a1p_1 = inertiaRear;
+    this.b1p_1 = wheelRadiusM;
+    this.c1p_1 = efficiency;
   }
   protoOf(Bike).toString = function () {
-    return 'Bike(crr=' + this.s1e_1 + ', inertiaFront=' + this.t1e_1 + ', inertiaRear=' + this.u1e_1 + ', wheelRadiusM=' + this.v1e_1 + ', efficiency=' + this.w1e_1 + ')';
+    return 'Bike(crr=' + this.y1o_1 + ', inertiaFront=' + this.z1o_1 + ', inertiaRear=' + this.a1p_1 + ', wheelRadiusM=' + this.b1p_1 + ', efficiency=' + this.c1p_1 + ')';
   };
   protoOf(Bike).hashCode = function () {
-    var result = getNumberHashCode(this.s1e_1);
-    result = imul(result, 31) + getNumberHashCode(this.t1e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u1e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v1e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w1e_1) | 0;
+    var result = getNumberHashCode(this.y1o_1);
+    result = imul(result, 31) + getNumberHashCode(this.z1o_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.a1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.b1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.c1p_1) | 0;
     return result;
   };
   protoOf(Bike).equals = function (other) {
@@ -192,41 +198,41 @@
       return true;
     if (!(other instanceof Bike))
       return false;
-    if (!equals(this.s1e_1, other.s1e_1))
+    if (!equals(this.y1o_1, other.y1o_1))
       return false;
-    if (!equals(this.t1e_1, other.t1e_1))
+    if (!equals(this.z1o_1, other.z1o_1))
       return false;
-    if (!equals(this.u1e_1, other.u1e_1))
+    if (!equals(this.a1p_1, other.a1p_1))
       return false;
-    if (!equals(this.v1e_1, other.v1e_1))
+    if (!equals(this.b1p_1, other.b1p_1))
       return false;
-    if (!equals(this.w1e_1, other.w1e_1))
+    if (!equals(this.c1p_1, other.c1p_1))
       return false;
     return true;
   };
   function Course(path, cyclist, bike) {
-    cyclist = cyclist === VOID ? Companion_getInstance_2().x1e_1 : cyclist;
-    bike = bike === VOID ? Companion_getInstance_0().r1e_1 : bike;
-    this.y1e_1 = path;
-    this.z1e_1 = cyclist;
-    this.a1f_1 = bike;
+    cyclist = cyclist === VOID ? Companion_getInstance_2().d1p_1 : cyclist;
+    bike = bike === VOID ? Companion_getInstance_0().x1o_1 : bike;
+    this.e1p_1 = path;
+    this.f1p_1 = cyclist;
+    this.g1p_1 = bike;
   }
-  protoOf(Course).b1f = function (path, cyclist, bike) {
+  protoOf(Course).h1p = function (path, cyclist, bike) {
     return new Course(path, cyclist, bike);
   };
-  protoOf(Course).c1f = function (path, cyclist, bike, $super) {
-    path = path === VOID ? this.y1e_1 : path;
-    cyclist = cyclist === VOID ? this.z1e_1 : cyclist;
-    bike = bike === VOID ? this.a1f_1 : bike;
-    return $super === VOID ? this.b1f(path, cyclist, bike) : $super.b1f.call(this, path, cyclist, bike);
+  protoOf(Course).i1p = function (path, cyclist, bike, $super) {
+    path = path === VOID ? this.e1p_1 : path;
+    cyclist = cyclist === VOID ? this.f1p_1 : cyclist;
+    bike = bike === VOID ? this.g1p_1 : bike;
+    return $super === VOID ? this.h1p(path, cyclist, bike) : $super.h1p.call(this, path, cyclist, bike);
   };
   protoOf(Course).toString = function () {
-    return 'Course(path=' + toString(this.y1e_1) + ', cyclist=' + this.z1e_1.toString() + ', bike=' + this.a1f_1.toString() + ')';
+    return 'Course(path=' + toString(this.e1p_1) + ', cyclist=' + this.f1p_1.toString() + ', bike=' + this.g1p_1.toString() + ')';
   };
   protoOf(Course).hashCode = function () {
-    var result = hashCode(this.y1e_1);
-    result = imul(result, 31) + this.z1e_1.hashCode() | 0;
-    result = imul(result, 31) + this.a1f_1.hashCode() | 0;
+    var result = hashCode(this.e1p_1);
+    result = imul(result, 31) + this.f1p_1.hashCode() | 0;
+    result = imul(result, 31) + this.g1p_1.hashCode() | 0;
     return result;
   };
   protoOf(Course).equals = function (other) {
@@ -234,17 +240,17 @@
       return true;
     if (!(other instanceof Course))
       return false;
-    if (!equals(this.y1e_1, other.y1e_1))
+    if (!equals(this.e1p_1, other.e1p_1))
       return false;
-    if (!this.z1e_1.equals(other.z1e_1))
+    if (!this.f1p_1.equals(other.f1p_1))
       return false;
-    if (!this.a1f_1.equals(other.a1f_1))
+    if (!this.g1p_1.equals(other.g1p_1))
       return false;
     return true;
   };
   function Companion_0() {
     Companion_instance_0 = this;
-    this.d1f_1 = new PowerProviderConstant(280.0);
+    this.j1p_1 = new PowerProviderConstant(280.0);
   }
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -257,42 +263,42 @@
     rhoProvider = rhoProvider === VOID ? RhoProviderDefault_instance : rhoProvider;
     aeroProvider = aeroProvider === VOID ? AeroProviderConstant_instance : aeroProvider;
     windProvider = windProvider === VOID ? WindProviderNone_instance : windProvider;
-    cyclistPowerProvider = cyclistPowerProvider === VOID ? Companion_getInstance_1().d1f_1 : cyclistPowerProvider;
-    this.e1f_1 = course;
-    this.f1f_1 = rhoProvider;
-    this.g1f_1 = aeroProvider;
-    this.h1f_1 = windProvider;
-    this.i1f_1 = cyclistPowerProvider;
+    cyclistPowerProvider = cyclistPowerProvider === VOID ? Companion_getInstance_1().j1p_1 : cyclistPowerProvider;
+    this.k1p_1 = course;
+    this.l1p_1 = rhoProvider;
+    this.m1p_1 = aeroProvider;
+    this.n1p_1 = windProvider;
+    this.o1p_1 = cyclistPowerProvider;
   }
-  protoOf(CoursePhysics).j1f = function () {
-    return this.e1f_1.y1e_1;
+  protoOf(CoursePhysics).p1p = function () {
+    return this.k1p_1.e1p_1;
   };
-  protoOf(CoursePhysics).k1f = function () {
-    return this.e1f_1.z1e_1;
+  protoOf(CoursePhysics).q1p = function () {
+    return this.k1p_1.f1p_1;
   };
-  protoOf(CoursePhysics).l1f = function () {
-    return this.e1f_1.a1f_1;
+  protoOf(CoursePhysics).r1p = function () {
+    return this.k1p_1.g1p_1;
   };
-  protoOf(CoursePhysics).m1f = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
+  protoOf(CoursePhysics).s1p = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
     return new CoursePhysics(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
   };
-  protoOf(CoursePhysics).n1f = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider, $super) {
-    course = course === VOID ? this.e1f_1 : course;
-    rhoProvider = rhoProvider === VOID ? this.f1f_1 : rhoProvider;
-    aeroProvider = aeroProvider === VOID ? this.g1f_1 : aeroProvider;
-    windProvider = windProvider === VOID ? this.h1f_1 : windProvider;
-    cyclistPowerProvider = cyclistPowerProvider === VOID ? this.i1f_1 : cyclistPowerProvider;
-    return $super === VOID ? this.m1f(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) : $super.m1f.call(this, course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
+  protoOf(CoursePhysics).t1p = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider, $super) {
+    course = course === VOID ? this.k1p_1 : course;
+    rhoProvider = rhoProvider === VOID ? this.l1p_1 : rhoProvider;
+    aeroProvider = aeroProvider === VOID ? this.m1p_1 : aeroProvider;
+    windProvider = windProvider === VOID ? this.n1p_1 : windProvider;
+    cyclistPowerProvider = cyclistPowerProvider === VOID ? this.o1p_1 : cyclistPowerProvider;
+    return $super === VOID ? this.s1p(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) : $super.s1p.call(this, course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
   };
   protoOf(CoursePhysics).toString = function () {
-    return 'CoursePhysics(course=' + this.e1f_1.toString() + ', rhoProvider=' + toString(this.f1f_1) + ', aeroProvider=' + toString(this.g1f_1) + ', windProvider=' + toString(this.h1f_1) + ', cyclistPowerProvider=' + toString(this.i1f_1) + ')';
+    return 'CoursePhysics(course=' + this.k1p_1.toString() + ', rhoProvider=' + toString(this.l1p_1) + ', aeroProvider=' + toString(this.m1p_1) + ', windProvider=' + toString(this.n1p_1) + ', cyclistPowerProvider=' + toString(this.o1p_1) + ')';
   };
   protoOf(CoursePhysics).hashCode = function () {
-    var result = this.e1f_1.hashCode();
-    result = imul(result, 31) + hashCode(this.f1f_1) | 0;
-    result = imul(result, 31) + hashCode(this.g1f_1) | 0;
-    result = imul(result, 31) + hashCode(this.h1f_1) | 0;
-    result = imul(result, 31) + hashCode(this.i1f_1) | 0;
+    var result = this.k1p_1.hashCode();
+    result = imul(result, 31) + hashCode(this.l1p_1) | 0;
+    result = imul(result, 31) + hashCode(this.m1p_1) | 0;
+    result = imul(result, 31) + hashCode(this.n1p_1) | 0;
+    result = imul(result, 31) + hashCode(this.o1p_1) | 0;
     return result;
   };
   protoOf(CoursePhysics).equals = function (other) {
@@ -300,21 +306,21 @@
       return true;
     if (!(other instanceof CoursePhysics))
       return false;
-    if (!this.e1f_1.equals(other.e1f_1))
+    if (!this.k1p_1.equals(other.k1p_1))
       return false;
-    if (!equals(this.f1f_1, other.f1f_1))
+    if (!equals(this.l1p_1, other.l1p_1))
       return false;
-    if (!equals(this.g1f_1, other.g1f_1))
+    if (!equals(this.m1p_1, other.m1p_1))
       return false;
-    if (!equals(this.h1f_1, other.h1f_1))
+    if (!equals(this.n1p_1, other.n1p_1))
       return false;
-    if (!equals(this.i1f_1, other.i1f_1))
+    if (!equals(this.o1p_1, other.o1p_1))
       return false;
     return true;
   };
   function Companion_1() {
     Companion_instance_1 = this;
-    this.x1e_1 = new Cyclist();
+    this.d1p_1 = new Cyclist();
   }
   var Companion_instance_1;
   function Companion_getInstance_2() {
@@ -330,34 +336,34 @@
     frontalAreaM2 = frontalAreaM2 === VOID ? 0.5 : frontalAreaM2;
     maxLeanAngleDeg = maxLeanAngleDeg === VOID ? 35.0 : maxLeanAngleDeg;
     maxSpeedKmH = maxSpeedKmH === VOID ? 100.0 : maxSpeedKmH;
-    this.o1f_1 = massKg;
-    this.p1f_1 = maxBrakeG;
-    this.q1f_1 = cd;
-    this.r1f_1 = frontalAreaM2;
-    this.s1f_1 = maxLeanAngleDeg;
-    this.t1f_1 = maxSpeedKmH;
-  }
-  protoOf(Cyclist).u1f = function () {
+    this.u1p_1 = massKg;
+    this.v1p_1 = maxBrakeG;
+    this.w1p_1 = cd;
+    this.x1p_1 = frontalAreaM2;
+    this.y1p_1 = maxLeanAngleDeg;
+    this.z1p_1 = maxSpeedKmH;
+  }
+  protoOf(Cyclist).a1q = function () {
     // Inline function 'kotlin.math.tan' call
-    var x = this.s1f_1 * 3.141592653589793 / 180.0;
+    var x = this.y1p_1 * 3.141592653589793 / 180.0;
     return Math.tan(x);
   };
-  protoOf(Cyclist).v1f = function () {
-    return this.p1f_1 * 9.8;
+  protoOf(Cyclist).b1q = function () {
+    return this.v1p_1 * 9.8;
   };
-  protoOf(Cyclist).w1f = function () {
-    return this.t1f_1 / 3.6;
+  protoOf(Cyclist).c1q = function () {
+    return this.z1p_1 / 3.6;
   };
   protoOf(Cyclist).toString = function () {
-    return 'Cyclist(massKg=' + this.o1f_1 + ', maxBrakeG=' + this.p1f_1 + ', cd=' + this.q1f_1 + ', frontalAreaM2=' + this.r1f_1 + ', maxLeanAngleDeg=' + this.s1f_1 + ', maxSpeedKmH=' + this.t1f_1 + ')';
+    return 'Cyclist(massKg=' + this.u1p_1 + ', maxBrakeG=' + this.v1p_1 + ', cd=' + this.w1p_1 + ', frontalAreaM2=' + this.x1p_1 + ', maxLeanAngleDeg=' + this.y1p_1 + ', maxSpeedKmH=' + this.z1p_1 + ')';
   };
   protoOf(Cyclist).hashCode = function () {
-    var result = getNumberHashCode(this.o1f_1);
-    result = imul(result, 31) + getNumberHashCode(this.p1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.q1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.s1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.t1f_1) | 0;
+    var result = getNumberHashCode(this.u1p_1);
+    result = imul(result, 31) + getNumberHashCode(this.v1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.w1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.x1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.y1p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z1p_1) | 0;
     return result;
   };
   protoOf(Cyclist).equals = function (other) {
@@ -365,17 +371,17 @@
       return true;
     if (!(other instanceof Cyclist))
       return false;
-    if (!equals(this.o1f_1, other.o1f_1))
+    if (!equals(this.u1p_1, other.u1p_1))
       return false;
-    if (!equals(this.p1f_1, other.p1f_1))
+    if (!equals(this.v1p_1, other.v1p_1))
       return false;
-    if (!equals(this.q1f_1, other.q1f_1))
+    if (!equals(this.w1p_1, other.w1p_1))
       return false;
-    if (!equals(this.r1f_1, other.r1f_1))
+    if (!equals(this.x1p_1, other.x1p_1))
       return false;
-    if (!equals(this.s1f_1, other.s1f_1))
+    if (!equals(this.y1p_1, other.y1p_1))
       return false;
-    if (!equals(this.t1f_1, other.t1f_1))
+    if (!equals(this.z1p_1, other.z1p_1))
       return false;
     return true;
   };
@@ -383,17 +389,17 @@
     enabled = enabled === VOID ? true : enabled;
     toleranceM = toleranceM === VOID ? 10.0 : toleranceM;
     zExaggeration = zExaggeration === VOID ? 3.0 : zExaggeration;
-    this.x1f_1 = enabled;
-    this.y1f_1 = toleranceM;
-    this.z1f_1 = zExaggeration;
+    this.d1q_1 = enabled;
+    this.e1q_1 = toleranceM;
+    this.f1q_1 = zExaggeration;
   }
   protoOf(SimplifyPathOptions).toString = function () {
-    return 'SimplifyPathOptions(enabled=' + this.x1f_1 + ', toleranceM=' + this.y1f_1 + ', zExaggeration=' + this.z1f_1 + ')';
+    return 'SimplifyPathOptions(enabled=' + this.d1q_1 + ', toleranceM=' + this.e1q_1 + ', zExaggeration=' + this.f1q_1 + ')';
   };
   protoOf(SimplifyPathOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.x1f_1);
-    result = imul(result, 31) + getNumberHashCode(this.y1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z1f_1) | 0;
+    var result = getBooleanHashCode(this.d1q_1);
+    result = imul(result, 31) + getNumberHashCode(this.e1q_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.f1q_1) | 0;
     return result;
   };
   protoOf(SimplifyPathOptions).equals = function (other) {
@@ -401,17 +407,17 @@
       return true;
     if (!(other instanceof SimplifyPathOptions))
       return false;
-    if (!(this.x1f_1 === other.x1f_1))
+    if (!(this.d1q_1 === other.d1q_1))
       return false;
-    if (!equals(this.y1f_1, other.y1f_1))
+    if (!equals(this.e1q_1, other.e1q_1))
       return false;
-    if (!equals(this.z1f_1, other.z1f_1))
+    if (!equals(this.f1q_1, other.f1q_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_2 = this;
-    this.a1g_1 = new EnhanceOptions();
+    this.g1q_1 = new EnhanceOptions();
   }
   var Companion_instance_2;
   function Companion_getInstance_3() {
@@ -426,21 +432,21 @@
     virtualizeTrack = virtualizeTrack === VOID ? true : virtualizeTrack;
     computeOnePointPerSecond = computeOnePointPerSecond === VOID ? true : computeOnePointPerSecond;
     simplifyPath = simplifyPath === VOID ? new SimplifyPathOptions() : simplifyPath;
-    this.b1g_1 = fixElevation;
-    this.c1g_1 = computeMaxSpeeds;
-    this.d1g_1 = virtualizeTrack;
-    this.e1g_1 = computeOnePointPerSecond;
-    this.f1g_1 = simplifyPath;
+    this.h1q_1 = fixElevation;
+    this.i1q_1 = computeMaxSpeeds;
+    this.j1q_1 = virtualizeTrack;
+    this.k1q_1 = computeOnePointPerSecond;
+    this.l1q_1 = simplifyPath;
   }
   protoOf(EnhanceOptions).toString = function () {
-    return 'EnhanceOptions(fixElevation=' + this.b1g_1 + ', computeMaxSpeeds=' + this.c1g_1 + ', virtualizeTrack=' + this.d1g_1 + ', computeOnePointPerSecond=' + this.e1g_1 + ', simplifyPath=' + this.f1g_1.toString() + ')';
+    return 'EnhanceOptions(fixElevation=' + this.h1q_1 + ', computeMaxSpeeds=' + this.i1q_1 + ', virtualizeTrack=' + this.j1q_1 + ', computeOnePointPerSecond=' + this.k1q_1 + ', simplifyPath=' + this.l1q_1.toString() + ')';
   };
   protoOf(EnhanceOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.b1g_1);
-    result = imul(result, 31) + getBooleanHashCode(this.c1g_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.d1g_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.e1g_1) | 0;
-    result = imul(result, 31) + this.f1g_1.hashCode() | 0;
+    var result = getBooleanHashCode(this.h1q_1);
+    result = imul(result, 31) + getBooleanHashCode(this.i1q_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.j1q_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.k1q_1) | 0;
+    result = imul(result, 31) + this.l1q_1.hashCode() | 0;
     return result;
   };
   protoOf(EnhanceOptions).equals = function (other) {
@@ -448,100 +454,100 @@
       return true;
     if (!(other instanceof EnhanceOptions))
       return false;
-    if (!(this.b1g_1 === other.b1g_1))
+    if (!(this.h1q_1 === other.h1q_1))
       return false;
-    if (!(this.c1g_1 === other.c1g_1))
+    if (!(this.i1q_1 === other.i1q_1))
       return false;
-    if (!(this.d1g_1 === other.d1g_1))
+    if (!(this.j1q_1 === other.j1q_1))
       return false;
-    if (!(this.e1g_1 === other.e1g_1))
+    if (!(this.k1q_1 === other.k1q_1))
       return false;
-    if (!this.f1g_1.equals(other.f1g_1))
+    if (!this.l1q_1.equals(other.l1q_1))
       return false;
     return true;
   };
   function $enhanceCourseCOROUTINE$(_this__u8e3s4, course, options, elevationProvider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.o1g_1 = _this__u8e3s4;
-    this.p1g_1 = course;
-    this.q1g_1 = options;
-    this.r1g_1 = elevationProvider;
+    this.u1q_1 = _this__u8e3s4;
+    this.v1q_1 = course;
+    this.w1q_1 = options;
+    this.x1q_1 = elevationProvider;
   }
-  protoOf($enhanceCourseCOROUTINE$).c6 = function () {
-    var suspendResult = this.w5_1;
+  protoOf($enhanceCourseCOROUTINE$).o6 = function () {
+    var suspendResult = this.i6_1;
     $sm: do
       try {
-        var tmp = this.u5_1;
+        var tmp = this.g6_1;
         switch (tmp) {
           case 0:
-            this.v5_1 = 3;
-            this.s1g_1 = this.p1g_1.j1f();
-            this.s1g_1 = PointPerDistance_instance.t1g(this.s1g_1, -1.0, 30.0);
-            if (this.q1g_1.b1g_1 && !(this.r1g_1 == null)) {
-              this.u5_1 = 1;
-              suspendResult = ElevationStep_instance.v1g(this.s1g_1, this.r1g_1, this);
+            this.h6_1 = 3;
+            this.y1q_1 = this.v1q_1.p1p();
+            this.y1q_1 = PointPerDistance_instance.z1q(this.y1q_1, -1.0, 30.0);
+            if (this.w1q_1.h1q_1 && !(this.x1q_1 == null)) {
+              this.g6_1 = 1;
+              suspendResult = ElevationStep_instance.b1r(this.y1q_1, this.x1q_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.u5_1 = 2;
+              this.g6_1 = 2;
               continue $sm;
             }
 
           case 1:
-            this.s1g_1 = suspendResult;
-            this.u5_1 = 2;
+            this.y1q_1 = suspendResult;
+            this.g6_1 = 2;
             continue $sm;
           case 2:
-            this.s1g_1 = PointPerDistance_instance.t1g(this.s1g_1, 1.0, 2.0);
-            this.s1g_1 = ElevationStep_instance.w1g(this.s1g_1);
-            var working = this.p1g_1.n1f(this.p1g_1.e1f_1.c1f(this.s1g_1));
-            if (this.q1g_1.c1g_1 || this.q1g_1.d1g_1) {
-              MaxSpeedComputer_instance.c1h(working.e1f_1);
+            this.y1q_1 = PointPerDistance_instance.z1q(this.y1q_1, 1.0, 2.0);
+            this.y1q_1 = ElevationStep_instance.c1r(this.y1q_1);
+            var working = this.v1q_1.t1p(this.v1q_1.k1p_1.i1p(this.y1q_1));
+            if (this.w1q_1.i1q_1 || this.w1q_1.j1q_1) {
+              MaxSpeedComputer_instance.i1r(working.k1p_1);
             }
 
-            if (this.q1g_1.d1g_1) {
-              this.s1g_1 = VirtualizeService_instance.e1h(working);
-              working = working.n1f(working.e1f_1.c1f(this.s1g_1));
+            if (this.w1q_1.j1q_1) {
+              this.y1q_1 = VirtualizeService_instance.k1r(working);
+              working = working.t1p(working.k1p_1.i1p(this.y1q_1));
             }
 
-            if (this.q1g_1.e1g_1) {
-              this.s1g_1 = PointPerSecond_instance.f1h(this.s1g_1);
+            if (this.w1q_1.k1q_1) {
+              this.y1q_1 = PointPerSecond_instance.l1r(this.y1q_1);
             }
 
-            if (this.q1g_1.f1g_1.x1f_1) {
-              this.s1g_1 = PathSimplifier_instance.g1h(this.s1g_1, this.q1g_1.f1g_1.y1f_1, this.q1g_1.f1g_1.z1f_1);
+            if (this.w1q_1.l1q_1.d1q_1) {
+              this.y1q_1 = PathSimplifier_instance.m1r(this.y1q_1, this.w1q_1.l1q_1.e1q_1, this.w1q_1.l1q_1.f1q_1);
             }
 
-            return this.s1g_1;
+            return this.y1q_1;
           case 3:
-            throw this.x5_1;
+            throw this.j6_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.v5_1 === 3) {
+        if (this.h6_1 === 3) {
           throw e;
         } else {
-          this.u5_1 = this.v5_1;
-          this.x5_1 = e;
+          this.g6_1 = this.h6_1;
+          this.j6_1 = e;
         }
       }
      while (true);
   };
   function Enhancer() {
   }
-  protoOf(Enhancer).h1h = function (path) {
+  protoOf(Enhancer).n1r = function (path) {
     return new CoursePhysics(new Course(path), RhoProviderEstimate_instance, AeroProviderConstant_instance, WindProviderNone_instance, new PowerProviderConstant(280.0));
   };
-  protoOf(Enhancer).i1h = function (path, elevationProvider, options, $completion) {
-    return this.j1h(this.h1h(path), options, elevationProvider, $completion);
+  protoOf(Enhancer).o1r = function (path, elevationProvider, options, $completion) {
+    return this.p1r(this.n1r(path), options, elevationProvider, $completion);
   };
-  protoOf(Enhancer).j1h = function (course, options, elevationProvider, $completion) {
+  protoOf(Enhancer).p1r = function (course, options, elevationProvider, $completion) {
     var tmp = new $enhanceCourseCOROUTINE$(this, course, options, elevationProvider, $completion);
-    tmp.w5_1 = Unit_instance;
-    tmp.x5_1 = null;
-    return tmp.c6();
+    tmp.i6_1 = Unit_instance;
+    tmp.j6_1 = null;
+    return tmp.o6();
   };
   var Enhancer_instance;
   function Enhancer_getInstance() {
@@ -549,15 +555,15 @@
   }
   function GpxDocument(name, tracks) {
     name = name === VOID ? 'noname' : name;
-    this.k1h_1 = name;
-    this.l1h_1 = tracks;
+    this.q1r_1 = name;
+    this.r1r_1 = tracks;
   }
   protoOf(GpxDocument).toString = function () {
-    return 'GpxDocument(name=' + this.k1h_1 + ', tracks=' + toString(this.l1h_1) + ')';
+    return 'GpxDocument(name=' + this.q1r_1 + ', tracks=' + toString(this.r1r_1) + ')';
   };
   protoOf(GpxDocument).hashCode = function () {
-    var result = getStringHashCode(this.k1h_1);
-    result = imul(result, 31) + hashCode(this.l1h_1) | 0;
+    var result = getStringHashCode(this.q1r_1);
+    result = imul(result, 31) + hashCode(this.r1r_1) | 0;
     return result;
   };
   protoOf(GpxDocument).equals = function (other) {
@@ -565,26 +571,26 @@
       return true;
     if (!(other instanceof GpxDocument))
       return false;
-    if (!(this.k1h_1 === other.k1h_1))
+    if (!(this.q1r_1 === other.q1r_1))
       return false;
-    if (!equals(this.l1h_1, other.l1h_1))
+    if (!equals(this.r1r_1, other.r1r_1))
       return false;
     return true;
   };
   function GpxTrack(name, type, points) {
     name = name === VOID ? null : name;
     type = type === VOID ? null : type;
-    this.m1h_1 = name;
-    this.n1h_1 = type;
-    this.o1h_1 = points;
+    this.s1r_1 = name;
+    this.t1r_1 = type;
+    this.u1r_1 = points;
   }
   protoOf(GpxTrack).toString = function () {
-    return 'GpxTrack(name=' + this.m1h_1 + ', type=' + this.n1h_1 + ', points=' + toString(this.o1h_1) + ')';
+    return 'GpxTrack(name=' + this.s1r_1 + ', type=' + this.t1r_1 + ', points=' + toString(this.u1r_1) + ')';
   };
   protoOf(GpxTrack).hashCode = function () {
-    var result = this.m1h_1 == null ? 0 : getStringHashCode(this.m1h_1);
-    result = imul(result, 31) + (this.n1h_1 == null ? 0 : getStringHashCode(this.n1h_1)) | 0;
-    result = imul(result, 31) + hashCode(this.o1h_1) | 0;
+    var result = this.s1r_1 == null ? 0 : getStringHashCode(this.s1r_1);
+    result = imul(result, 31) + (this.t1r_1 == null ? 0 : getStringHashCode(this.t1r_1)) | 0;
+    result = imul(result, 31) + hashCode(this.u1r_1) | 0;
     return result;
   };
   protoOf(GpxTrack).equals = function (other) {
@@ -592,11 +598,11 @@
       return true;
     if (!(other instanceof GpxTrack))
       return false;
-    if (!(this.m1h_1 == other.m1h_1))
+    if (!(this.s1r_1 == other.s1r_1))
       return false;
-    if (!(this.n1h_1 == other.n1h_1))
+    if (!(this.t1r_1 == other.t1r_1))
       return false;
-    if (!equals(this.o1h_1, other.o1h_1))
+    if (!equals(this.u1r_1, other.u1r_1))
       return false;
     return true;
   };
@@ -607,27 +613,27 @@
     cadence = cadence === VOID ? null : cadence;
     temperatureC = temperatureC === VOID ? null : temperatureC;
     powerW = powerW === VOID ? null : powerW;
-    this.p1h_1 = latitudeDeg;
-    this.q1h_1 = longitudeDeg;
-    this.r1h_1 = elevationM;
-    this.s1h_1 = timeEpochMs;
-    this.t1h_1 = heartRate;
-    this.u1h_1 = cadence;
-    this.v1h_1 = temperatureC;
-    this.w1h_1 = powerW;
+    this.v1r_1 = latitudeDeg;
+    this.w1r_1 = longitudeDeg;
+    this.x1r_1 = elevationM;
+    this.y1r_1 = timeEpochMs;
+    this.z1r_1 = heartRate;
+    this.a1s_1 = cadence;
+    this.b1s_1 = temperatureC;
+    this.c1s_1 = powerW;
   }
   protoOf(GpxTrackPoint).toString = function () {
-    return 'GpxTrackPoint(latitudeDeg=' + this.p1h_1 + ', longitudeDeg=' + this.q1h_1 + ', elevationM=' + this.r1h_1 + ', timeEpochMs=' + toString_0(this.s1h_1) + ', heartRate=' + this.t1h_1 + ', cadence=' + this.u1h_1 + ', temperatureC=' + this.v1h_1 + ', powerW=' + this.w1h_1 + ')';
+    return 'GpxTrackPoint(latitudeDeg=' + this.v1r_1 + ', longitudeDeg=' + this.w1r_1 + ', elevationM=' + this.x1r_1 + ', timeEpochMs=' + toString_0(this.y1r_1) + ', heartRate=' + this.z1r_1 + ', cadence=' + this.a1s_1 + ', temperatureC=' + this.b1s_1 + ', powerW=' + this.c1s_1 + ')';
   };
   protoOf(GpxTrackPoint).hashCode = function () {
-    var result = getNumberHashCode(this.p1h_1);
-    result = imul(result, 31) + getNumberHashCode(this.q1h_1) | 0;
-    result = imul(result, 31) + (this.r1h_1 == null ? 0 : getNumberHashCode(this.r1h_1)) | 0;
-    result = imul(result, 31) + (this.s1h_1 == null ? 0 : this.s1h_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.t1h_1 == null ? 0 : this.t1h_1) | 0;
-    result = imul(result, 31) + (this.u1h_1 == null ? 0 : this.u1h_1) | 0;
-    result = imul(result, 31) + (this.v1h_1 == null ? 0 : getNumberHashCode(this.v1h_1)) | 0;
-    result = imul(result, 31) + (this.w1h_1 == null ? 0 : getNumberHashCode(this.w1h_1)) | 0;
+    var result = getNumberHashCode(this.v1r_1);
+    result = imul(result, 31) + getNumberHashCode(this.w1r_1) | 0;
+    result = imul(result, 31) + (this.x1r_1 == null ? 0 : getNumberHashCode(this.x1r_1)) | 0;
+    result = imul(result, 31) + (this.y1r_1 == null ? 0 : this.y1r_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.z1r_1 == null ? 0 : this.z1r_1) | 0;
+    result = imul(result, 31) + (this.a1s_1 == null ? 0 : this.a1s_1) | 0;
+    result = imul(result, 31) + (this.b1s_1 == null ? 0 : getNumberHashCode(this.b1s_1)) | 0;
+    result = imul(result, 31) + (this.c1s_1 == null ? 0 : getNumberHashCode(this.c1s_1)) | 0;
     return result;
   };
   protoOf(GpxTrackPoint).equals = function (other) {
@@ -635,21 +641,21 @@
       return true;
     if (!(other instanceof GpxTrackPoint))
       return false;
-    if (!equals(this.p1h_1, other.p1h_1))
+    if (!equals(this.v1r_1, other.v1r_1))
       return false;
-    if (!equals(this.q1h_1, other.q1h_1))
+    if (!equals(this.w1r_1, other.w1r_1))
       return false;
-    if (!equals(this.r1h_1, other.r1h_1))
+    if (!equals(this.x1r_1, other.x1r_1))
       return false;
-    if (!equals(this.s1h_1, other.s1h_1))
+    if (!equals(this.y1r_1, other.y1r_1))
       return false;
-    if (!(this.t1h_1 == other.t1h_1))
+    if (!(this.z1r_1 == other.z1r_1))
       return false;
-    if (!(this.u1h_1 == other.u1h_1))
+    if (!(this.a1s_1 == other.a1s_1))
       return false;
-    if (!equals(this.v1h_1, other.v1h_1))
+    if (!equals(this.b1s_1, other.b1s_1))
       return false;
-    if (!equals(this.w1h_1, other.w1h_1))
+    if (!equals(this.c1s_1, other.c1s_1))
       return false;
     return true;
   };
@@ -658,7 +664,7 @@
     type = type === VOID ? 'cycling' : type;
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = _this__u8e3s4.x1h_1;
+    var size = _this__u8e3s4.d1s_1;
     var list = ArrayList_init_$Create$(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -666,10 +672,10 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp = _this__u8e3s4.z1h(index) * MathConstants_getInstance().bv_1;
-        var tmp_0 = _this__u8e3s4.a1i(index) * MathConstants_getInstance().bv_1;
+        var tmp = _this__u8e3s4.f1s(index) * MathConstants_getInstance().yv_1;
+        var tmp_0 = _this__u8e3s4.g1s(index) * MathConstants_getInstance().yv_1;
         // Inline function 'kotlin.takeUnless' call
-        var this_0 = _this__u8e3s4.b1i(index);
+        var this_0 = _this__u8e3s4.h1s(index);
         var tmp_1;
         if (!isNaN_0(this_0)) {
           tmp_1 = this_0;
@@ -678,7 +684,7 @@
         }
         var tmp_2 = tmp_1;
         // Inline function 'kotlin.takeIf' call
-        var this_1 = numberToLong(_this__u8e3s4.c1i(index));
+        var this_1 = numberToLong(_this__u8e3s4.i1s(index));
         var tmp_3;
         if (compare(this_1, new Long(0, 0)) > 0) {
           tmp_3 = this_1;
@@ -687,7 +693,7 @@
         }
         var tmp_4 = tmp_3;
         // Inline function 'kotlin.takeUnless' call
-        var this_2 = _this__u8e3s4.d1i(index);
+        var this_2 = _this__u8e3s4.j1s(index);
         var tmp_5;
         if (!(isNaN_0(this_2) || this_2 === 0.0)) {
           tmp_5 = this_2;
@@ -697,7 +703,7 @@
         var tmp0_safe_receiver = tmp_5;
         var tmp_6 = tmp0_safe_receiver == null ? null : roundToInt(tmp0_safe_receiver);
         // Inline function 'kotlin.takeUnless' call
-        var this_3 = _this__u8e3s4.e1i(index);
+        var this_3 = _this__u8e3s4.k1s(index);
         var tmp_7;
         if (!(isNaN_0(this_3) || this_3 === 0.0)) {
           tmp_7 = this_3;
@@ -707,7 +713,7 @@
         var tmp1_safe_receiver = tmp_7;
         var tmp_8 = tmp1_safe_receiver == null ? null : roundToInt(tmp1_safe_receiver);
         // Inline function 'kotlin.takeUnless' call
-        var this_4 = _this__u8e3s4.f1i(index);
+        var this_4 = _this__u8e3s4.l1s(index);
         var tmp_9;
         if (!(isNaN_0(this_4) || this_4 === 0.0)) {
           tmp_9 = this_4;
@@ -716,7 +722,7 @@
         }
         var tmp_10 = tmp_9;
         // Inline function 'kotlin.takeUnless' call
-        var this_5 = _this__u8e3s4.g1i(index);
+        var this_5 = _this__u8e3s4.m1s(index);
         var tmp_11;
         if (!(isNaN_0(this_5) || this_5 === 0.0)) {
           tmp_11 = this_5;
@@ -725,7 +731,7 @@
         }
         var tmp$ret$15 = tmp_11;
         var tmp$ret$4 = new GpxTrackPoint(tmp, tmp_0, tmp_2, tmp_4, tmp_6, tmp_8, tmp_10, tmp$ret$15);
-        list.h(tmp$ret$4);
+        list.n(tmp$ret$4);
       }
        while (inductionVariable < size);
     var points = list;
@@ -737,11 +743,11 @@
     return new GpxDocument(name, listOf(toGpxTrack(_this__u8e3s4, trackName)));
   }
   function parseDocument($this, reader) {
-    while (reader.j()) {
-      var ev = reader.k();
+    while (reader.i()) {
+      var ev = reader.j();
       if (ev.equals(EventType_START_ELEMENT_getInstance())) {
-        if (!(reader.o15() === 'gpx')) {
-          throw IllegalArgumentException_init_$Create$('Invalid GPX file: missing gpx root element (found ' + reader.o15() + ')');
+        if (!(reader.u16() === 'gpx')) {
+          throw IllegalArgumentException_init_$Create$('Invalid GPX file: missing gpx root element (found ' + reader.u16() + ')');
         }
         return parseGpxRoot($this, reader);
       }
@@ -752,18 +758,18 @@
     var name = 'noname';
     // Inline function 'kotlin.collections.mutableListOf' call
     var tracks = ArrayList_init_$Create$_0();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          switch (reader.o15()) {
+          switch (reader.u16()) {
             case 'metadata':
               var metaName = parseMetadataName($this, reader);
               if (!(metaName == null))
                 name = metaName;
               break;
             case 'trk':
-              tracks.h(parseTrack($this, reader));
+              tracks.n(parseTrack($this, reader));
               break;
             default:
               skipElement($this, reader);
@@ -781,11 +787,11 @@
   }
   function parseMetadataName($this, reader) {
     var name = null;
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          if (reader.o15() === 'name' && name == null) {
+          if (reader.u16() === 'name' && name == null) {
             // Inline function 'kotlin.text.trim' call
             var this_0 = readElementText($this, reader);
             // Inline function 'kotlin.text.ifEmpty' call
@@ -816,11 +822,11 @@
     var type = null;
     // Inline function 'kotlin.collections.mutableListOf' call
     var points = ArrayList_init_$Create$_0();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          switch (reader.o15()) {
+          switch (reader.u16()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -875,12 +881,12 @@
     return new GpxTrack(name, type, points);
   }
   function parseTrackSegment($this, reader, accum) {
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          if (reader.o15() === 'trkpt') {
-            accum.h(parseTrackPoint($this, reader));
+          if (reader.u16() === 'trkpt') {
+            accum.n(parseTrackPoint($this, reader));
           } else {
             skipElement($this, reader);
           }
@@ -894,8 +900,8 @@
     }
   }
   function parseTrackPoint($this, reader) {
-    var latStr = reader.z15(null, 'lat');
-    var lonStr = reader.z15(null, 'lon');
+    var latStr = reader.f17(null, 'lat');
+    var lonStr = reader.f17(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -926,11 +932,11 @@
     var elevation = null;
     var timeMs = null;
     var ext = new ExtensionsAccumulator();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          switch (reader.o15()) {
+          switch (reader.u16()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -964,19 +970,19 @@
 
           break;
         case 2:
-          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.h1i_1, ext.i1i_1, ext.j1i_1, ext.k1i_1);
+          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.n1s_1, ext.o1s_1, ext.p1s_1, ext.q1s_1);
         default:
           break;
       }
     }
-    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.h1i_1, ext.i1i_1, ext.j1i_1, ext.k1i_1);
+    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.n1s_1, ext.o1s_1, ext.p1s_1, ext.q1s_1);
   }
   function parseExtensions($this, reader, ext) {
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 1:
-          var ln = reader.o15();
+          var ln = reader.u16();
           // Inline function 'kotlin.text.lowercase' call
 
           // Inline function 'kotlin.js.asDynamic' call
@@ -989,8 +995,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp = ext;
-                var tmp0_elvis_lhs = ext.k1i_1;
-                tmp.k1i_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
+                var tmp0_elvis_lhs = ext.q1s_1;
+                tmp.q1s_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
               }
 
               break;
@@ -1001,8 +1007,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.h1i_1 == null)
-                  ext.h1i_1 = numberToInt(tmp3_safe_receiver);
+                if (ext.n1s_1 == null)
+                  ext.n1s_1 = numberToInt(tmp3_safe_receiver);
               }
 
               break;
@@ -1013,8 +1019,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.i1i_1 == null)
-                  ext.i1i_1 = numberToInt(tmp4_safe_receiver);
+                if (ext.o1s_1 == null)
+                  ext.o1s_1 = numberToInt(tmp4_safe_receiver);
               }
 
               break;
@@ -1027,8 +1033,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_0 = ext;
-                var tmp0_elvis_lhs_0 = ext.j1i_1;
-                tmp_0.j1i_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
+                var tmp0_elvis_lhs_0 = ext.p1s_1;
+                tmp_0.p1s_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
               }
 
               break;
@@ -1047,13 +1053,13 @@
   }
   function readElementText($this, reader) {
     var sb = StringBuilder_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.l1_1) {
+    while (reader.i()) {
+      var ev = reader.j();
+      switch (ev.n1_1) {
         case 4:
         case 5:
         case 9:
-          sb.j5(reader.s15());
+          sb.u5(reader.z16());
           break;
         case 1:
           skipElement($this, reader);
@@ -1074,8 +1080,8 @@
   }
   function skipElement($this, reader) {
     var depth = 1;
-    while (reader.j() && depth > 0) {
-      switch (reader.k().l1_1) {
+    while (reader.i() && depth > 0) {
+      switch (reader.j().n1_1) {
         case 1:
           depth = depth + 1 | 0;
           break;
@@ -1090,7 +1096,7 @@
   function parseTimeIsoToMs($this, text) {
     var tmp;
     try {
-      tmp = Companion_getInstance().lb(text).pb();
+      tmp = Companion_getInstance().wc(text).ad();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof IllegalArgumentException) {
@@ -1113,22 +1119,22 @@
     cadence = cadence === VOID ? null : cadence;
     temperatureC = temperatureC === VOID ? null : temperatureC;
     powerW = powerW === VOID ? null : powerW;
-    this.h1i_1 = heartRate;
-    this.i1i_1 = cadence;
-    this.j1i_1 = temperatureC;
-    this.k1i_1 = powerW;
+    this.n1s_1 = heartRate;
+    this.o1s_1 = cadence;
+    this.p1s_1 = temperatureC;
+    this.q1s_1 = powerW;
   }
   function GpxParser() {
   }
-  protoOf(GpxParser).l1i = function (xml) {
+  protoOf(GpxParser).r1s = function (xml) {
     var tmp;
     try {
-      tmp = get_xmlStreaming().t16(xml);
+      tmp = get_xmlStreaming().z17(xml);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof XmlException) {
         var e = $p;
-        throw IllegalArgumentException_init_$Create$_0('Invalid GPX XML: ' + e.message, e);
+        throw IllegalArgumentException_init_$Create$_0('Invalid GPX XML: ' + e.e(), e);
       } else {
         throw $p;
       }
@@ -1137,17 +1143,17 @@
     var tmp_1;
     try {
       tmp_1 = parseDocument(this, reader);
-    } catch ($p) {
+    } catch ($p_0) {
       var tmp_2;
-      if ($p instanceof XmlException) {
-        var e_0 = $p;
-        throw IllegalArgumentException_init_$Create$_0('Invalid GPX XML: ' + e_0.message, e_0);
+      if ($p_0 instanceof XmlException) {
+        var e_0 = $p_0;
+        throw IllegalArgumentException_init_$Create$_0('Invalid GPX XML: ' + e_0.e(), e_0);
       } else {
-        throw $p;
+        throw $p_0;
       }
     }
     finally {
-      reader.b16();
+      reader.h17();
     }
     return tmp_1;
   };
@@ -1156,7 +1162,7 @@
     return GpxParser_instance;
   }
   function firstTrackAsPath(_this__u8e3s4) {
-    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.l1h_1);
+    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.r1r_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -1169,182 +1175,182 @@
     return toPath(track);
   }
   function toPath(_this__u8e3s4) {
-    var n = _this__u8e3s4.o1h_1.l();
+    var n = _this__u8e3s4.u1r_1.k();
     var path = new Path(n);
-    var iterator = _this__u8e3s4.o1h_1.i();
+    var iterator = _this__u8e3s4.u1r_1.h();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.i()) {
       var i = index;
       index = index + 1 | 0;
-      var p = iterator.k();
-      path.m1i(i, p.p1h_1 * MathConstants_getInstance().av_1);
-      path.n1i(i, p.q1h_1 * MathConstants_getInstance().av_1);
-      var tmp0_elvis_lhs = p.r1h_1;
-      path.o1i(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
-      var tmp1_elvis_lhs = p.s1h_1;
-      path.p1i(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
-      var tmp2_safe_receiver = p.w1h_1;
+      var p = iterator.j();
+      path.s1s(i, p.v1r_1 * MathConstants_getInstance().xv_1);
+      path.t1s(i, p.w1r_1 * MathConstants_getInstance().xv_1);
+      var tmp0_elvis_lhs = p.x1r_1;
+      path.u1s(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
+      var tmp1_elvis_lhs = p.y1r_1;
+      path.v1s(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
+      var tmp2_safe_receiver = p.c1s_1;
       if (tmp2_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        path.q1i(i, tmp2_safe_receiver);
+        path.w1s(i, tmp2_safe_receiver);
       }
-      var tmp3_safe_receiver = p.t1h_1;
+      var tmp3_safe_receiver = p.z1r_1;
       if (tmp3_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        path.r1i(i, tmp3_safe_receiver);
+        path.x1s(i, tmp3_safe_receiver);
       }
-      var tmp4_safe_receiver = p.u1h_1;
+      var tmp4_safe_receiver = p.a1s_1;
       if (tmp4_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        path.s1i(i, tmp4_safe_receiver);
+        path.y1s(i, tmp4_safe_receiver);
       }
-      var tmp5_safe_receiver = p.v1h_1;
+      var tmp5_safe_receiver = p.b1s_1;
       if (tmp5_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        path.t1i(i, tmp5_safe_receiver);
+        path.z1s(i, tmp5_safe_receiver);
       }
     }
-    path.d1j();
+    path.j1t();
     return path;
   }
   function writeDocument($this, w, document) {
-    w.c17('', 'http://www.topografix.com/GPX/1/1');
-    w.c17('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-    w.c17('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
-    w.e17('http://www.topografix.com/GPX/1/1', 'gpx', '');
-    w.g17(null, 'version', null, '1.1');
-    w.g17(null, 'creator', null, '@glandais/vcyclist');
-    w.d17('', 'http://www.topografix.com/GPX/1/1');
-    w.d17('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-    w.d17('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
-    w.g17('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation', 'xsi', 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd');
-    writeMetadata($this, w, document.k1h_1);
-    var _iterator__ex2g4s = document.l1h_1.i();
-    while (_iterator__ex2g4s.j()) {
-      var track = _iterator__ex2g4s.k();
+    w.z18('', 'http://www.topografix.com/GPX/1/1');
+    w.z18('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.z18('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+    w.b19('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.d19(null, 'version', null, '1.1');
+    w.d19(null, 'creator', null, '@glandais/vcyclist');
+    w.a19('', 'http://www.topografix.com/GPX/1/1');
+    w.a19('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.a19('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+    w.d19('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation', 'xsi', 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd');
+    writeMetadata($this, w, document.q1r_1);
+    var _iterator__ex2g4s = document.r1r_1.h();
+    while (_iterator__ex2g4s.i()) {
+      var track = _iterator__ex2g4s.j();
       writeTrack($this, w, track);
     }
-    w.j17('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.g19('http://www.topografix.com/GPX/1/1', 'gpx', '');
   }
   function writeMetadata($this, w, name) {
-    w.e17('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.b19('http://www.topografix.com/GPX/1/1', 'metadata', '');
     writeSimpleText($this, w, 'name', name);
-    w.j17('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.g19('http://www.topografix.com/GPX/1/1', 'metadata', '');
   }
   function writeTrack($this, w, track) {
-    w.e17('http://www.topografix.com/GPX/1/1', 'trk', '');
-    var tmp0_safe_receiver = track.m1h_1;
+    w.b19('http://www.topografix.com/GPX/1/1', 'trk', '');
+    var tmp0_safe_receiver = track.s1r_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'name', tmp0_safe_receiver);
     }
-    var tmp1_safe_receiver = track.n1h_1;
+    var tmp1_safe_receiver = track.t1r_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp1_safe_receiver);
     }
-    w.e17('http://www.topografix.com/GPX/1/1', 'trkseg', '');
-    var _iterator__ex2g4s = track.o1h_1.i();
-    while (_iterator__ex2g4s.j()) {
-      var p = _iterator__ex2g4s.k();
+    w.b19('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+    var _iterator__ex2g4s = track.u1r_1.h();
+    while (_iterator__ex2g4s.i()) {
+      var p = _iterator__ex2g4s.j();
       writeTrackPoint($this, w, p);
     }
-    w.j17('http://www.topografix.com/GPX/1/1', 'trkseg', '');
-    w.j17('http://www.topografix.com/GPX/1/1', 'trk', '');
+    w.g19('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+    w.g19('http://www.topografix.com/GPX/1/1', 'trk', '');
   }
   function writeTrackPoint($this, w, p) {
-    w.e17('http://www.topografix.com/GPX/1/1', 'trkpt', '');
-    w.g17(null, 'lat', null, p.p1h_1.toString());
-    w.g17(null, 'lon', null, p.q1h_1.toString());
-    var tmp0_safe_receiver = p.s1h_1;
+    w.b19('http://www.topografix.com/GPX/1/1', 'trkpt', '');
+    w.d19(null, 'lat', null, p.v1r_1.toString());
+    w.d19(null, 'lon', null, p.w1r_1.toString());
+    var tmp0_safe_receiver = p.y1r_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().ib(tmp0_safe_receiver).toString());
+      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().tc(tmp0_safe_receiver).toString());
     }
-    var tmp1_safe_receiver = p.r1h_1;
+    var tmp1_safe_receiver = p.x1r_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'ele', tmp1_safe_receiver.toString());
     }
-    var hasGarminExt = !(p.t1h_1 == null) || !(p.u1h_1 == null) || !(p.v1h_1 == null);
-    var hasPower = !(p.w1h_1 == null);
+    var hasGarminExt = !(p.z1r_1 == null) || !(p.a1s_1 == null) || !(p.b1s_1 == null);
+    var hasPower = !(p.c1s_1 == null);
     if (hasGarminExt || hasPower) {
-      w.e17('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.b19('http://www.topografix.com/GPX/1/1', 'extensions', '');
       if (hasPower) {
-        writeSimpleText($this, w, 'power', p.w1h_1.toString());
+        writeSimpleText($this, w, 'power', p.c1s_1.toString());
       }
       if (hasGarminExt) {
-        w.e17('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
-        var tmp2_safe_receiver = p.t1h_1;
+        w.b19('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        var tmp2_safe_receiver = p.z1r_1;
         if (tmp2_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'hr', 'gpxtpx', tmp2_safe_receiver.toString());
         }
-        var tmp3_safe_receiver = p.u1h_1;
+        var tmp3_safe_receiver = p.a1s_1;
         if (tmp3_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'cad', 'gpxtpx', tmp3_safe_receiver.toString());
         }
-        var tmp4_safe_receiver = p.v1h_1;
+        var tmp4_safe_receiver = p.b1s_1;
         if (tmp4_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'atemp', 'gpxtpx', tmp4_safe_receiver.toString());
         }
-        w.j17('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        w.g19('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
       }
-      w.j17('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.g19('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    w.j17('http://www.topografix.com/GPX/1/1', 'trkpt', '');
+    w.g19('http://www.topografix.com/GPX/1/1', 'trkpt', '');
   }
   function writeSimpleText($this, w, localName, text) {
-    w.e17('http://www.topografix.com/GPX/1/1', localName, '');
-    w.f17(text);
-    w.j17('http://www.topografix.com/GPX/1/1', localName, '');
+    w.b19('http://www.topografix.com/GPX/1/1', localName, '');
+    w.c19(text);
+    w.g19('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeNamespaced($this, w, namespace, localName, prefix, text) {
-    w.e17(namespace, localName, prefix);
-    w.f17(text);
-    w.j17(namespace, localName, prefix);
+    w.b19(namespace, localName, prefix);
+    w.c19(text);
+    w.g19(namespace, localName, prefix);
   }
   function GpxWriter() {
-    this.e1j_1 = 'http://www.topografix.com/GPX/1/1';
-    this.f1j_1 = 'http://www.w3.org/2001/XMLSchema-instance';
-    this.g1j_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
-    this.h1j_1 = 'xsi';
-    this.i1j_1 = 'gpxtpx';
-    this.j1j_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
-    this.k1j_1 = '@glandais/vcyclist';
-  }
-  protoOf(GpxWriter).l1j = function (document) {
+    this.k1t_1 = 'http://www.topografix.com/GPX/1/1';
+    this.l1t_1 = 'http://www.w3.org/2001/XMLSchema-instance';
+    this.m1t_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
+    this.n1t_1 = 'xsi';
+    this.o1t_1 = 'gpxtpx';
+    this.p1t_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
+    this.q1t_1 = '@glandais/vcyclist';
+  }
+  protoOf(GpxWriter).r1t = function (document) {
     var out = StringBuilder_init_$Create$();
-    out.j5('<?xml version="1.0" encoding="UTF-8"?>\n');
+    out.u5('<?xml version="1.0" encoding="UTF-8"?>\n');
     var writer = newGenericWriter(get_xmlStreaming(), out, false, XmlDeclMode_None_getInstance());
     try {
       writeDocument(this, writer, document);
     }finally {
-      writer.b16();
+      writer.h17();
     }
     return out.toString();
   };
@@ -1353,17 +1359,17 @@
     return GpxWriter_instance;
   }
   function copyAllSlots($this, source) {
-    var out = new Path(source.x1h_1);
+    var out = new Path(source.d1s_1);
     var inductionVariable = 0;
-    var last = source.x1h_1;
+    var last = source.d1s_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var _iterator__ex2g4s = get_entries().i();
-        while (_iterator__ex2g4s.j()) {
-          var field = _iterator__ex2g4s.k();
-          out.n1j(i, field, source.m1j(i, field));
+        var _iterator__ex2g4s = get_entries().h();
+        while (_iterator__ex2g4s.i()) {
+          var field = _iterator__ex2g4s.j();
+          out.t1t(i, field, source.s1t(i, field));
         }
       }
        while (inductionVariable < last);
@@ -1371,33 +1377,33 @@
   }
   function $fixElevationCOROUTINE$(_this__u8e3s4, source, provider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.w1j_1 = _this__u8e3s4;
-    this.x1j_1 = source;
-    this.y1j_1 = provider;
+    this.c1u_1 = _this__u8e3s4;
+    this.d1u_1 = source;
+    this.e1u_1 = provider;
   }
-  protoOf($fixElevationCOROUTINE$).c6 = function () {
-    var suspendResult = this.w5_1;
+  protoOf($fixElevationCOROUTINE$).o6 = function () {
+    var suspendResult = this.i6_1;
     $sm: do
       try {
-        var tmp = this.u5_1;
+        var tmp = this.g6_1;
         switch (tmp) {
           case 0:
-            this.v5_1 = 2;
-            if (this.x1j_1.x1h_1 === 0)
+            this.h6_1 = 2;
+            if (this.d1u_1.d1s_1 === 0)
               return new Path(0);
-            var size = this.x1j_1.x1h_1;
+            var size = this.d1u_1.d1s_1;
             var list = ArrayList_init_$Create$(size);
             var inductionVariable = 0;
             if (inductionVariable < size)
               do {
                 var index = inductionVariable;
                 inductionVariable = inductionVariable + 1 | 0;
-                list.h(new LatLon(this.x1j_1.z1h(index) * MathConstants_getInstance().bv_1, this.x1j_1.a1i(index) * MathConstants_getInstance().bv_1));
+                list.n(new LatLon(this.d1u_1.f1s(index) * MathConstants_getInstance().yv_1, this.d1u_1.g1s(index) * MathConstants_getInstance().yv_1));
               }
                while (inductionVariable < size);
             var coords = list;
-            this.u5_1 = 1;
-            suspendResult = this.y1j_1.xy(coords, VOID, this);
+            this.g6_1 = 1;
+            suspendResult = this.e1u_1.xz(coords, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -1405,47 +1411,47 @@
             continue $sm;
           case 1:
             var corrected = suspendResult;
-            var out = copyAllSlots(this.w1j_1, this.x1j_1);
+            var out = copyAllSlots(this.c1u_1, this.d1u_1);
             var inductionVariable_0 = 0;
-            var last = out.x1h_1;
+            var last = out.d1s_1;
             if (inductionVariable_0 < last)
               do {
                 var i = inductionVariable_0;
                 inductionVariable_0 = inductionVariable_0 + 1 | 0;
-                out.o1i(i, corrected.m(i).fv());
+                out.u1s(i, corrected.l(i).cw());
               }
                while (inductionVariable_0 < last);
-            out.d1j();
+            out.j1t();
             return out;
           case 2:
-            throw this.x5_1;
+            throw this.j6_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.v5_1 === 2) {
+        if (this.h6_1 === 2) {
           throw e;
         } else {
-          this.u5_1 = this.v5_1;
-          this.x5_1 = e;
+          this.g6_1 = this.h6_1;
+          this.j6_1 = e;
         }
       }
      while (true);
   };
   function ElevationStep() {
-    this.u1g_1 = 150.0;
+    this.a1r_1 = 150.0;
   }
-  protoOf(ElevationStep).v1g = function (source, provider, $completion) {
+  protoOf(ElevationStep).b1r = function (source, provider, $completion) {
     var tmp = new $fixElevationCOROUTINE$(this, source, provider, $completion);
-    tmp.w5_1 = Unit_instance;
-    tmp.x5_1 = null;
-    return tmp.c6();
+    tmp.i6_1 = Unit_instance;
+    tmp.j6_1 = null;
+    return tmp.o6();
   };
-  protoOf(ElevationStep).z1j = function (source, windowM) {
-    if (source.x1h_1 === 0)
+  protoOf(ElevationStep).f1u = function (source, windowM) {
+    if (source.d1s_1 === 0)
       return new Path(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = source.x1h_1;
+    var size = source.d1s_1;
     var list = ArrayList_init_$Create$(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -1453,204 +1459,207 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$4 = source.a1k(index);
-        list.h(tmp$ret$4);
+        var tmp$ret$4 = source.g1u(index);
+        list.n(tmp$ret$4);
       }
        while (inductionVariable < size);
     var coords = list;
-    var smoothed = ElevationSmoother_instance.uu(coords, windowM);
+    var smoothed = ElevationSmoother_instance.rv(coords, windowM);
     var out = copyAllSlots(this, source);
     var inductionVariable_0 = 0;
-    var last = out.x1h_1;
+    var last = out.d1s_1;
     if (inductionVariable_0 < last)
       do {
         var i = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        out.o1i(i, smoothed.m(i).fv());
+        out.u1s(i, smoothed.l(i).cw());
       }
        while (inductionVariable_0 < last);
-    out.d1j();
+    out.j1t();
     return out;
   };
-  protoOf(ElevationStep).w1g = function (source, windowM, $super) {
+  protoOf(ElevationStep).c1r = function (source, windowM, $super) {
     windowM = windowM === VOID ? 150.0 : windowM;
-    return $super === VOID ? this.z1j(source, windowM) : $super.z1j.call(this, source, windowM);
+    return $super === VOID ? this.f1u(source, windowM) : $super.f1u.call(this, source, windowM);
   };
   var ElevationStep_instance;
   function ElevationStep_getInstance() {
     return ElevationStep_instance;
   }
   function GeneratedPath(size) {
-    this.x1h_1 = size;
+    this.d1s_1 = size;
     // Inline function 'kotlin.require' call
-    if (!(this.x1h_1 >= 0)) {
-      var message = 'Negative size: ' + this.x1h_1;
+    if (!(this.d1s_1 >= 0)) {
+      var message = 'Negative size: ' + this.d1s_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    this.y1h_1 = new Float64Array(imul(this.x1h_1, 36));
+    this.e1s_1 = new Float64Array(imul(this.d1s_1, 36));
   }
-  protoOf(GeneratedPath).m1j = function (i, field) {
-    return this.y1h_1[imul(i, 36) + field.l1_1 | 0];
+  protoOf(GeneratedPath).s1t = function (i, field) {
+    return this.e1s_1[imul(i, 36) + field.n1_1 | 0];
   };
-  protoOf(GeneratedPath).n1j = function (i, field, v) {
-    this.y1h_1[imul(i, 36) + field.l1_1 | 0] = v;
+  protoOf(GeneratedPath).t1t = function (i, field, v) {
+    this.e1s_1[imul(i, 36) + field.n1_1 | 0] = v;
   };
-  protoOf(GeneratedPath).z1h = function (i) {
-    return this.y1h_1[imul(i, 36) + 0 | 0];
+  protoOf(GeneratedPath).f1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 0 | 0];
   };
-  protoOf(GeneratedPath).m1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 0 | 0] = v;
+  protoOf(GeneratedPath).s1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 0 | 0] = v;
   };
-  protoOf(GeneratedPath).a1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 1 | 0];
+  protoOf(GeneratedPath).g1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 1 | 0];
   };
-  protoOf(GeneratedPath).n1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 1 | 0] = v;
+  protoOf(GeneratedPath).t1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 1 | 0] = v;
   };
-  protoOf(GeneratedPath).b1k = function (i) {
-    return this.y1h_1[imul(i, 36) + 2 | 0];
+  protoOf(GeneratedPath).h1u = function (i) {
+    return this.e1s_1[imul(i, 36) + 2 | 0];
   };
-  protoOf(GeneratedPath).c1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 2 | 0] = v;
+  protoOf(GeneratedPath).i1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 2 | 0] = v;
   };
-  protoOf(GeneratedPath).d1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 3 | 0] = v;
+  protoOf(GeneratedPath).j1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 3 | 0] = v;
   };
-  protoOf(GeneratedPath).c1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 4 | 0];
+  protoOf(GeneratedPath).i1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 4 | 0];
   };
-  protoOf(GeneratedPath).p1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 4 | 0] = v;
+  protoOf(GeneratedPath).v1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 4 | 0] = v;
   };
-  protoOf(GeneratedPath).e1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 5 | 0] = v;
+  protoOf(GeneratedPath).k1u = function (i) {
+    return this.e1s_1[imul(i, 36) + 5 | 0];
   };
-  protoOf(GeneratedPath).f1k = function (i) {
-    return this.y1h_1[imul(i, 36) + 6 | 0];
+  protoOf(GeneratedPath).l1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 5 | 0] = v;
   };
-  protoOf(GeneratedPath).g1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 6 | 0] = v;
+  protoOf(GeneratedPath).m1u = function (i) {
+    return this.e1s_1[imul(i, 36) + 6 | 0];
   };
-  protoOf(GeneratedPath).h1k = function (i) {
-    return this.y1h_1[imul(i, 36) + 7 | 0];
+  protoOf(GeneratedPath).n1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 6 | 0] = v;
   };
-  protoOf(GeneratedPath).i1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 7 | 0] = v;
+  protoOf(GeneratedPath).o1u = function (i) {
+    return this.e1s_1[imul(i, 36) + 7 | 0];
   };
-  protoOf(GeneratedPath).b1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 8 | 0];
+  protoOf(GeneratedPath).p1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 7 | 0] = v;
   };
-  protoOf(GeneratedPath).o1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 8 | 0] = v;
+  protoOf(GeneratedPath).h1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 8 | 0];
   };
-  protoOf(GeneratedPath).j1k = function (i) {
-    return this.y1h_1[imul(i, 36) + 9 | 0];
+  protoOf(GeneratedPath).u1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 8 | 0] = v;
   };
-  protoOf(GeneratedPath).k1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 9 | 0] = v;
+  protoOf(GeneratedPath).q1u = function (i) {
+    return this.e1s_1[imul(i, 36) + 9 | 0];
   };
-  protoOf(GeneratedPath).l1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 10 | 0] = v;
+  protoOf(GeneratedPath).r1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 9 | 0] = v;
   };
-  protoOf(GeneratedPath).m1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 11 | 0] = v;
+  protoOf(GeneratedPath).s1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 10 | 0] = v;
   };
-  protoOf(GeneratedPath).n1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 12 | 0] = v;
+  protoOf(GeneratedPath).t1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 11 | 0] = v;
   };
-  protoOf(GeneratedPath).o1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 13 | 0] = v;
+  protoOf(GeneratedPath).u1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 12 | 0] = v;
   };
-  protoOf(GeneratedPath).p1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 14 | 0] = v;
+  protoOf(GeneratedPath).v1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 13 | 0] = v;
   };
-  protoOf(GeneratedPath).q1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 15 | 0] = v;
+  protoOf(GeneratedPath).w1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 14 | 0] = v;
   };
-  protoOf(GeneratedPath).r1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 16 | 0] = v;
+  protoOf(GeneratedPath).x1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 15 | 0] = v;
   };
-  protoOf(GeneratedPath).s1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 17 | 0] = v;
+  protoOf(GeneratedPath).y1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 16 | 0] = v;
   };
-  protoOf(GeneratedPath).g1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 18 | 0];
+  protoOf(GeneratedPath).z1u = function (i, v) {
+    this.e1s_1[imul(i, 36) + 17 | 0] = v;
   };
-  protoOf(GeneratedPath).q1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 18 | 0] = v;
+  protoOf(GeneratedPath).m1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 18 | 0];
   };
-  protoOf(GeneratedPath).t1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 19 | 0] = v;
+  protoOf(GeneratedPath).w1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 18 | 0] = v;
   };
-  protoOf(GeneratedPath).u1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 20 | 0] = v;
+  protoOf(GeneratedPath).a1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 19 | 0] = v;
   };
-  protoOf(GeneratedPath).v1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 21 | 0] = v;
+  protoOf(GeneratedPath).b1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 20 | 0] = v;
   };
-  protoOf(GeneratedPath).w1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 22 | 0] = v;
+  protoOf(GeneratedPath).c1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 21 | 0] = v;
   };
-  protoOf(GeneratedPath).x1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 23 | 0] = v;
+  protoOf(GeneratedPath).d1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 22 | 0] = v;
   };
-  protoOf(GeneratedPath).y1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 24 | 0] = v;
+  protoOf(GeneratedPath).e1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 23 | 0] = v;
   };
-  protoOf(GeneratedPath).z1k = function (i, v) {
-    this.y1h_1[imul(i, 36) + 25 | 0] = v;
+  protoOf(GeneratedPath).f1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 24 | 0] = v;
   };
-  protoOf(GeneratedPath).a1l = function (i) {
-    return this.y1h_1[imul(i, 36) + 26 | 0];
+  protoOf(GeneratedPath).g1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 25 | 0] = v;
   };
-  protoOf(GeneratedPath).b1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 26 | 0] = v;
+  protoOf(GeneratedPath).h1v = function (i) {
+    return this.e1s_1[imul(i, 36) + 26 | 0];
   };
-  protoOf(GeneratedPath).c1l = function (i) {
-    return this.y1h_1[imul(i, 36) + 27 | 0];
+  protoOf(GeneratedPath).i1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 26 | 0] = v;
   };
-  protoOf(GeneratedPath).d1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 27 | 0] = v;
+  protoOf(GeneratedPath).j1v = function (i) {
+    return this.e1s_1[imul(i, 36) + 27 | 0];
   };
-  protoOf(GeneratedPath).e1l = function (i) {
-    return this.y1h_1[imul(i, 36) + 28 | 0];
+  protoOf(GeneratedPath).k1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 27 | 0] = v;
   };
-  protoOf(GeneratedPath).f1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 28 | 0] = v;
+  protoOf(GeneratedPath).l1v = function (i) {
+    return this.e1s_1[imul(i, 36) + 28 | 0];
   };
-  protoOf(GeneratedPath).g1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 29 | 0] = v;
+  protoOf(GeneratedPath).m1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 28 | 0] = v;
   };
-  protoOf(GeneratedPath).h1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 30 | 0] = v;
+  protoOf(GeneratedPath).n1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 29 | 0] = v;
   };
-  protoOf(GeneratedPath).f1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 31 | 0];
+  protoOf(GeneratedPath).o1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 30 | 0] = v;
   };
-  protoOf(GeneratedPath).t1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 31 | 0] = v;
+  protoOf(GeneratedPath).l1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 31 | 0];
   };
-  protoOf(GeneratedPath).i1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 32 | 0] = v;
+  protoOf(GeneratedPath).z1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 31 | 0] = v;
   };
-  protoOf(GeneratedPath).j1l = function (i, v) {
-    this.y1h_1[imul(i, 36) + 33 | 0] = v;
+  protoOf(GeneratedPath).p1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 32 | 0] = v;
   };
-  protoOf(GeneratedPath).d1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 34 | 0];
+  protoOf(GeneratedPath).q1v = function (i, v) {
+    this.e1s_1[imul(i, 36) + 33 | 0] = v;
   };
-  protoOf(GeneratedPath).r1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 34 | 0] = v;
+  protoOf(GeneratedPath).j1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 34 | 0];
   };
-  protoOf(GeneratedPath).e1i = function (i) {
-    return this.y1h_1[imul(i, 36) + 35 | 0];
+  protoOf(GeneratedPath).x1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 34 | 0] = v;
   };
-  protoOf(GeneratedPath).s1i = function (i, v) {
-    this.y1h_1[imul(i, 36) + 35 | 0] = v;
+  protoOf(GeneratedPath).k1s = function (i) {
+    return this.e1s_1[imul(i, 36) + 35 | 0];
+  };
+  protoOf(GeneratedPath).y1s = function (i, v) {
+    this.e1s_1[imul(i, 36) + 35 | 0] = v;
   };
   function Companion_3() {
     Companion_instance_3 = this;
-    this.k1l_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
+    this.r1v_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
   }
   var Companion_instance_3;
   function Companion_getInstance_4() {
@@ -1660,19 +1669,19 @@
   }
   function BoundsRad(minLat, maxLat, minLon, maxLon) {
     Companion_getInstance_4();
-    this.l1l_1 = minLat;
-    this.m1l_1 = maxLat;
-    this.n1l_1 = minLon;
-    this.o1l_1 = maxLon;
+    this.s1v_1 = minLat;
+    this.t1v_1 = maxLat;
+    this.u1v_1 = minLon;
+    this.v1v_1 = maxLon;
   }
   protoOf(BoundsRad).toString = function () {
-    return 'BoundsRad(minLat=' + this.l1l_1 + ', maxLat=' + this.m1l_1 + ', minLon=' + this.n1l_1 + ', maxLon=' + this.o1l_1 + ')';
+    return 'BoundsRad(minLat=' + this.s1v_1 + ', maxLat=' + this.t1v_1 + ', minLon=' + this.u1v_1 + ', maxLon=' + this.v1v_1 + ')';
   };
   protoOf(BoundsRad).hashCode = function () {
-    var result = getNumberHashCode(this.l1l_1);
-    result = imul(result, 31) + getNumberHashCode(this.m1l_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.n1l_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.o1l_1) | 0;
+    var result = getNumberHashCode(this.s1v_1);
+    result = imul(result, 31) + getNumberHashCode(this.t1v_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u1v_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.v1v_1) | 0;
     return result;
   };
   protoOf(BoundsRad).equals = function (other) {
@@ -1680,39 +1689,39 @@
       return true;
     if (!(other instanceof BoundsRad))
       return false;
-    if (!equals(this.l1l_1, other.l1l_1))
+    if (!equals(this.s1v_1, other.s1v_1))
       return false;
-    if (!equals(this.m1l_1, other.m1l_1))
+    if (!equals(this.t1v_1, other.t1v_1))
       return false;
-    if (!equals(this.n1l_1, other.n1l_1))
+    if (!equals(this.u1v_1, other.u1v_1))
       return false;
-    if (!equals(this.o1l_1, other.o1l_1))
+    if (!equals(this.v1v_1, other.v1v_1))
       return false;
     return true;
   };
   function copyStatsFrom($this, other) {
-    $this.w1i_1 = other.w1i_1;
-    $this.x1i_1 = other.x1i_1;
-    $this.y1i_1 = other.y1i_1;
-    $this.z1i_1 = other.z1i_1;
-    $this.a1j_1 = other.a1j_1;
-    $this.b1j_1 = other.b1j_1;
-    $this.c1j_1 = other.c1j_1;
+    $this.c1t_1 = other.c1t_1;
+    $this.d1t_1 = other.d1t_1;
+    $this.e1t_1 = other.e1t_1;
+    $this.f1t_1 = other.f1t_1;
+    $this.g1t_1 = other.g1t_1;
+    $this.h1t_1 = other.h1t_1;
+    $this.i1t_1 = other.i1t_1;
   }
   function resetStats($this) {
-    $this.w1i_1 = 0.0;
-    $this.x1i_1 = 0.0;
-    $this.y1i_1 = 0.0;
-    $this.z1i_1 = 0.0;
-    $this.a1j_1 = 0.0;
-    $this.b1j_1 = 0.0;
-    $this.c1j_1 = Companion_getInstance_4().k1l_1;
+    $this.c1t_1 = 0.0;
+    $this.d1t_1 = 0.0;
+    $this.e1t_1 = 0.0;
+    $this.f1t_1 = 0.0;
+    $this.g1t_1 = 0.0;
+    $this.h1t_1 = 0.0;
+    $this.i1t_1 = Companion_getInstance_4().r1v_1;
   }
   function computeBearing($this, from, to) {
-    var lat1 = $this.z1h(from);
-    var lon1 = $this.a1i(from);
-    var lat2 = $this.z1h(to);
-    var lon2 = $this.a1i(to);
+    var lat1 = $this.f1s(from);
+    var lon1 = $this.g1s(from);
+    var lat2 = $this.f1s(to);
+    var lon2 = $this.g1s(to);
     // Inline function 'kotlin.math.cos' call
     var x1 = lon1 * Math.cos(lat1);
     var y1 = lat1;
@@ -1733,32 +1742,32 @@
   }
   function Path(size) {
     GeneratedPath.call(this, size);
-    this.w1i_1 = 0.0;
-    this.x1i_1 = 0.0;
-    this.y1i_1 = 0.0;
-    this.z1i_1 = 0.0;
-    this.a1j_1 = 0.0;
-    this.b1j_1 = 0.0;
-    this.c1j_1 = Companion_getInstance_4().k1l_1;
-  }
-  protoOf(Path).p1l = function () {
-    return until(0, this.x1h_1);
-  };
-  protoOf(Path).q1l = function (i) {
-    return this.z1h(i) * MathConstants_getInstance().bv_1;
-  };
-  protoOf(Path).r1l = function (i) {
-    return this.a1i(i) * MathConstants_getInstance().bv_1;
-  };
-  protoOf(Path).a1k = function (i) {
-    return new LatLonElevation(this.q1l(i), this.r1l(i), this.b1i(i));
-  };
-  protoOf(Path).s1l = function () {
-    var out = new Path(this.x1h_1);
-    var tmp0 = this.y1h_1;
-    var tmp2 = out.y1h_1;
+    this.c1t_1 = 0.0;
+    this.d1t_1 = 0.0;
+    this.e1t_1 = 0.0;
+    this.f1t_1 = 0.0;
+    this.g1t_1 = 0.0;
+    this.h1t_1 = 0.0;
+    this.i1t_1 = Companion_getInstance_4().r1v_1;
+  }
+  protoOf(Path).w1v = function () {
+    return until(0, this.d1s_1);
+  };
+  protoOf(Path).x1v = function (i) {
+    return this.f1s(i) * MathConstants_getInstance().yv_1;
+  };
+  protoOf(Path).y1v = function (i) {
+    return this.g1s(i) * MathConstants_getInstance().yv_1;
+  };
+  protoOf(Path).g1u = function (i) {
+    return new LatLonElevation(this.x1v(i), this.y1v(i), this.h1s(i));
+  };
+  protoOf(Path).z1v = function () {
+    var out = new Path(this.d1s_1);
+    var tmp0 = this.e1s_1;
+    var tmp2 = out.e1s_1;
     // Inline function 'kotlin.collections.copyInto' call
-    var endIndex = this.y1h_1.length;
+    var endIndex = this.e1s_1.length;
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
     var tmp = tmp0;
@@ -1768,11 +1777,11 @@
     copyStatsFrom(out, this);
     return out;
   };
-  protoOf(Path).d1j = function () {
+  protoOf(Path).j1t = function () {
     resetStats(this);
-    if (this.x1h_1 === 0)
+    if (this.d1s_1 === 0)
       return Unit_instance;
-    var timeStart = this.c1i(0);
+    var timeStart = this.i1s(0);
     var cumDist = 0.0;
     var minLat = Infinity;
     var maxLat = -Infinity;
@@ -1783,14 +1792,14 @@
     var gain = 0.0;
     var loss = 0.0;
     var inductionVariable = 0;
-    var last = this.x1h_1;
+    var last = this.d1s_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var lat = this.z1h(i);
-        var lon = this.a1i(i);
-        var ele = this.b1i(i);
+        var lat = this.f1s(i);
+        var lon = this.g1s(i);
+        var ele = this.h1s(i);
         // Inline function 'kotlin.math.min' call
         var a = minLat;
         minLat = Math.min(a, lat);
@@ -1810,103 +1819,103 @@
         var a_4 = maxEle;
         maxEle = Math.max(a_4, ele);
         if (i > 0) {
-          var prevCoord = new LatLon(this.q1l(i - 1 | 0), this.r1l(i - 1 | 0));
-          var curCoord = new LatLon(this.q1l(i), this.r1l(i));
-          cumDist = cumDist + Distance_instance.yu(prevCoord, curCoord);
-          var dEle = ele - this.b1i(i - 1 | 0);
+          var prevCoord = new LatLon(this.x1v(i - 1 | 0), this.y1v(i - 1 | 0));
+          var curCoord = new LatLon(this.x1v(i), this.y1v(i));
+          cumDist = cumDist + Distance_instance.vv(prevCoord, curCoord);
+          var dEle = ele - this.h1s(i - 1 | 0);
           if (dEle > 0)
             gain = gain + dEle;
           else
             loss = loss + dEle;
         }
-        this.c1k(i, cumDist);
+        this.i1u(i, cumDist);
       }
        while (inductionVariable < last);
-    this.w1i_1 = cumDist;
-    this.x1i_1 = minEle === Infinity ? 0.0 : minEle;
-    this.y1i_1 = maxEle === -Infinity ? 0.0 : maxEle;
-    this.z1i_1 = gain;
-    this.a1j_1 = loss;
-    this.c1j_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
-    this.b1j_1 = this.x1h_1 >= 2 ? this.c1i(this.x1h_1 - 1 | 0) - timeStart : 0.0;
+    this.c1t_1 = cumDist;
+    this.d1t_1 = minEle === Infinity ? 0.0 : minEle;
+    this.e1t_1 = maxEle === -Infinity ? 0.0 : maxEle;
+    this.f1t_1 = gain;
+    this.g1t_1 = loss;
+    this.i1t_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
+    this.h1t_1 = this.d1s_1 >= 2 ? this.i1s(this.d1s_1 - 1 | 0) - timeStart : 0.0;
     var inductionVariable_0 = 0;
-    var last_0 = this.x1h_1;
+    var last_0 = this.d1s_1;
     if (inductionVariable_0 < last_0)
       $l$loop: do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        this.e1k(i_0, (this.c1i(i_0) - timeStart) / 1000.0);
-        if (this.x1h_1 <= 1)
+        this.l1u(i_0, (this.i1s(i_0) - timeStart) / 1000.0);
+        if (this.d1s_1 <= 1)
           continue $l$loop;
         // Inline function 'kotlin.math.max' call
         var b = i_0 - 1 | 0;
         var im1 = Math.max(0, b);
-        var tmp0 = this.x1h_1 - 1 | 0;
+        var tmp0 = this.d1s_1 - 1 | 0;
         // Inline function 'kotlin.math.min' call
         var b_0 = i_0 + 1 | 0;
         var ip1 = Math.min(tmp0, b_0);
-        this.i1k(i_0, computeBearing(this, im1, ip1));
-        var dDist = (this.b1k(ip1) - this.b1k(im1)) / 2.0;
-        var dEle_0 = (this.b1i(ip1) - this.b1i(im1)) / 2.0;
+        this.p1u(i_0, computeBearing(this, im1, ip1));
+        var dDist = (this.h1u(ip1) - this.h1u(im1)) / 2.0;
+        var dEle_0 = (this.h1s(ip1) - this.h1s(im1)) / 2.0;
         var grade = dDist === 0.0 ? 0.0 : dEle_0 / dDist;
-        this.k1k(i_0, grade);
-        var dTime = (this.c1i(ip1) - this.c1i(im1)) / 2000.0;
-        this.d1k(i_0, dDist);
-        this.g1k(i_0, dTime);
-        this.d1l(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
+        this.r1u(i_0, grade);
+        var dTime = (this.i1s(ip1) - this.i1s(im1)) / 2000.0;
+        this.j1u(i_0, dDist);
+        this.n1u(i_0, dTime);
+        this.k1v(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
       }
        while (inductionVariable_0 < last_0);
   };
   function PathSimplifier() {
   }
-  protoOf(PathSimplifier).g1h = function (path, toleranceM, zExaggeration) {
-    if (path.x1h_1 <= 2)
-      return path.s1l();
-    var coords = ArrayList_init_$Create$(path.x1h_1);
+  protoOf(PathSimplifier).m1r = function (path, toleranceM, zExaggeration) {
+    if (path.d1s_1 <= 2)
+      return path.z1v();
+    var coords = ArrayList_init_$Create$(path.d1s_1);
     var inductionVariable = 0;
-    var last = path.x1h_1;
+    var last = path.d1s_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.collections.plusAssign' call
-        var element = new LatLonElevation(path.z1h(i) * MathConstants_getInstance().bv_1, path.a1i(i) * MathConstants_getInstance().bv_1, path.b1i(i));
-        coords.h(element);
+        var element = new LatLonElevation(path.f1s(i) * MathConstants_getInstance().yv_1, path.g1s(i) * MathConstants_getInstance().yv_1, path.h1s(i));
+        coords.n(element);
       }
        while (inductionVariable < last);
-    var simplified = DouglasPeucker_instance.vu(coords, toleranceM, zExaggeration);
-    var retainedIndices = ArrayList_init_$Create$(simplified.l());
+    var simplified = DouglasPeucker_instance.sv(coords, toleranceM, zExaggeration);
+    var retainedIndices = ArrayList_init_$Create$(simplified.k());
     var cursor = 0;
-    var _iterator__ex2g4s = simplified.i();
-    while (_iterator__ex2g4s.j()) {
-      var kept = _iterator__ex2g4s.k();
-      while (cursor < coords.l() && !(coords.m(cursor) === kept)) {
+    var _iterator__ex2g4s = simplified.h();
+    while (_iterator__ex2g4s.i()) {
+      var kept = _iterator__ex2g4s.j();
+      while (cursor < coords.k() && !(coords.l(cursor) === kept)) {
         cursor = cursor + 1 | 0;
       }
-      if (cursor === coords.l()) {
+      if (cursor === coords.k()) {
         // Inline function 'kotlin.error' call
         var message = 'PathSimplifier: retained point not found in source';
         throw IllegalStateException_init_$Create$(toString(message));
       }
       // Inline function 'kotlin.collections.plusAssign' call
       var element_0 = cursor;
-      retainedIndices.h(element_0);
+      retainedIndices.n(element_0);
       cursor = cursor + 1 | 0;
     }
-    var out = new Path(retainedIndices.l());
-    var iterator = retainedIndices.i();
+    var out = new Path(retainedIndices.k());
+    var iterator = retainedIndices.h();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.i()) {
       var dstIdx = index;
       index = index + 1 | 0;
-      var srcIdx = iterator.k();
-      var _iterator__ex2g4s_0 = get_entries().i();
-      while (_iterator__ex2g4s_0.j()) {
-        var field = _iterator__ex2g4s_0.k();
-        out.n1j(dstIdx, field, path.m1j(srcIdx, field));
+      var srcIdx = iterator.j();
+      var _iterator__ex2g4s_0 = get_entries().h();
+      while (_iterator__ex2g4s_0.i()) {
+        var field = _iterator__ex2g4s_0.j();
+        out.t1t(dstIdx, field, path.s1t(srcIdx, field));
       }
     }
-    out.d1j();
+    out.j1t();
     return out;
   };
   var PathSimplifier_instance;
@@ -1951,21 +1960,24 @@
   var PointField_CADENCE_instance;
   function Companion_5() {
     Companion_instance_5 = this;
-    this.t1l_1 = 36;
+    this.a1w_1 = 36;
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
     var this_0 = get_entries();
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination = LinkedHashMap_init_$Create$(capacity);
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var element = _iterator__ex2g4s.k();
-      var tmp$ret$2 = element.x1l_1;
-      destination.p2(tmp$ret$2, element);
+    var _iterator__ex2g4s = this_0.h();
+    while (_iterator__ex2g4s.i()) {
+      var element = _iterator__ex2g4s.j();
+      var tmp$ret$2 = element.e1w_1;
+      destination.a3(tmp$ret$2, element);
     }
-    tmp.u1l_1 = destination;
+    tmp.b1w_1 = destination;
   }
+  protoOf(Companion_5).k1w = function (prop) {
+    return this.b1w_1.j1(prop);
+  };
   var Companion_instance_5;
   function Companion_getInstance_6() {
     PointField_initEntries();
@@ -2029,12 +2041,12 @@
     notSelectable = notSelectable === VOID ? false : notSelectable;
     anglesInRadians = anglesInRadians === VOID ? false : anglesInRadians;
     Enum.call(this, name, ordinal);
-    this.x1l_1 = prop;
-    this.y1l_1 = unit;
-    this.z1l_1 = shortDescription;
-    this.a1m_1 = category;
-    this.b1m_1 = notSelectable;
-    this.c1m_1 = anglesInRadians;
+    this.e1w_1 = prop;
+    this.f1w_1 = unit;
+    this.g1w_1 = shortDescription;
+    this.h1w_1 = category;
+    this.i1w_1 = notSelectable;
+    this.j1w_1 = anglesInRadians;
   }
   function PointField_LATITUDE_getInstance() {
     PointField_initEntries();
@@ -2216,8 +2228,8 @@
   }
   function PointFieldCategory(name, ordinal, id, displayName) {
     Enum.call(this, name, ordinal);
-    this.f1m_1 = id;
-    this.g1m_1 = displayName;
+    this.n1w_1 = id;
+    this.o1w_1 = displayName;
   }
   function PointFieldCategory_COORDINATES_getInstance() {
     PointFieldCategory_initEntries();
@@ -2276,35 +2288,35 @@
     return PointFieldCategory_PHYSIOLOGICAL_instance;
   }
   function Copy(sourceIndex) {
-    this.h1m_1 = sourceIndex;
+    this.p1w_1 = sourceIndex;
   }
   protoOf(Copy).toString = function () {
-    return 'Copy(sourceIndex=' + this.h1m_1 + ')';
+    return 'Copy(sourceIndex=' + this.p1w_1 + ')';
   };
   protoOf(Copy).hashCode = function () {
-    return this.h1m_1;
+    return this.p1w_1;
   };
   protoOf(Copy).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy))
       return false;
-    if (!(this.h1m_1 === other.h1m_1))
+    if (!(this.p1w_1 === other.p1w_1))
       return false;
     return true;
   };
   function Interpolate(from, to, coef) {
-    this.i1m_1 = from;
-    this.j1m_1 = to;
-    this.k1m_1 = coef;
+    this.q1w_1 = from;
+    this.r1w_1 = to;
+    this.s1w_1 = coef;
   }
   protoOf(Interpolate).toString = function () {
-    return 'Interpolate(from=' + this.i1m_1 + ', to=' + this.j1m_1 + ', coef=' + this.k1m_1 + ')';
+    return 'Interpolate(from=' + this.q1w_1 + ', to=' + this.r1w_1 + ', coef=' + this.s1w_1 + ')';
   };
   protoOf(Interpolate).hashCode = function () {
-    var result = this.i1m_1;
-    result = imul(result, 31) + this.j1m_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.k1m_1) | 0;
+    var result = this.q1w_1;
+    result = imul(result, 31) + this.r1w_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s1w_1) | 0;
     return result;
   };
   protoOf(Interpolate).equals = function (other) {
@@ -2312,35 +2324,35 @@
       return true;
     if (!(other instanceof Interpolate))
       return false;
-    if (!(this.i1m_1 === other.i1m_1))
+    if (!(this.q1w_1 === other.q1w_1))
       return false;
-    if (!(this.j1m_1 === other.j1m_1))
+    if (!(this.r1w_1 === other.r1w_1))
       return false;
-    if (!equals(this.k1m_1, other.k1m_1))
+    if (!equals(this.s1w_1, other.s1w_1))
       return false;
     return true;
   };
   function buildPlan($this, source, minDistanceM, maxDistanceM) {
-    var n = source.x1h_1;
+    var n = source.d1s_1;
     var plan = ArrayList_init_$Create$(n);
     // Inline function 'kotlin.collections.plusAssign' call
     var element = new Copy(0);
-    plan.h(element);
-    var lastAddedDistance = source.b1k(0);
+    plan.n(element);
+    var lastAddedDistance = source.h1u(0);
     var lastAddedIndex = 0;
     var inductionVariable = 1;
     if (inductionVariable < n)
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var curDist = source.b1k(i);
+        var curDist = source.h1u(i);
         var gap = curDist - lastAddedDistance;
         if (gap < minDistanceM)
           continue $l$loop;
         else if (gap <= maxDistanceM) {
           // Inline function 'kotlin.collections.plusAssign' call
           var element_0 = new Copy(i);
-          plan.h(element_0);
+          plan.n(element_0);
           lastAddedDistance = curDist;
           lastAddedIndex = i;
         } else {
@@ -2356,20 +2368,20 @@
               var j = inductionVariable_0;
               inductionVariable_0 = inductionVariable_0 + 1 | 0;
               var targetDistance = lastAddedDistance + j * spacing;
-              while (index1 < (i - 1 | 0) && source.b1k(index1 + 1 | 0) < targetDistance) {
+              while (index1 < (i - 1 | 0) && source.h1u(index1 + 1 | 0) < targetDistance) {
                 index1 = index1 + 1 | 0;
               }
-              var dist1 = source.b1k(index1);
-              var dist2 = source.b1k(index1 + 1 | 0);
+              var dist1 = source.h1u(index1);
+              var dist2 = source.h1u(index1 + 1 | 0);
               var coef = (targetDistance - dist1) / (dist2 - dist1);
               // Inline function 'kotlin.collections.plusAssign' call
               var element_1 = new Interpolate(index1, index1 + 1 | 0, coef);
-              plan.h(element_1);
+              plan.n(element_1);
             }
              while (inductionVariable_0 < numSegments);
           // Inline function 'kotlin.collections.plusAssign' call
           var element_2 = new Copy(i);
-          plan.h(element_2);
+          plan.n(element_2);
           lastAddedDistance = curDist;
           lastAddedIndex = i;
         }
@@ -2378,60 +2390,60 @@
     return plan;
   }
   function materialize($this, source, plan) {
-    var out = new Path(plan.l());
-    var iterator = plan.i();
+    var out = new Path(plan.k());
+    var iterator = plan.h();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.i()) {
       var dstIdx = index;
       index = index + 1 | 0;
-      var op = iterator.k();
+      var op = iterator.j();
       if (op instanceof Copy) {
-        copyFields($this, source, op.h1m_1, out, dstIdx);
+        copyFields($this, source, op.p1w_1, out, dstIdx);
       } else {
         if (op instanceof Interpolate) {
-          interpolateFields($this, source, op.i1m_1, op.j1m_1, op.k1m_1, out, dstIdx);
+          interpolateFields($this, source, op.q1w_1, op.r1w_1, op.s1w_1, out, dstIdx);
         } else {
           noWhenBranchMatchedException();
         }
       }
     }
-    out.d1j();
+    out.j1t();
     return out;
   }
   function copyFields($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      dst.n1j(dstIdx, field, src.m1j(srcIdx, field));
+    var _iterator__ex2g4s = get_entries().h();
+    while (_iterator__ex2g4s.i()) {
+      var field = _iterator__ex2g4s.j();
+      dst.t1t(dstIdx, field, src.s1t(srcIdx, field));
     }
   }
   function interpolateFields($this, src, i1, i2, coef, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      var v1 = src.m1j(i1, field);
-      var v2 = src.m1j(i2, field);
+    var _iterator__ex2g4s = get_entries().h();
+    while (_iterator__ex2g4s.i()) {
+      var field = _iterator__ex2g4s.j();
+      var v1 = src.s1t(i1, field);
+      var v2 = src.s1t(i2, field);
       var v = isNaN_0(v1) || isNaN_0(v2) ? NaN : v1 + (v2 - v1) * coef;
-      dst.n1j(dstIdx, field, v);
+      dst.t1t(dstIdx, field, v);
     }
   }
   function PointPerDistance() {
   }
-  protoOf(PointPerDistance).t1g = function (source, minDistanceM, maxDistanceM) {
-    return this.l1m(source, minDistanceM, maxDistanceM);
+  protoOf(PointPerDistance).z1q = function (source, minDistanceM, maxDistanceM) {
+    return this.t1w(source, minDistanceM, maxDistanceM);
   };
-  protoOf(PointPerDistance).l1m = function (source, minDistanceM, maxDistanceM) {
+  protoOf(PointPerDistance).t1w = function (source, minDistanceM, maxDistanceM) {
     // Inline function 'kotlin.require' call
     if (!(maxDistanceM > 0.0)) {
       var message = 'maxDistanceM must be > 0, got ' + maxDistanceM;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    if (source.x1h_1 === 0)
+    if (source.d1s_1 === 0)
       return new Path(0);
-    if (source.x1h_1 === 1) {
+    if (source.d1s_1 === 1) {
       var out = new Path(1);
       copyFields(this, source, 0, out, 0);
-      out.d1j();
+      out.j1t();
       return out;
     }
     var plan = buildPlan(this, source, minDistanceM, maxDistanceM);
@@ -2442,35 +2454,35 @@
     return PointPerDistance_instance;
   }
   function Copy_0(sourceIndex) {
-    this.m1m_1 = sourceIndex;
+    this.u1w_1 = sourceIndex;
   }
   protoOf(Copy_0).toString = function () {
-    return 'Copy(sourceIndex=' + this.m1m_1 + ')';
+    return 'Copy(sourceIndex=' + this.u1w_1 + ')';
   };
   protoOf(Copy_0).hashCode = function () {
-    return this.m1m_1;
+    return this.u1w_1;
   };
   protoOf(Copy_0).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy_0))
       return false;
-    if (!(this.m1m_1 === other.m1m_1))
+    if (!(this.u1w_1 === other.u1w_1))
       return false;
     return true;
   };
   function Interpolate_0(from, to, coef) {
-    this.n1m_1 = from;
-    this.o1m_1 = to;
-    this.p1m_1 = coef;
+    this.v1w_1 = from;
+    this.w1w_1 = to;
+    this.x1w_1 = coef;
   }
   protoOf(Interpolate_0).toString = function () {
-    return 'Interpolate(from=' + this.n1m_1 + ', to=' + this.o1m_1 + ', coef=' + this.p1m_1 + ')';
+    return 'Interpolate(from=' + this.v1w_1 + ', to=' + this.w1w_1 + ', coef=' + this.x1w_1 + ')';
   };
   protoOf(Interpolate_0).hashCode = function () {
-    var result = this.n1m_1;
-    result = imul(result, 31) + this.o1m_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p1m_1) | 0;
+    var result = this.v1w_1;
+    result = imul(result, 31) + this.w1w_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.x1w_1) | 0;
     return result;
   };
   protoOf(Interpolate_0).equals = function (other) {
@@ -2478,23 +2490,23 @@
       return true;
     if (!(other instanceof Interpolate_0))
       return false;
-    if (!(this.n1m_1 === other.n1m_1))
+    if (!(this.v1w_1 === other.v1w_1))
       return false;
-    if (!(this.o1m_1 === other.o1m_1))
+    if (!(this.w1w_1 === other.w1w_1))
       return false;
-    if (!equals(this.p1m_1, other.p1m_1))
+    if (!equals(this.x1w_1, other.x1w_1))
       return false;
     return true;
   };
   function buildPlan_0($this, source) {
     var plan = LinkedHashMap_init_$Create$_0();
-    var n = source.x1h_1;
+    var n = source.d1s_1;
     var inductionVariable = 0;
     if (inductionVariable < n)
       $l$loop_0: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var time1 = source.c1i(i);
+        var time1 = source.i1s(i);
         // Inline function 'kotlin.math.floor' call
         var x = time1 / 1000.0;
         var tmp$ret$0 = Math.floor(x);
@@ -2503,18 +2515,18 @@
         if (i === 0 && !equalsLong(msInSec1, new Long(0, 0))) {
           // Inline function 'kotlin.collections.set' call
           var value = new Copy_0(i);
-          plan.p2(epoch1, value);
+          plan.a3(epoch1, value);
         }
         if (i === (n - 1 | 0)) {
           if (!equalsLong(msInSec1, new Long(0, 0))) {
             var tmp2 = add(epoch1, new Long(1, 0));
             // Inline function 'kotlin.collections.set' call
             var value_0 = new Copy_0(i);
-            plan.p2(tmp2, value_0);
+            plan.a3(tmp2, value_0);
           }
           continue $l$loop_0;
         }
-        var time2 = source.c1i(i + 1 | 0);
+        var time2 = source.i1s(i + 1 | 0);
         // Inline function 'kotlin.math.floor' call
         var x_0 = time2 / 1000.0;
         var tmp$ret$3 = Math.floor(x_0);
@@ -2533,7 +2545,7 @@
           var tmp2_0 = e;
           // Inline function 'kotlin.collections.set' call
           var value_1 = new Interpolate_0(i, i + 1 | 0, coef);
-          plan.p2(tmp2_0, value_1);
+          plan.a3(tmp2_0, value_1);
           var _unary__edvuaz = e;
           e = add(_unary__edvuaz, get_ONE());
         }
@@ -2542,15 +2554,15 @@
     return plan;
   }
   function materialize_0($this, source, plan) {
-    var sortedEpochs = sorted(plan.i1());
-    var out = new Path(sortedEpochs.l());
-    var iterator = sortedEpochs.i();
+    var sortedEpochs = sorted(plan.k1());
+    var out = new Path(sortedEpochs.k());
+    var iterator = sortedEpochs.h();
     var index = 0;
-    $l$loop: while (iterator.j()) {
+    $l$loop: while (iterator.i()) {
       var idx = index;
       index = index + 1 | 0;
-      var epoch = iterator.k();
-      var tmp0_elvis_lhs = plan.h1(epoch);
+      var epoch = iterator.j();
+      var tmp0_elvis_lhs = plan.j1(epoch);
       var tmp;
       if (tmp0_elvis_lhs == null) {
         continue $l$loop;
@@ -2559,40 +2571,40 @@
       }
       var data = tmp;
       if (data instanceof Copy_0) {
-        copyFields_0($this, source, data.m1m_1, out, idx);
+        copyFields_0($this, source, data.u1w_1, out, idx);
       } else {
         if (data instanceof Interpolate_0) {
-          interpolateFields_0($this, source, data.n1m_1, data.o1m_1, data.p1m_1, out, idx);
+          interpolateFields_0($this, source, data.v1w_1, data.w1w_1, data.x1w_1, out, idx);
         } else {
           noWhenBranchMatchedException();
         }
       }
-      out.p1i(idx, toNumber(multiply(epoch, new Long(1000, 0))));
+      out.v1s(idx, toNumber(multiply(epoch, new Long(1000, 0))));
     }
-    out.d1j();
+    out.j1t();
     return out;
   }
   function copyFields_0($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      dst.n1j(dstIdx, field, src.m1j(srcIdx, field));
+    var _iterator__ex2g4s = get_entries().h();
+    while (_iterator__ex2g4s.i()) {
+      var field = _iterator__ex2g4s.j();
+      dst.t1t(dstIdx, field, src.s1t(srcIdx, field));
     }
   }
   function interpolateFields_0($this, src, i1, i2, coef, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      var v1 = src.m1j(i1, field);
-      var v2 = src.m1j(i2, field);
+    var _iterator__ex2g4s = get_entries().h();
+    while (_iterator__ex2g4s.i()) {
+      var field = _iterator__ex2g4s.j();
+      var v1 = src.s1t(i1, field);
+      var v2 = src.s1t(i2, field);
       var v = isNaN_0(v1) || isNaN_0(v2) ? NaN : v1 + (v2 - v1) * coef;
-      dst.n1j(dstIdx, field, v);
+      dst.t1t(dstIdx, field, v);
     }
   }
   function PointPerSecond() {
   }
-  protoOf(PointPerSecond).f1h = function (source) {
-    if (source.x1h_1 === 0)
+  protoOf(PointPerSecond).l1r = function (source) {
+    if (source.d1s_1 === 0)
       return new Path(0);
     var plan = buildPlan_0(this, source);
     return materialize_0(this, source, plan);
@@ -2602,15 +2614,15 @@
     return PointPerSecond_instance;
   }
   function computeWithWind($this, path, i, aeroCoef, wind) {
-    var speed = path.c1l(i);
-    var bearing = path.h1k(i);
-    path.i1l(i, wind.q1m_1);
-    path.j1l(i, wind.r1m_1);
-    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.r1m_1;
-    path.n1k(i, windDirectionAsBearing);
+    var speed = path.j1v(i);
+    var bearing = path.o1u(i);
+    path.p1v(i, wind.y1w_1);
+    path.q1v(i, wind.z1w_1);
+    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.z1w_1;
+    path.u1u(i, windDirectionAsBearing);
     var alpha = windDirectionAsBearing - bearing;
-    path.o1k(i, alpha);
-    var v = wind.q1m_1;
+    path.v1u(i, alpha);
+    var v = wind.y1w_1;
     // Inline function 'kotlin.math.cos' call
     var l1 = speed + v * Math.cos(alpha);
     var l2 = l1 * l1;
@@ -2625,21 +2637,21 @@
     return tmp_1 * Math.sqrt(l3) * l1 * speed;
   }
   function AeroPowerProvider() {
-    this.s1m_1 = 1.2;
+    this.a1x_1 = 1.2;
   }
-  protoOf(AeroPowerProvider).t1m = function (course, path, pointIndex) {
-    var aeroCoef = course.g1f_1.u1m(course, path, pointIndex);
-    path.m1k(pointIndex, aeroCoef);
-    var wind = course.h1f_1.v1m(course.e1f_1, path, pointIndex);
+  protoOf(AeroPowerProvider).b1x = function (course, path, pointIndex) {
+    var aeroCoef = course.m1p_1.c1x(course, path, pointIndex);
+    path.t1u(pointIndex, aeroCoef);
+    var wind = course.n1p_1.d1x(course.k1p_1, path, pointIndex);
     var tmp;
-    if (wind.q1m_1 === 0.0) {
-      var v = path.c1l(pointIndex);
+    if (wind.y1w_1 === 0.0) {
+      var v = path.j1v(pointIndex);
       tmp = -aeroCoef * v * v * v;
     } else {
       tmp = computeWithWind(this, path, pointIndex, aeroCoef, wind);
     }
     var pAir = tmp;
-    path.p1k(pointIndex, pAir);
+    path.w1u(pointIndex, pAir);
     return pAir;
   };
   var AeroPowerProvider_instance;
@@ -2648,17 +2660,17 @@
   }
   function AeroProviderConstant() {
   }
-  protoOf(AeroProviderConstant).u1m = function (course, path, pointIndex) {
-    var rho = course.f1f_1.w1m(course.e1f_1, path, pointIndex);
-    return course.k1f().q1f_1 * course.k1f().r1f_1 * rho / 2.0;
+  protoOf(AeroProviderConstant).c1x = function (course, path, pointIndex) {
+    var rho = course.l1p_1.e1x(course.k1p_1, path, pointIndex);
+    return course.q1p().w1p_1 * course.q1p().x1p_1 * rho / 2.0;
   };
   var AeroProviderConstant_instance;
   function AeroProviderConstant_getInstance() {
     return AeroProviderConstant_instance;
   }
   function Companion_6() {
-    this.x1m_1 = 0.05;
-    this.y1m_1 = 3.0;
+    this.f1x_1 = 0.05;
+    this.g1x_1 = 3.0;
   }
   var Companion_instance_6;
   function Companion_getInstance_7() {
@@ -2666,10 +2678,10 @@
   }
   function CyclistPowerProviderBase(useHarmonics, random) {
     random = random === VOID ? Default_getInstance() : random;
-    this.z1m_1 = useHarmonics;
+    this.h1x_1 = useHarmonics;
     var tmp = this;
     var tmp_0;
-    if (this.z1m_1) {
+    if (this.h1x_1) {
       // Inline function 'kotlin.collections.List' call
       // Inline function 'kotlin.collections.MutableList' call
       var list = ArrayList_init_$Create$(20);
@@ -2679,48 +2691,48 @@
         do {
           var index = inductionVariable;
           inductionVariable = inductionVariable + 1 | 0;
-          var tmp$ret$4 = new Harmonic(1.0 + random.fa() * 9.0, random.fa() * 3.141592653589793, random.fa() * 0.01);
-          list.h(tmp$ret$4);
+          var tmp$ret$4 = new Harmonic(1.0 + random.qb() * 9.0, random.qb() * 3.141592653589793, random.qb() * 0.01);
+          list.n(tmp$ret$4);
         }
          while (inductionVariable < 20);
       tmp_0 = list;
     } else {
       tmp_0 = emptyList();
     }
-    tmp.a1n_1 = tmp_0;
-  }
-  protoOf(CyclistPowerProviderBase).t1m = function (course, path, pointIndex) {
-    var power = this.b1n(course, path, pointIndex);
-    path.t1k(pointIndex, power);
-    if (this.z1m_1) {
-      var x = path.c1i(pointIndex) / 10000.0;
-      var _iterator__ex2g4s = this.a1n_1.i();
-      while (_iterator__ex2g4s.j()) {
-        var h = _iterator__ex2g4s.k();
+    tmp.i1x_1 = tmp_0;
+  }
+  protoOf(CyclistPowerProviderBase).b1x = function (course, path, pointIndex) {
+    var power = this.j1x(course, path, pointIndex);
+    path.a1v(pointIndex, power);
+    if (this.h1x_1) {
+      var x = path.i1s(pointIndex) / 10000.0;
+      var _iterator__ex2g4s = this.i1x_1.h();
+      while (_iterator__ex2g4s.i()) {
+        var h = _iterator__ex2g4s.j();
         var tmp = power;
-        var tmp_0 = h.e1n_1 * power;
+        var tmp_0 = h.m1x_1 * power;
         // Inline function 'kotlin.math.cos' call
-        var x_0 = h.c1n_1 * x - h.d1n_1;
+        var x_0 = h.k1x_1 * x - h.l1x_1;
         power = tmp + tmp_0 * Math.cos(x_0);
       }
     }
-    path.u1k(pointIndex, power);
-    var powerNeeded = -PowerComputer_instance.f1n(course, path, pointIndex, false);
-    path.v1k(pointIndex, powerNeeded);
+    path.b1v(pointIndex, power);
+    var powerNeeded = -PowerComputer_instance.n1x(course, path, pointIndex, false);
+    path.c1v(pointIndex, powerNeeded);
     return power;
   };
   function GravPowerProvider() {
   }
-  protoOf(GravPowerProvider).t1m = function (course, path, pointIndex) {
-    var m = course.k1f().o1f_1;
-    var grade = path.j1k(pointIndex);
-    var speed = path.c1l(pointIndex);
+  protoOf(GravPowerProvider).b1x = function (course, path, pointIndex) {
+    var m = course.q1p().u1p_1;
+    var grade = path.q1u(pointIndex);
+    var speed = path.j1v(pointIndex);
     var tmp = -m * 9.8 * speed;
     // Inline function 'kotlin.math.atan' call
     // Inline function 'kotlin.math.sin' call
     var x = Math.atan(grade);
     var p = tmp * Math.sin(x);
-    path.q1k(pointIndex, p);
+    path.x1u(pointIndex, p);
     return p;
   };
   var GravPowerProvider_instance;
@@ -2728,17 +2740,17 @@
     return GravPowerProvider_instance;
   }
   function Harmonic(freqRadS, phaseRad, amp) {
-    this.c1n_1 = freqRadS;
-    this.d1n_1 = phaseRad;
-    this.e1n_1 = amp;
+    this.k1x_1 = freqRadS;
+    this.l1x_1 = phaseRad;
+    this.m1x_1 = amp;
   }
   protoOf(Harmonic).toString = function () {
-    return 'Harmonic(freqRadS=' + this.c1n_1 + ', phaseRad=' + this.d1n_1 + ', amp=' + this.e1n_1 + ')';
+    return 'Harmonic(freqRadS=' + this.k1x_1 + ', phaseRad=' + this.l1x_1 + ', amp=' + this.m1x_1 + ')';
   };
   protoOf(Harmonic).hashCode = function () {
-    var result = getNumberHashCode(this.c1n_1);
-    result = imul(result, 31) + getNumberHashCode(this.d1n_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e1n_1) | 0;
+    var result = getNumberHashCode(this.k1x_1);
+    result = imul(result, 31) + getNumberHashCode(this.l1x_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.m1x_1) | 0;
     return result;
   };
   protoOf(Harmonic).equals = function (other) {
@@ -2746,39 +2758,39 @@
       return true;
     if (!(other instanceof Harmonic))
       return false;
-    if (!equals(this.c1n_1, other.c1n_1))
+    if (!equals(this.k1x_1, other.k1x_1))
       return false;
-    if (!equals(this.d1n_1, other.d1n_1))
+    if (!equals(this.l1x_1, other.l1x_1))
       return false;
-    if (!equals(this.e1n_1, other.e1n_1))
+    if (!equals(this.m1x_1, other.m1x_1))
       return false;
     return true;
   };
   function computeCorneringLimit($this, course, currentIndex, window_0) {
-    var path = course.y1e_1;
+    var path = course.e1p_1;
     var radius = computeRadiusWindowed($this, path, currentIndex, window_0);
     // Inline function 'kotlin.math.sqrt' call
-    var x = 9.8 * radius * course.z1e_1.u1f();
+    var x = 9.8 * radius * course.f1p_1.a1q();
     var vMax = Math.sqrt(x);
     // Inline function 'kotlin.math.min' call
-    var a = course.z1e_1.w1f();
+    var a = course.f1p_1.c1q();
     var result = Math.min(a, vMax);
-    path.g1l(currentIndex, result);
+    path.n1v(currentIndex, result);
     return result;
   }
   function computeRadiusWindowed($this, path, i, k) {
     // Inline function 'kotlin.math.max' call
     var b = i - k | 0;
     var mini = Math.max(0, b);
-    var tmp0 = path.x1h_1 - 1 | 0;
+    var tmp0 = path.d1s_1 - 1 | 0;
     // Inline function 'kotlin.math.min' call
     var b_0 = i + k | 0;
     var maxi = Math.min(tmp0, b_0);
-    var totalBearingChange = $this.g1n(path.h1k(maxi) - path.h1k(mini));
-    var totalDistance = path.b1k(maxi) - path.b1k(mini);
+    var totalBearingChange = $this.o1x(path.o1u(maxi) - path.o1u(mini));
+    var totalDistance = path.h1u(maxi) - path.h1u(mini);
     // Inline function 'kotlin.math.abs' call
     if (Math.abs(totalBearingChange) < 0.001) {
-      path.l1k(i, 200.0);
+      path.s1u(i, 200.0);
       return 200.0;
     }
     // Inline function 'kotlin.math.abs' call
@@ -2787,47 +2799,47 @@
     // Inline function 'kotlin.math.max' call
     var b_1 = Math.min(200.0, raw);
     var clamped = Math.max(5.0, b_1);
-    path.l1k(i, clamped);
+    path.s1u(i, clamped);
     return clamped;
   }
   function computeBrakingLimit($this, course, currentIndex, nextIndex) {
-    var path = course.y1e_1;
-    var vf = path.e1l(nextIndex);
-    var a = course.z1e_1.v1f();
-    var d = path.b1k(nextIndex) - path.b1k(currentIndex);
+    var path = course.e1p_1;
+    var vf = path.l1v(nextIndex);
+    var a = course.f1p_1.b1q();
+    var d = path.h1u(nextIndex) - path.h1u(currentIndex);
     // Inline function 'kotlin.math.sqrt' call
     var x = vf * vf + 2.0 * a * d;
     return Math.sqrt(x);
   }
   function MaxSpeedComputer() {
-    this.x1g_1 = 200.0;
-    this.y1g_1 = 5.0;
-    this.z1g_1 = 2.0;
-    this.a1h_1 = 0.001;
-    this.b1h_1 = 10;
-  }
-  protoOf(MaxSpeedComputer).c1h = function (course) {
-    var path = course.y1e_1;
-    var n = path.x1h_1;
+    this.d1r_1 = 200.0;
+    this.e1r_1 = 5.0;
+    this.f1r_1 = 2.0;
+    this.g1r_1 = 0.001;
+    this.h1r_1 = 10;
+  }
+  protoOf(MaxSpeedComputer).i1r = function (course) {
+    var path = course.e1p_1;
+    var n = path.d1s_1;
     var inductionVariable = n - 1 | 0;
     if (0 <= inductionVariable)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + -1 | 0;
         if (i === (n - 1 | 0)) {
-          path.f1l(i, 2.0);
+          path.m1v(i, 2.0);
         } else {
           var cornering = computeCorneringLimit(this, course, i, 10);
           var braking = computeBrakingLimit(this, course, i, i + 1 | 0);
           // Inline function 'kotlin.math.min' call
           var tmp$ret$0 = Math.min(cornering, braking);
-          path.f1l(i, tmp$ret$0);
+          path.m1v(i, tmp$ret$0);
         }
       }
        while (0 <= inductionVariable);
-    path.d1j();
+    path.j1t();
   };
-  protoOf(MaxSpeedComputer).g1n = function (angleIn) {
+  protoOf(MaxSpeedComputer).o1x = function (angleIn) {
     var a = angleIn;
     while (a > 3.141592653589793)
       a = a - 2.0 * 3.141592653589793;
@@ -2841,11 +2853,11 @@
   }
   function MuscularPowerProvider() {
   }
-  protoOf(MuscularPowerProvider).t1m = function (course, path, pointIndex) {
-    var muscular = course.i1f_1.t1m(course, path, pointIndex);
-    path.w1k(pointIndex, muscular);
-    var wheel = muscular * course.l1f().w1e_1;
-    path.x1k(pointIndex, wheel);
+  protoOf(MuscularPowerProvider).b1x = function (course, path, pointIndex) {
+    var muscular = course.o1p_1.b1x(course, path, pointIndex);
+    path.d1v(pointIndex, muscular);
+    var wheel = muscular * course.r1p().c1p_1;
+    path.e1v(pointIndex, wheel);
     return wheel;
   };
   var MuscularPowerProvider_instance;
@@ -2858,7 +2870,7 @@
     var tol = dx / 1.0E7;
     while (dt2 - dt1 >= tol) {
       var dtMid = (dt1 + dt2) / 2.0;
-      var dxMid = $this.h1n(pSum, equivalentMass, currentSpeed, dtMid);
+      var dxMid = $this.p1x(pSum, equivalentMass, currentSpeed, dtMid);
       if (dxMid < dx)
         dt1 = dtMid;
       else
@@ -2868,18 +2880,18 @@
   }
   function PowerComputer() {
   }
-  protoOf(PowerComputer).f1n = function (course, path, pointIndex, withCyclist) {
+  protoOf(PowerComputer).n1x = function (course, path, pointIndex, withCyclist) {
     var pSum = 0.0;
-    pSum = pSum + WheelBearingsPowerProvider_instance.t1m(course, path, pointIndex);
-    pSum = pSum + RollingResistancePowerProvider_instance.t1m(course, path, pointIndex);
-    pSum = pSum + AeroPowerProvider_instance.t1m(course, path, pointIndex);
-    pSum = pSum + GravPowerProvider_instance.t1m(course, path, pointIndex);
+    pSum = pSum + WheelBearingsPowerProvider_instance.b1x(course, path, pointIndex);
+    pSum = pSum + RollingResistancePowerProvider_instance.b1x(course, path, pointIndex);
+    pSum = pSum + AeroPowerProvider_instance.b1x(course, path, pointIndex);
+    pSum = pSum + GravPowerProvider_instance.b1x(course, path, pointIndex);
     if (withCyclist) {
-      pSum = pSum + MuscularPowerProvider_instance.t1m(course, path, pointIndex);
+      pSum = pSum + MuscularPowerProvider_instance.b1x(course, path, pointIndex);
     }
     return pSum;
   };
-  protoOf(PowerComputer).h1n = function (pSum, equivalentMass, currentSpeed, dt) {
+  protoOf(PowerComputer).p1x = function (pSum, equivalentMass, currentSpeed, dt) {
     // Inline function 'kotlin.math.sqrt' call
     var x = dt * pSum / (0.5 * equivalentMass) + currentSpeed * currentSpeed;
     var tmp0 = Math.sqrt(x);
@@ -2888,40 +2900,40 @@
     var newSpeed = Math.max(tmp0, b);
     return (currentSpeed + newSpeed) * dt / 2.0;
   };
-  protoOf(PowerComputer).i1n = function (equivalentMass, s1, s2, dt) {
+  protoOf(PowerComputer).q1x = function (equivalentMass, s1, s2, dt) {
     return 0.5 * equivalentMass * (s2 * s2 - s1 * s1) / dt;
   };
-  protoOf(PowerComputer).j1n = function (pSum, equivalentMass, currentSpeed, dx) {
+  protoOf(PowerComputer).r1x = function (pSum, equivalentMass, currentSpeed, dx) {
     var dt = 0.1;
-    while (this.h1n(pSum, equivalentMass, currentSpeed, dt) <= dx) {
+    while (this.p1x(pSum, equivalentMass, currentSpeed, dt) <= dx) {
       dt = dt + 0.1;
     }
     return getDtInner(this, pSum, equivalentMass, currentSpeed, dx, dt - 0.1, dt);
   };
-  protoOf(PowerComputer).k1n = function (course, path, equivalentMass, i) {
+  protoOf(PowerComputer).s1x = function (course, path, equivalentMass, i) {
     if (i === 0) {
-      path.b1l(i, 0.0);
+      path.i1v(i, 0.0);
       return Unit_instance;
     }
-    var resistive = this.f1n(course, path, i - 1 | 0, false);
-    var s1 = path.c1l(i - 1 | 0);
-    var s2 = path.c1l(i);
-    var dtSeconds = path.f1k(i) / 1000.0;
-    var totPower = this.i1n(equivalentMass, s1, s2, dtSeconds);
-    path.y1k(i, totPower);
+    var resistive = this.n1x(course, path, i - 1 | 0, false);
+    var s1 = path.j1v(i - 1 | 0);
+    var s2 = path.j1v(i);
+    var dtSeconds = path.m1u(i) / 1000.0;
+    var totPower = this.q1x(equivalentMass, s1, s2, dtSeconds);
+    path.f1v(i, totPower);
     var powerWheel = totPower - resistive;
-    path.z1k(i, powerWheel);
+    path.g1v(i, powerWheel);
     // Inline function 'kotlin.math.max' call
-    var computed = Math.max(0.0, powerWheel) / course.l1f().w1e_1;
-    path.b1l(i, computed);
+    var computed = Math.max(0.0, powerWheel) / course.r1p().c1p_1;
+    path.i1v(i, computed);
   };
-  protoOf(PowerComputer).l1n = function (course) {
-    var m = course.z1e_1.o1f_1;
-    var totalInertia = course.a1f_1.t1e_1 + course.a1f_1.u1e_1;
-    return m + totalInertia / (course.a1f_1.v1e_1 * course.a1f_1.v1e_1);
+  protoOf(PowerComputer).t1x = function (course) {
+    var m = course.f1p_1.u1p_1;
+    var totalInertia = course.g1p_1.z1o_1 + course.g1p_1.a1p_1;
+    return m + totalInertia / (course.g1p_1.b1p_1 * course.g1p_1.b1p_1);
   };
-  protoOf(PowerComputer).m1n = function (course) {
-    return this.l1n(course.e1f_1);
+  protoOf(PowerComputer).u1x = function (course) {
+    return this.t1x(course.k1p_1);
   };
   var PowerComputer_instance;
   function PowerComputer_getInstance() {
@@ -2931,14 +2943,42 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.p1n_1 = power;
+    this.x1x_1 = power;
   }
-  protoOf(PowerProviderConstant).b1n = function (course, path, pointIndex) {
-    return this.p1n_1;
+  protoOf(PowerProviderConstant).j1x = function (course, path, pointIndex) {
+    return this.x1x_1;
   };
+  function PowerProviderConstantWithTiring(power, useHarmonics, durationSeconds, random) {
+    useHarmonics = useHarmonics === VOID ? false : useHarmonics;
+    random = random === VOID ? Default_getInstance() : random;
+    CyclistPowerProviderBase.call(this, useHarmonics, random);
+    this.a1y_1 = power;
+    this.b1y_1 = durationSeconds;
+    // Inline function 'kotlin.require' call
+    if (!(this.b1y_1 > 0.0)) {
+      var message = 'durationSeconds must be > 0, got ' + this.b1y_1;
+      throw IllegalArgumentException_init_$Create$(toString(message));
+    }
+  }
+  protoOf(PowerProviderConstantWithTiring).j1x = function (course, path, pointIndex) {
+    var elapsedS = path.k1u(pointIndex) / 1000.0;
+    // Inline function 'kotlin.math.max' call
+    var b = 1.0 - 0.6 * elapsedS / this.b1y_1;
+    var c = Math.max(0.5, b);
+    return this.a1y_1 * c;
+  };
+  function PowerProviderFromData() {
+  }
+  protoOf(PowerProviderFromData).b1x = function (course, path, pointIndex) {
+    return path.m1s(pointIndex);
+  };
+  var PowerProviderFromData_instance;
+  function PowerProviderFromData_getInstance() {
+    return PowerProviderFromData_instance;
+  }
   function RhoProviderDefault() {
   }
-  protoOf(RhoProviderDefault).w1m = function (course, path, pointIndex) {
+  protoOf(RhoProviderDefault).e1x = function (course, path, pointIndex) {
     return 1.225;
   };
   var RhoProviderDefault_instance;
@@ -2946,16 +2986,16 @@
     return RhoProviderDefault_instance;
   }
   function RhoProviderEstimate() {
-    this.q1n_1 = 101325.0;
-    this.r1n_1 = 288.15;
-    this.s1n_1 = 9.80665;
-    this.t1n_1 = 0.0065;
-    this.u1n_1 = 287.05;
-  }
-  protoOf(RhoProviderEstimate).w1m = function (course, path, pointIndex) {
-    var providedTemp = path.m1j(pointIndex, PointField_TEMPERATURE_getInstance());
+    this.c1y_1 = 101325.0;
+    this.d1y_1 = 288.15;
+    this.e1y_1 = 9.80665;
+    this.f1y_1 = 0.0065;
+    this.g1y_1 = 287.05;
+  }
+  protoOf(RhoProviderEstimate).e1x = function (course, path, pointIndex) {
+    var providedTemp = path.s1t(pointIndex, PointField_TEMPERATURE_getInstance());
     var temperatureC = isNaN_0(providedTemp) || providedTemp === 0.0 ? 15.0 : providedTemp;
-    var providedElevation = path.b1i(pointIndex);
+    var providedElevation = path.h1s(pointIndex);
     var altitude = isNaN_0(providedElevation) ? 0.0 : providedElevation;
     var tKelvin = temperatureC + 273.15;
     var tmp0 = 1.0 - 0.0065 * altitude / 288.15;
@@ -2970,17 +3010,17 @@
   }
   function RollingResistancePowerProvider() {
   }
-  protoOf(RollingResistancePowerProvider).t1m = function (course, path, pointIndex) {
-    var m = course.k1f().o1f_1;
-    var crr = course.l1f().s1e_1;
-    var grade = path.j1k(pointIndex);
-    var speed = path.c1l(pointIndex);
+  protoOf(RollingResistancePowerProvider).b1x = function (course, path, pointIndex) {
+    var m = course.q1p().u1p_1;
+    var crr = course.r1p().y1o_1;
+    var grade = path.q1u(pointIndex);
+    var speed = path.j1v(pointIndex);
     // Inline function 'kotlin.math.atan' call
     // Inline function 'kotlin.math.cos' call
     var x = Math.atan(grade);
     var coef = Math.cos(x);
     var p = -coef * m * 9.8 * speed * crr;
-    path.r1k(pointIndex, p);
+    path.y1u(pointIndex, p);
     return p;
   };
   var RollingResistancePowerProvider_instance;
@@ -2988,18 +3028,18 @@
     return RollingResistancePowerProvider_instance;
   }
   function copyAllFields($this, src, i, dst, j) {
-    var _iterator__ex2g4s = get_entries().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      dst.n1j(j, field, src.m1j(i, field));
+    var _iterator__ex2g4s = get_entries().h();
+    while (_iterator__ex2g4s.i()) {
+      var field = _iterator__ex2g4s.j();
+      dst.t1t(j, field, src.s1t(i, field));
     }
   }
   function VirtualizeService() {
-    this.d1h_1 = 100000;
+    this.j1r_1 = 100000;
   }
-  protoOf(VirtualizeService).e1h = function (course) {
-    var input = course.j1f();
-    var n = input.x1h_1;
+  protoOf(VirtualizeService).k1r = function (course) {
+    var input = course.p1p();
+    var n = input.d1s_1;
     if (n === 0)
       return new Path(0);
     if (n === 1) {
@@ -3007,54 +3047,54 @@
       copyAllFields(this, input, 0, singleton, 0);
       return singleton;
     }
-    var mEq = PowerComputer_instance.m1n(course);
+    var mEq = PowerComputer_instance.u1x(course);
     var out = new Path(n);
     copyAllFields(this, input, 0, out, 0);
     var speed = 0.5555555555555556;
     var startTimeMs = 0.0;
     var timeMs = startTimeMs;
-    out.p1i(0, timeMs);
-    out.e1k(0, 0.0);
-    out.d1l(0, speed);
-    out.h1l(0, speed);
+    out.v1s(0, timeMs);
+    out.l1u(0, 0.0);
+    out.k1v(0, speed);
+    out.o1v(0, speed);
     var i = 1;
     var iter = 0;
     $l$loop: while (i < n) {
-      var dx = input.b1k(i) - input.b1k(i - 1 | 0);
-      var pSum = PowerComputer_instance.f1n(course, out, i - 1 | 0, true);
-      var dt = PowerComputer_instance.j1n(pSum, mEq, speed, dx);
+      var dx = input.h1u(i) - input.h1u(i - 1 | 0);
+      var pSum = PowerComputer_instance.n1x(course, out, i - 1 | 0, true);
+      var dt = PowerComputer_instance.r1x(pSum, mEq, speed, dx);
       var speedNew = 2.0 * dx / dt - speed;
       copyAllFields(this, input, i, out, i);
-      var speedMax = input.e1l(i);
+      var speedMax = input.l1v(i);
       if (speedNew > speedMax) {
         speedNew = speedMax;
         dt = 2.0 * dx / (speedNew + speed);
       }
       speed = speedNew;
       timeMs = timeMs + dt * 1000.0;
-      out.p1i(i, timeMs);
-      out.e1k(i, timeMs - startTimeMs);
-      out.d1k(i, dx);
-      out.g1k(i, dt * 1000.0);
-      out.d1l(i, speed);
-      out.h1l(i, speed);
+      out.v1s(i, timeMs);
+      out.l1u(i, timeMs - startTimeMs);
+      out.j1u(i, dx);
+      out.n1u(i, dt * 1000.0);
+      out.k1v(i, speed);
+      out.o1v(i, speed);
       i = i + 1 | 0;
       var _unary__edvuaz = iter;
       iter = _unary__edvuaz + 1 | 0;
       if (_unary__edvuaz > 100000)
         break $l$loop;
     }
-    var progression = out.p1l();
-    var inductionVariable = progression.qa_1;
-    var last = progression.ra_1;
+    var progression = out.w1v();
+    var inductionVariable = progression.bc_1;
+    var last = progression.cc_1;
     if (inductionVariable <= last)
       do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        PowerComputer_instance.k1n(course, out, mEq, j);
+        PowerComputer_instance.s1x(course, out, mEq, j);
       }
        while (!(j === last));
-    out.d1j();
+    out.j1t();
     return out;
   };
   var VirtualizeService_instance;
@@ -3063,10 +3103,10 @@
   }
   function WheelBearingsPowerProvider() {
   }
-  protoOf(WheelBearingsPowerProvider).t1m = function (course, path, pointIndex) {
-    var speed = path.c1l(pointIndex);
+  protoOf(WheelBearingsPowerProvider).b1x = function (course, path, pointIndex) {
+    var speed = path.j1v(pointIndex);
     var p = -speed * (91.0 + 8.7 * speed) / 1000.0;
-    path.s1k(pointIndex, p);
+    path.z1u(pointIndex, p);
     return p;
   };
   var WheelBearingsPowerProvider_instance;
@@ -3075,7 +3115,7 @@
   }
   function Companion_7() {
     Companion_instance_7 = this;
-    this.v1n_1 = new Wind(0.0, 0.0);
+    this.h1y_1 = new Wind(0.0, 0.0);
   }
   var Companion_instance_7;
   function Companion_getInstance_8() {
@@ -3085,15 +3125,15 @@
   }
   function Wind(speedMS, directionRad) {
     Companion_getInstance_8();
-    this.q1m_1 = speedMS;
-    this.r1m_1 = directionRad;
+    this.y1w_1 = speedMS;
+    this.z1w_1 = directionRad;
   }
   protoOf(Wind).toString = function () {
-    return 'Wind(speedMS=' + this.q1m_1 + ', directionRad=' + this.r1m_1 + ')';
+    return 'Wind(speedMS=' + this.y1w_1 + ', directionRad=' + this.z1w_1 + ')';
   };
   protoOf(Wind).hashCode = function () {
-    var result = getNumberHashCode(this.q1m_1);
-    result = imul(result, 31) + getNumberHashCode(this.r1m_1) | 0;
+    var result = getNumberHashCode(this.y1w_1);
+    result = imul(result, 31) + getNumberHashCode(this.z1w_1) | 0;
     return result;
   };
   protoOf(Wind).equals = function (other) {
@@ -3101,49 +3141,100 @@
       return true;
     if (!(other instanceof Wind))
       return false;
-    if (!equals(this.q1m_1, other.q1m_1))
+    if (!equals(this.y1w_1, other.y1w_1))
       return false;
-    if (!equals(this.r1m_1, other.r1m_1))
+    if (!equals(this.z1w_1, other.z1w_1))
       return false;
     return true;
   };
   function WindProviderNone() {
   }
-  protoOf(WindProviderNone).v1m = function (course, path, pointIndex) {
-    return Companion_getInstance_8().v1n_1;
+  protoOf(WindProviderNone).d1x = function (course, path, pointIndex) {
+    return Companion_getInstance_8().h1y_1;
   };
   var WindProviderNone_instance;
   function WindProviderNone_getInstance() {
     return WindProviderNone_instance;
   }
+  function WindProviderConstant(wind) {
+    this.i1y_1 = wind;
+  }
+  protoOf(WindProviderConstant).d1x = function (course, path, pointIndex) {
+    return this.i1y_1;
+  };
   function parseGpx(xml) {
-    return firstTrackAsPath(GpxParser_instance.l1i(xml));
+    return firstTrackAsPath(GpxParser_instance.r1s(xml));
   }
   function pathSize(path) {
-    return path.x1h_1;
+    return path.d1s_1;
   }
   function pathTotalDistance(path) {
-    return path.w1i_1;
+    return path.c1t_1;
   }
   function pathDurationMs(path) {
-    return path.b1j_1;
+    return path.h1t_1;
   }
   function pathElevationGain(path) {
-    return path.z1i_1;
+    return path.f1t_1;
   }
   function pathElevationLoss(path) {
-    return path.a1j_1;
+    return path.g1t_1;
   }
   function pointAt(path, i) {
-    return pointObj(path.q1l(i), path.r1l(i), path.b1i(i), path.c1i(i), path.c1l(i), path.a1l(i), path.b1k(i), path.j1k(i));
+    return pointObj(path.x1v(i), path.y1v(i), path.h1s(i), path.i1s(i), path.j1v(i), path.h1v(i), path.h1u(i), path.q1u(i));
   }
   function writeGpx(path) {
-    return GpxWriter_instance.l1j(toGpxDocument(path, VOID, 'virtualized'));
+    return GpxWriter_instance.r1t(toGpxDocument(path, VOID, 'virtualized'));
   }
   function enhance(path, options) {
     var tmp = GlobalScope_instance;
     return promise(tmp, VOID, VOID, enhance$slambda_0(options, path, null));
   }
+  function enhanceWithCourse(path, cyclist, bike, wind, power, options) {
+    var tmp = GlobalScope_instance;
+    return promise(tmp, VOID, VOID, enhanceWithCourse$slambda_0(options, path, cyclist, bike, wind, power, null));
+  }
+  function getField(path, i, fieldProp) {
+    var tmp0_elvis_lhs = Companion_getInstance_6().k1w(fieldProp);
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      // Inline function 'kotlin.error' call
+      var message = 'Unknown PointField prop: ' + fieldProp;
+      throw IllegalStateException_init_$Create$(toString(message));
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    var field = tmp;
+    return path.s1t(i, field);
+  }
+  function fieldDefinitions() {
+    // Inline function 'kotlin.collections.map' call
+    var this_0 = get_entries();
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+    var _iterator__ex2g4s = this_0.h();
+    while (_iterator__ex2g4s.i()) {
+      var item = _iterator__ex2g4s.j();
+      var o = {};
+      o.prop = item.e1w_1;
+      o.unit = item.f1w_1;
+      o.shortDescription = item.g1w_1;
+      o.categoryId = item.h1w_1.n1w_1;
+      o.categoryName = item.h1w_1.o1w_1;
+      o.notSelectable = item.i1w_1;
+      o.anglesInRadians = item.j1w_1;
+      // Inline function 'kotlin.js.unsafeCast' call
+      destination.n(o);
+    }
+    // Inline function 'kotlin.collections.toTypedArray' call
+    return copyToArray(destination);
+  }
+  function pathLatitudeDeg(path, i) {
+    return path.x1v(i);
+  }
+  function pathLongitudeDeg(path, i) {
+    return path.y1v(i);
+  }
   function pointObj(latitudeDeg, longitudeDeg, elevation, timeMs, speed, pComputedPower, distance, grade) {
     var o = {};
     o.latitudeDeg = latitudeDeg;
@@ -3178,32 +3269,77 @@
   function defaultJsOptions() {
     return new EnhanceOptions(false, true, true, false, new SimplifyPathOptions(false));
   }
+  function toCyclist(_this__u8e3s4) {
+    if (_this__u8e3s4 == null)
+      return new Cyclist();
+    return new Cyclist(_this__u8e3s4.massKg, _this__u8e3s4.maxBrakeG, _this__u8e3s4.cd, _this__u8e3s4.frontalAreaM2, _this__u8e3s4.maxLeanAngleDeg, _this__u8e3s4.maxSpeedKmH);
+  }
+  function toBike(_this__u8e3s4) {
+    if (_this__u8e3s4 == null)
+      return new Bike();
+    return new Bike(_this__u8e3s4.crr, _this__u8e3s4.inertiaFront, _this__u8e3s4.inertiaRear, _this__u8e3s4.wheelRadiusM, _this__u8e3s4.efficiency);
+  }
+  function toWindProvider(_this__u8e3s4) {
+    if (_this__u8e3s4 == null)
+      return WindProviderNone_instance;
+    return new WindProviderConstant(new Wind(_this__u8e3s4.windSpeed, _this__u8e3s4.windDirection * 3.141592653589793 / 180.0));
+  }
+  function toCyclistPowerProvider(_this__u8e3s4) {
+    if (_this__u8e3s4 == null)
+      return new PowerProviderConstant(250.0, false);
+    var tmp;
+    switch (_this__u8e3s4.type) {
+      case 'constant':
+        var tmp1_elvis_lhs = _this__u8e3s4.power;
+        var tmp_0 = tmp1_elvis_lhs == null ? 250.0 : tmp1_elvis_lhs;
+        var tmp2_elvis_lhs = _this__u8e3s4.useHarmonics;
+        tmp = new PowerProviderConstant(tmp_0, tmp2_elvis_lhs == null ? false : tmp2_elvis_lhs);
+        break;
+      case 'constant_tiring':
+        var tmp3_elvis_lhs = _this__u8e3s4.power;
+        var tmp_1 = tmp3_elvis_lhs == null ? 250.0 : tmp3_elvis_lhs;
+        var tmp4_elvis_lhs = _this__u8e3s4.useHarmonics;
+        var tmp_2 = tmp4_elvis_lhs == null ? false : tmp4_elvis_lhs;
+        var tmp5_elvis_lhs = _this__u8e3s4.tiringDuration;
+        tmp = new PowerProviderConstantWithTiring(tmp_1, tmp_2, tmp5_elvis_lhs == null ? 7200.0 : tmp5_elvis_lhs);
+        break;
+      case 'from_data':
+        tmp = PowerProviderFromData_instance;
+        break;
+      default:
+        // Inline function 'kotlin.error' call
+
+        var message = 'Unknown PowerProviderDto.type: ' + _this__u8e3s4.type;
+        throw IllegalStateException_init_$Create$(toString(message));
+    }
+    return tmp;
+  }
   function enhance$slambda($options, $path, resultContinuation) {
-    this.e1o_1 = $options;
-    this.f1o_1 = $path;
+    this.r1y_1 = $options;
+    this.s1y_1 = $path;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(enhance$slambda).h1o = function ($this$promise, $completion) {
-    var tmp = this.qz($this$promise, $completion);
-    tmp.w5_1 = Unit_instance;
-    tmp.x5_1 = null;
-    return tmp.c6();
+  protoOf(enhance$slambda).u1y = function ($this$promise, $completion) {
+    var tmp = this.q10($this$promise, $completion);
+    tmp.i6_1 = Unit_instance;
+    tmp.j6_1 = null;
+    return tmp.o6();
   };
-  protoOf(enhance$slambda).k6 = function (p1, $completion) {
-    return this.h1o((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+  protoOf(enhance$slambda).w6 = function (p1, $completion) {
+    return this.u1y((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(enhance$slambda).c6 = function () {
-    var suspendResult = this.w5_1;
+  protoOf(enhance$slambda).o6 = function () {
+    var suspendResult = this.i6_1;
     $sm: do
       try {
-        var tmp = this.u5_1;
+        var tmp = this.g6_1;
         switch (tmp) {
           case 0:
-            this.v5_1 = 2;
-            var opts = toEnhanceOptions(this.e1o_1);
-            var provider = opts.b1g_1 ? new ElevationProvider() : null;
-            this.u5_1 = 1;
-            suspendResult = Enhancer_instance.i1h(this.f1o_1, provider, opts, this);
+            this.h6_1 = 2;
+            var opts = toEnhanceOptions(this.r1y_1);
+            var provider = opts.h1q_1 ? new ElevationProvider() : null;
+            this.g6_1 = 1;
+            suspendResult = Enhancer_instance.o1r(this.s1y_1, provider, opts, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -3212,31 +3348,92 @@
           case 1:
             return suspendResult;
           case 2:
-            throw this.x5_1;
+            throw this.j6_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.v5_1 === 2) {
+        if (this.h6_1 === 2) {
           throw e;
         } else {
-          this.u5_1 = this.v5_1;
-          this.x5_1 = e;
+          this.g6_1 = this.h6_1;
+          this.j6_1 = e;
         }
       }
      while (true);
   };
-  protoOf(enhance$slambda).qz = function ($this$promise, completion) {
-    var i = new enhance$slambda(this.e1o_1, this.f1o_1, completion);
-    i.g1o_1 = $this$promise;
+  protoOf(enhance$slambda).q10 = function ($this$promise, completion) {
+    var i = new enhance$slambda(this.r1y_1, this.s1y_1, completion);
+    i.t1y_1 = $this$promise;
     return i;
   };
   function enhance$slambda_0($options, $path, resultContinuation) {
     var i = new enhance$slambda($options, $path, resultContinuation);
-    var l = function ($this$promise, $completion) {
-      return i.h1o($this$promise, $completion);
-    };
-    l.$arity = 1;
-    return l;
+    return constructCallableReference(function ($this$promise, $completion) {
+      return i.u1y($this$promise, $completion);
+    }, 1);
+  }
+  function enhanceWithCourse$slambda($options, $path, $cyclist, $bike, $wind, $power, resultContinuation) {
+    this.d1z_1 = $options;
+    this.e1z_1 = $path;
+    this.f1z_1 = $cyclist;
+    this.g1z_1 = $bike;
+    this.h1z_1 = $wind;
+    this.i1z_1 = $power;
+    CoroutineImpl.call(this, resultContinuation);
+  }
+  protoOf(enhanceWithCourse$slambda).u1y = function ($this$promise, $completion) {
+    var tmp = this.q10($this$promise, $completion);
+    tmp.i6_1 = Unit_instance;
+    tmp.j6_1 = null;
+    return tmp.o6();
+  };
+  protoOf(enhanceWithCourse$slambda).w6 = function (p1, $completion) {
+    return this.u1y((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+  };
+  protoOf(enhanceWithCourse$slambda).o6 = function () {
+    var suspendResult = this.i6_1;
+    $sm: do
+      try {
+        var tmp = this.g6_1;
+        switch (tmp) {
+          case 0:
+            this.h6_1 = 2;
+            var opts = toEnhanceOptions(this.d1z_1);
+            var provider = opts.h1q_1 ? new ElevationProvider() : null;
+            var course = new CoursePhysics(new Course(this.e1z_1, toCyclist(this.f1z_1), toBike(this.g1z_1)), RhoProviderEstimate_instance, AeroProviderConstant_instance, toWindProvider(this.h1z_1), toCyclistPowerProvider(this.i1z_1));
+            this.g6_1 = 1;
+            suspendResult = Enhancer_instance.p1r(course, opts, provider, this);
+            if (suspendResult === get_COROUTINE_SUSPENDED()) {
+              return suspendResult;
+            }
+
+            continue $sm;
+          case 1:
+            return suspendResult;
+          case 2:
+            throw this.j6_1;
+        }
+      } catch ($p) {
+        var e = $p;
+        if (this.h6_1 === 2) {
+          throw e;
+        } else {
+          this.g6_1 = this.h6_1;
+          this.j6_1 = e;
+        }
+      }
+     while (true);
+  };
+  protoOf(enhanceWithCourse$slambda).q10 = function ($this$promise, completion) {
+    var i = new enhanceWithCourse$slambda(this.d1z_1, this.e1z_1, this.f1z_1, this.g1z_1, this.h1z_1, this.i1z_1, completion);
+    i.j1z_1 = $this$promise;
+    return i;
+  };
+  function enhanceWithCourse$slambda_0($options, $path, $cyclist, $bike, $wind, $power, resultContinuation) {
+    var i = new enhanceWithCourse$slambda($options, $path, $cyclist, $bike, $wind, $power, resultContinuation);
+    return constructCallableReference(function ($this$promise, $completion) {
+      return i.u1y($this$promise, $completion);
+    }, 1);
   }
   //region block: init
   Enhancer_instance = new Enhancer();
@@ -3254,6 +3451,7 @@
   MaxSpeedComputer_instance = new MaxSpeedComputer();
   MuscularPowerProvider_instance = new MuscularPowerProvider();
   PowerComputer_instance = new PowerComputer();
+  PowerProviderFromData_instance = new PowerProviderFromData();
   RhoProviderDefault_instance = new RhoProviderDefault();
   RhoProviderEstimate_instance = new RhoProviderEstimate();
   RollingResistancePowerProvider_instance = new RollingResistancePowerProvider();
@@ -3276,6 +3474,11 @@
     engine.pointAt = pointAt;
     engine.writeGpx = writeGpx;
     engine.enhance = enhance;
+    engine.enhanceWithCourse = enhanceWithCourse;
+    engine.getField = getField;
+    engine.fieldDefinitions = fieldDefinitions;
+    engine.pathLatitudeDeg = pathLatitudeDeg;
+    engine.pathLongitudeDeg = pathLongitudeDeg;
   }
   $jsExportAll$(_);
   kotlin_io_github_glandais_elevation.$jsExportAll$(_);