@glandais/vcyclist-engine 2.0.0 → 3.1.0

package/vcyclist-engine.js

@@ -25,78 +25,89 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.y5;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.k5;
+  var hypot = Math.hypot;
+  var sign = Math.sign;
+  var protoOf = kotlin_kotlin.$_$.t6;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.f6;
   var VOID = kotlin_kotlin.$_$.a;
-  var getNumberHashCode = kotlin_kotlin.$_$.f5;
-  var equals = kotlin_kotlin.$_$.d5;
-  var initMetadataForClass = kotlin_kotlin.$_$.j5;
-  var toString = kotlin_kotlin.$_$.a6;
-  var hashCode = kotlin_kotlin.$_$.i5;
-  var getBooleanHashCode = kotlin_kotlin.$_$.e5;
-  var CoroutineImpl = kotlin_kotlin.$_$.d4;
-  var PointPerDistance_instance = kotlin_io_github_glandais_gpx.$_$.h;
-  var ElevationStep_instance = kotlin_io_github_glandais_gpx.$_$.e;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.o3;
-  var Unit_instance = kotlin_kotlin.$_$.t;
-  var PointPerSecond_instance = kotlin_io_github_glandais_gpx.$_$.i;
-  var PathSimplifier_instance = kotlin_io_github_glandais_gpx.$_$.f;
-  var initMetadataForCoroutine = kotlin_kotlin.$_$.l5;
-  var initMetadataForObject = kotlin_kotlin.$_$.p5;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.x;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.m1;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.w;
-  var last = kotlin_kotlin.$_$.y2;
-  var toIntArray = kotlin_kotlin.$_$.i3;
-  var sortedWith = kotlin_kotlin.$_$.g3;
-  var toMutableList = kotlin_kotlin.$_$.l3;
-  var first = kotlin_kotlin.$_$.s2;
-  var removeAll = kotlin_kotlin.$_$.c3;
-  var numberRangeToNumber = kotlin_kotlin.$_$.u5;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.j2;
-  var Vector3D = kotlin_io_github_glandais_elevation.$_$.h;
-  var emptyList = kotlin_kotlin.$_$.p2;
-  var coerceIn = kotlin_kotlin.$_$.h6;
+  var getNumberHashCode = kotlin_kotlin.$_$.a6;
+  var equals = kotlin_kotlin.$_$.x5;
+  var initMetadataForClass = kotlin_kotlin.$_$.e6;
+  var toString = kotlin_kotlin.$_$.w6;
+  var hashCode = kotlin_kotlin.$_$.d6;
+  var getBooleanHashCode = kotlin_kotlin.$_$.z5;
+  var CoroutineImpl = kotlin_kotlin.$_$.s4;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.y1;
+  var Unit_instance = kotlin_kotlin.$_$.f1;
+  var PointPerDistance_instance = kotlin_io_github_glandais_gpx.$_$.k;
+  var ElevationStep_instance = kotlin_io_github_glandais_gpx.$_$.h;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.d4;
+  var PointPerSecond_instance = kotlin_io_github_glandais_gpx.$_$.l;
+  var PathSimplifier_instance = kotlin_io_github_glandais_gpx.$_$.i;
+  var initMetadataForCoroutine = kotlin_kotlin.$_$.g6;
+  var initMetadataForObject = kotlin_kotlin.$_$.k6;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.i1;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.h1;
+  var last = kotlin_kotlin.$_$.l3;
+  var toIntArray = kotlin_kotlin.$_$.w3;
+  var sortedWith = kotlin_kotlin.$_$.u3;
+  var toMutableList = kotlin_kotlin.$_$.z3;
+  var first = kotlin_kotlin.$_$.f3;
+  var removeAll = kotlin_kotlin.$_$.p3;
+  var numberRangeToNumber = kotlin_kotlin.$_$.p6;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.v2;
+  var Vector3D = kotlin_io_github_glandais_elevation.$_$.g;
+  var emptyList = kotlin_kotlin.$_$.c3;
+  var coerceIn = kotlin_kotlin.$_$.d7;
   var DouglasPeucker_instance = kotlin_io_github_glandais_elevation.$_$.b;
-  var FunctionAdapter = kotlin_kotlin.$_$.t4;
-  var isInterface = kotlin_kotlin.$_$.r5;
-  var Comparator = kotlin_kotlin.$_$.w7;
-  var compareValues = kotlin_kotlin.$_$.m3;
-  var until = kotlin_kotlin.$_$.l6;
-  var Default_getInstance = kotlin_kotlin.$_$.p;
-  var PointField_TEMPERATURE_getInstance = kotlin_io_github_glandais_gpx.$_$.j;
-  var isNaN_0 = kotlin_kotlin.$_$.n8;
-  var get_entries = kotlin_io_github_glandais_gpx.$_$.s;
-  var Path = kotlin_io_github_glandais_gpx.$_$.r;
-  var GpxParser_instance = kotlin_io_github_glandais_gpx.$_$.a;
-  var copyToArray = kotlin_kotlin.$_$.o2;
-  var firstTrackAsPath = kotlin_io_github_glandais_gpx.$_$.l;
-  var tracksAsPaths = kotlin_io_github_glandais_gpx.$_$.o;
-  var segmentsAsPaths = kotlin_io_github_glandais_gpx.$_$.m;
-  var GpxWriter_instance = kotlin_io_github_glandais_gpx.$_$.b;
-  var toList = kotlin_kotlin.$_$.k3;
-  var toGpxDocument = kotlin_io_github_glandais_gpx.$_$.n;
-  var Companion_getInstance = kotlin_kotlin.$_$.r;
-  var numberToLong = kotlin_kotlin.$_$.q4;
+  var FunctionAdapter = kotlin_kotlin.$_$.l5;
+  var isInterface = kotlin_kotlin.$_$.m6;
+  var Comparator = kotlin_kotlin.$_$.u8;
+  var compareValues = kotlin_kotlin.$_$.b4;
+  var until = kotlin_kotlin.$_$.h7;
+  var Pair = kotlin_kotlin.$_$.b9;
+  var listOf = kotlin_kotlin.$_$.m3;
+  var Default_getInstance = kotlin_kotlin.$_$.a1;
+  var PointField_TEMPERATURE_getInstance = kotlin_io_github_glandais_gpx.$_$.c;
+  var isNaN_0 = kotlin_kotlin.$_$.p9;
+  var get_entries = kotlin_io_github_glandais_gpx.$_$.u;
+  var Path = kotlin_io_github_glandais_gpx.$_$.t;
+  var GpxParser_instance = kotlin_io_github_glandais_gpx.$_$.d;
+  var copyToArray = kotlin_kotlin.$_$.b3;
+  var firstTrackAsPath = kotlin_io_github_glandais_gpx.$_$.n;
+  var tracksAsPaths = kotlin_io_github_glandais_gpx.$_$.q;
+  var segmentsAsPaths = kotlin_io_github_glandais_gpx.$_$.o;
+  var GpxPathKind_TRACK_getInstance = kotlin_io_github_glandais_gpx.$_$.b;
+  var setOf = kotlin_kotlin.$_$.s3;
+  var GpxPathKind_ROUTE_getInstance = kotlin_io_github_glandais_gpx.$_$.a;
+  var GpxWriter_instance = kotlin_io_github_glandais_gpx.$_$.e;
+  var toList = kotlin_kotlin.$_$.y3;
+  var toGpxDocument = kotlin_io_github_glandais_gpx.$_$.p;
+  var Companion_getInstance = kotlin_kotlin.$_$.c1;
+  var numberToLong = kotlin_kotlin.$_$.h5;
   var GlobalScope_instance = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.a;
   var promise = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.j;
-  var Companion_getInstance_0 = kotlin_io_github_glandais_gpx.$_$.g;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.o1;
-  var CsvWriter_instance = kotlin_io_github_glandais_gpx.$_$.c;
-  var firstOrNull = kotlin_kotlin.$_$.z6;
+  var Companion_getInstance_0 = kotlin_io_github_glandais_gpx.$_$.j;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.a2;
+  var CsvWriter_instance = kotlin_io_github_glandais_gpx.$_$.f;
+  var firstOrNull = kotlin_kotlin.$_$.w7;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.b;
-  var Char = kotlin_kotlin.$_$.v7;
-  var CsvOptions = kotlin_io_github_glandais_gpx.$_$.p;
-  var JsonWriter_instance = kotlin_io_github_glandais_gpx.$_$.d;
-  var JsonOptions = kotlin_io_github_glandais_gpx.$_$.q;
+  var Char = kotlin_kotlin.$_$.t8;
+  var CsvOptions = kotlin_io_github_glandais_gpx.$_$.r;
+  var JsonWriter_instance = kotlin_io_github_glandais_gpx.$_$.g;
+  var JsonOptions = kotlin_io_github_glandais_gpx.$_$.s;
   var toFitBytes = kotlin_io_github_glandais_fit.$_$.a;
-  var toNumber = kotlin_kotlin.$_$.s4;
-  var GpxWaypoint = kotlin_io_github_glandais_gpx.$_$.k;
-  var THROW_CCE = kotlin_kotlin.$_$.g8;
+  var Companion_getInstance_1 = kotlin_kotlin.$_$.b1;
+  var DurationUnit_MILLISECONDS_getInstance = kotlin_kotlin.$_$.v;
+  var toDuration = kotlin_kotlin.$_$.s8;
+  var toFitBytes_0 = kotlin_io_github_glandais_fit.$_$.b;
+  var toNumber = kotlin_kotlin.$_$.k5;
+  var GpxWaypoint = kotlin_io_github_glandais_gpx.$_$.m;
+  var THROW_CCE = kotlin_kotlin.$_$.e9;
   var CoroutineScope = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.h;
-  var ElevationProvider = kotlin_io_github_glandais_elevation.$_$.e;
-  var initMetadataForLambda = kotlin_kotlin.$_$.o5;
-  var constructCallableReference = kotlin_kotlin.$_$.b5;
+  var ElevationProvider = kotlin_io_github_glandais_elevation.$_$.d;
+  var initMetadataForLambda = kotlin_kotlin.$_$.j6;
+  var constructCallableReference = kotlin_kotlin.$_$.u5;
   //endregion
   //region block: pre-declaration
   initMetadataForCompanion(Companion);
@@ -147,36 +158,36 @@
   //endregion
   function Companion() {
     Companion_instance = this;
-    this.m1y_1 = new Bike();
+    this.DEFAULT_1 = new Bike();
   }
   var Companion_instance;
-  function Companion_getInstance_1() {
+  function Companion_getInstance_2() {
     if (Companion_instance == null)
       new Companion();
     return Companion_instance;
   }
   function Bike(crr, inertiaFront, inertiaRear, wheelRadiusM, efficiency) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     crr = crr === VOID ? 0.004 : crr;
     inertiaFront = inertiaFront === VOID ? 0.05 : inertiaFront;
     inertiaRear = inertiaRear === VOID ? 0.07 : inertiaRear;
     wheelRadiusM = wheelRadiusM === VOID ? 0.7 : wheelRadiusM;
     efficiency = efficiency === VOID ? 0.976 : efficiency;
-    this.n1y_1 = crr;
-    this.o1y_1 = inertiaFront;
-    this.p1y_1 = inertiaRear;
-    this.q1y_1 = wheelRadiusM;
-    this.r1y_1 = efficiency;
+    this.crr_1 = crr;
+    this.inertiaFront_1 = inertiaFront;
+    this.inertiaRear_1 = inertiaRear;
+    this.wheelRadiusM_1 = wheelRadiusM;
+    this.efficiency_1 = efficiency;
   }
   protoOf(Bike).toString = function () {
-    return 'Bike(crr=' + this.n1y_1 + ', inertiaFront=' + this.o1y_1 + ', inertiaRear=' + this.p1y_1 + ', wheelRadiusM=' + this.q1y_1 + ', efficiency=' + this.r1y_1 + ')';
+    return 'Bike(crr=' + this.crr_1 + ', inertiaFront=' + this.inertiaFront_1 + ', inertiaRear=' + this.inertiaRear_1 + ', wheelRadiusM=' + this.wheelRadiusM_1 + ', efficiency=' + this.efficiency_1 + ')';
   };
   protoOf(Bike).hashCode = function () {
-    var result = getNumberHashCode(this.n1y_1);
-    result = imul(result, 31) + getNumberHashCode(this.o1y_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p1y_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.q1y_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r1y_1) | 0;
+    var result = getNumberHashCode(this.crr_1);
+    result = imul(result, 31) + getNumberHashCode(this.inertiaFront_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.inertiaRear_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.wheelRadiusM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.efficiency_1) | 0;
     return result;
   };
   protoOf(Bike).equals = function (other) {
@@ -184,41 +195,41 @@
       return true;
     if (!(other instanceof Bike))
       return false;
-    if (!equals(this.n1y_1, other.n1y_1))
+    if (!equals(this.crr_1, other.crr_1))
       return false;
-    if (!equals(this.o1y_1, other.o1y_1))
+    if (!equals(this.inertiaFront_1, other.inertiaFront_1))
       return false;
-    if (!equals(this.p1y_1, other.p1y_1))
+    if (!equals(this.inertiaRear_1, other.inertiaRear_1))
       return false;
-    if (!equals(this.q1y_1, other.q1y_1))
+    if (!equals(this.wheelRadiusM_1, other.wheelRadiusM_1))
       return false;
-    if (!equals(this.r1y_1, other.r1y_1))
+    if (!equals(this.efficiency_1, other.efficiency_1))
       return false;
     return true;
   };
   function Course(path, cyclist, bike) {
-    cyclist = cyclist === VOID ? Companion_getInstance_3().s1y_1 : cyclist;
-    bike = bike === VOID ? Companion_getInstance_1().m1y_1 : bike;
-    this.t1y_1 = path;
-    this.u1y_1 = cyclist;
-    this.v1y_1 = bike;
+    cyclist = cyclist === VOID ? Companion_getInstance_4().DEFAULT_1 : cyclist;
+    bike = bike === VOID ? Companion_getInstance_2().DEFAULT_1 : bike;
+    this.path_1 = path;
+    this.cyclist_1 = cyclist;
+    this.bike_1 = bike;
   }
-  protoOf(Course).w1y = function (path, cyclist, bike) {
+  protoOf(Course).copy_yzntdp_k$ = function (path, cyclist, bike) {
     return new Course(path, cyclist, bike);
   };
-  protoOf(Course).x1y = function (path, cyclist, bike, $super) {
-    path = path === VOID ? this.t1y_1 : path;
-    cyclist = cyclist === VOID ? this.u1y_1 : cyclist;
-    bike = bike === VOID ? this.v1y_1 : bike;
-    return $super === VOID ? this.w1y(path, cyclist, bike) : $super.w1y.call(this, path, cyclist, bike);
+  protoOf(Course).copy$default_mmxsnj_k$ = function (path, cyclist, bike, $super) {
+    path = path === VOID ? this.path_1 : path;
+    cyclist = cyclist === VOID ? this.cyclist_1 : cyclist;
+    bike = bike === VOID ? this.bike_1 : bike;
+    return $super === VOID ? this.copy_yzntdp_k$(path, cyclist, bike) : $super.copy_yzntdp_k$.call(this, path, cyclist, bike);
   };
   protoOf(Course).toString = function () {
-    return 'Course(path=' + toString(this.t1y_1) + ', cyclist=' + this.u1y_1.toString() + ', bike=' + this.v1y_1.toString() + ')';
+    return 'Course(path=' + toString(this.path_1) + ', cyclist=' + this.cyclist_1.toString() + ', bike=' + this.bike_1.toString() + ')';
   };
   protoOf(Course).hashCode = function () {
-    var result = hashCode(this.t1y_1);
-    result = imul(result, 31) + this.u1y_1.hashCode() | 0;
-    result = imul(result, 31) + this.v1y_1.hashCode() | 0;
+    var result = hashCode(this.path_1);
+    result = imul(result, 31) + this.cyclist_1.hashCode() | 0;
+    result = imul(result, 31) + this.bike_1.hashCode() | 0;
     return result;
   };
   protoOf(Course).equals = function (other) {
@@ -226,65 +237,65 @@
       return true;
     if (!(other instanceof Course))
       return false;
-    if (!equals(this.t1y_1, other.t1y_1))
+    if (!equals(this.path_1, other.path_1))
       return false;
-    if (!this.u1y_1.equals(other.u1y_1))
+    if (!this.cyclist_1.equals(other.cyclist_1))
       return false;
-    if (!this.v1y_1.equals(other.v1y_1))
+    if (!this.bike_1.equals(other.bike_1))
       return false;
     return true;
   };
   function Companion_0() {
     Companion_instance_0 = this;
-    this.y1y_1 = new PowerProviderConstant(280.0);
+    this.DEFAULT_CYCLIST_POWER_PROVIDER_1 = new PowerProviderConstant(280.0);
   }
   var Companion_instance_0;
-  function Companion_getInstance_2() {
+  function Companion_getInstance_3() {
     if (Companion_instance_0 == null)
       new Companion_0();
     return Companion_instance_0;
   }
   function CoursePhysics(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
-    Companion_getInstance_2();
+    Companion_getInstance_3();
     rhoProvider = rhoProvider === VOID ? RhoProviderDefault_instance : rhoProvider;
     aeroProvider = aeroProvider === VOID ? AeroProviderConstant_instance : aeroProvider;
     windProvider = windProvider === VOID ? WindProviderNone_instance : windProvider;
-    cyclistPowerProvider = cyclistPowerProvider === VOID ? Companion_getInstance_2().y1y_1 : cyclistPowerProvider;
-    this.z1y_1 = course;
-    this.a1z_1 = rhoProvider;
-    this.b1z_1 = aeroProvider;
-    this.c1z_1 = windProvider;
-    this.d1z_1 = cyclistPowerProvider;
+    cyclistPowerProvider = cyclistPowerProvider === VOID ? Companion_getInstance_3().DEFAULT_CYCLIST_POWER_PROVIDER_1 : cyclistPowerProvider;
+    this.course_1 = course;
+    this.rhoProvider_1 = rhoProvider;
+    this.aeroProvider_1 = aeroProvider;
+    this.windProvider_1 = windProvider;
+    this.cyclistPowerProvider_1 = cyclistPowerProvider;
   }
-  protoOf(CoursePhysics).e1z = function () {
-    return this.z1y_1.t1y_1;
+  protoOf(CoursePhysics).get_path_wos8ry_k$ = function () {
+    return this.course_1.path_1;
   };
-  protoOf(CoursePhysics).f1z = function () {
-    return this.z1y_1.u1y_1;
+  protoOf(CoursePhysics).get_cyclist_lkc0de_k$ = function () {
+    return this.course_1.cyclist_1;
   };
-  protoOf(CoursePhysics).g1z = function () {
-    return this.z1y_1.v1y_1;
+  protoOf(CoursePhysics).get_bike_wojgoa_k$ = function () {
+    return this.course_1.bike_1;
   };
-  protoOf(CoursePhysics).h1z = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
+  protoOf(CoursePhysics).copy_ulppn1_k$ = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
     return new CoursePhysics(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
   };
-  protoOf(CoursePhysics).i1z = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider, $super) {
-    course = course === VOID ? this.z1y_1 : course;
-    rhoProvider = rhoProvider === VOID ? this.a1z_1 : rhoProvider;
-    aeroProvider = aeroProvider === VOID ? this.b1z_1 : aeroProvider;
-    windProvider = windProvider === VOID ? this.c1z_1 : windProvider;
-    cyclistPowerProvider = cyclistPowerProvider === VOID ? this.d1z_1 : cyclistPowerProvider;
-    return $super === VOID ? this.h1z(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) : $super.h1z.call(this, course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
+  protoOf(CoursePhysics).copy$default_a3dskc_k$ = function (course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider, $super) {
+    course = course === VOID ? this.course_1 : course;
+    rhoProvider = rhoProvider === VOID ? this.rhoProvider_1 : rhoProvider;
+    aeroProvider = aeroProvider === VOID ? this.aeroProvider_1 : aeroProvider;
+    windProvider = windProvider === VOID ? this.windProvider_1 : windProvider;
+    cyclistPowerProvider = cyclistPowerProvider === VOID ? this.cyclistPowerProvider_1 : cyclistPowerProvider;
+    return $super === VOID ? this.copy_ulppn1_k$(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) : $super.copy_ulppn1_k$.call(this, course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider);
   };
   protoOf(CoursePhysics).toString = function () {
-    return 'CoursePhysics(course=' + this.z1y_1.toString() + ', rhoProvider=' + toString(this.a1z_1) + ', aeroProvider=' + toString(this.b1z_1) + ', windProvider=' + toString(this.c1z_1) + ', cyclistPowerProvider=' + toString(this.d1z_1) + ')';
+    return 'CoursePhysics(course=' + this.course_1.toString() + ', rhoProvider=' + toString(this.rhoProvider_1) + ', aeroProvider=' + toString(this.aeroProvider_1) + ', windProvider=' + toString(this.windProvider_1) + ', cyclistPowerProvider=' + toString(this.cyclistPowerProvider_1) + ')';
   };
   protoOf(CoursePhysics).hashCode = function () {
-    var result = this.z1y_1.hashCode();
-    result = imul(result, 31) + hashCode(this.a1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.b1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.c1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.d1z_1) | 0;
+    var result = this.course_1.hashCode();
+    result = imul(result, 31) + hashCode(this.rhoProvider_1) | 0;
+    result = imul(result, 31) + hashCode(this.aeroProvider_1) | 0;
+    result = imul(result, 31) + hashCode(this.windProvider_1) | 0;
+    result = imul(result, 31) + hashCode(this.cyclistPowerProvider_1) | 0;
     return result;
   };
   protoOf(CoursePhysics).equals = function (other) {
@@ -292,64 +303,64 @@
       return true;
     if (!(other instanceof CoursePhysics))
       return false;
-    if (!this.z1y_1.equals(other.z1y_1))
+    if (!this.course_1.equals(other.course_1))
       return false;
-    if (!equals(this.a1z_1, other.a1z_1))
+    if (!equals(this.rhoProvider_1, other.rhoProvider_1))
       return false;
-    if (!equals(this.b1z_1, other.b1z_1))
+    if (!equals(this.aeroProvider_1, other.aeroProvider_1))
       return false;
-    if (!equals(this.c1z_1, other.c1z_1))
+    if (!equals(this.windProvider_1, other.windProvider_1))
       return false;
-    if (!equals(this.d1z_1, other.d1z_1))
+    if (!equals(this.cyclistPowerProvider_1, other.cyclistPowerProvider_1))
       return false;
     return true;
   };
   function Companion_1() {
     Companion_instance_1 = this;
-    this.s1y_1 = new Cyclist();
+    this.DEFAULT_1 = new Cyclist();
   }
   var Companion_instance_1;
-  function Companion_getInstance_3() {
+  function Companion_getInstance_4() {
     if (Companion_instance_1 == null)
       new Companion_1();
     return Companion_instance_1;
   }
   function Cyclist(massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH) {
-    Companion_getInstance_3();
+    Companion_getInstance_4();
     massKg = massKg === VOID ? 80.0 : massKg;
     maxBrakeG = maxBrakeG === VOID ? 0.6 : maxBrakeG;
     cd = cd === VOID ? 0.7 : cd;
     frontalAreaM2 = frontalAreaM2 === VOID ? 0.5 : frontalAreaM2;
     maxLeanAngleDeg = maxLeanAngleDeg === VOID ? 35.0 : maxLeanAngleDeg;
     maxSpeedKmH = maxSpeedKmH === VOID ? 100.0 : maxSpeedKmH;
-    this.j1z_1 = massKg;
-    this.k1z_1 = maxBrakeG;
-    this.l1z_1 = cd;
-    this.m1z_1 = frontalAreaM2;
-    this.n1z_1 = maxLeanAngleDeg;
-    this.o1z_1 = maxSpeedKmH;
-  }
-  protoOf(Cyclist).p1z = function () {
+    this.massKg_1 = massKg;
+    this.maxBrakeG_1 = maxBrakeG;
+    this.cd_1 = cd;
+    this.frontalAreaM2__1 = frontalAreaM2;
+    this.maxLeanAngleDeg_1 = maxLeanAngleDeg;
+    this.maxSpeedKmH_1 = maxSpeedKmH;
+  }
+  protoOf(Cyclist).get_tanMaxLeanAngle_qqiag1_k$ = function () {
     // Inline function 'kotlin.math.tan' call
-    var x = this.n1z_1 * 3.141592653589793 / 180.0;
+    var x = this.maxLeanAngleDeg_1 * 3.141592653589793 / 180.0;
     return Math.tan(x);
   };
-  protoOf(Cyclist).q1z = function () {
-    return this.k1z_1 * 9.8;
+  protoOf(Cyclist).get_maxBrakeMS2_nzouxw_k$ = function () {
+    return this.maxBrakeG_1 * 9.8;
   };
-  protoOf(Cyclist).r1z = function () {
-    return this.o1z_1 / 3.6;
+  protoOf(Cyclist).get_maxSpeedMS_xz2r7y_k$ = function () {
+    return this.maxSpeedKmH_1 / 3.6;
   };
   protoOf(Cyclist).toString = function () {
-    return 'Cyclist(massKg=' + this.j1z_1 + ', maxBrakeG=' + this.k1z_1 + ', cd=' + this.l1z_1 + ', frontalAreaM2=' + this.m1z_1 + ', maxLeanAngleDeg=' + this.n1z_1 + ', maxSpeedKmH=' + this.o1z_1 + ')';
+    return 'Cyclist(massKg=' + this.massKg_1 + ', maxBrakeG=' + this.maxBrakeG_1 + ', cd=' + this.cd_1 + ', frontalAreaM2=' + this.frontalAreaM2__1 + ', maxLeanAngleDeg=' + this.maxLeanAngleDeg_1 + ', maxSpeedKmH=' + this.maxSpeedKmH_1 + ')';
   };
   protoOf(Cyclist).hashCode = function () {
-    var result = getNumberHashCode(this.j1z_1);
-    result = imul(result, 31) + getNumberHashCode(this.k1z_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.l1z_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.m1z_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.n1z_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.o1z_1) | 0;
+    var result = getNumberHashCode(this.massKg_1);
+    result = imul(result, 31) + getNumberHashCode(this.maxBrakeG_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.cd_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.frontalAreaM2__1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.maxLeanAngleDeg_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.maxSpeedKmH_1) | 0;
     return result;
   };
   protoOf(Cyclist).equals = function (other) {
@@ -357,17 +368,17 @@
       return true;
     if (!(other instanceof Cyclist))
       return false;
-    if (!equals(this.j1z_1, other.j1z_1))
+    if (!equals(this.massKg_1, other.massKg_1))
       return false;
-    if (!equals(this.k1z_1, other.k1z_1))
+    if (!equals(this.maxBrakeG_1, other.maxBrakeG_1))
       return false;
-    if (!equals(this.l1z_1, other.l1z_1))
+    if (!equals(this.cd_1, other.cd_1))
       return false;
-    if (!equals(this.m1z_1, other.m1z_1))
+    if (!equals(this.frontalAreaM2__1, other.frontalAreaM2__1))
       return false;
-    if (!equals(this.n1z_1, other.n1z_1))
+    if (!equals(this.maxLeanAngleDeg_1, other.maxLeanAngleDeg_1))
       return false;
-    if (!equals(this.o1z_1, other.o1z_1))
+    if (!equals(this.maxSpeedKmH_1, other.maxSpeedKmH_1))
       return false;
     return true;
   };
@@ -375,17 +386,17 @@
     enabled = enabled === VOID ? true : enabled;
     toleranceM = toleranceM === VOID ? 10.0 : toleranceM;
     zExaggeration = zExaggeration === VOID ? 3.0 : zExaggeration;
-    this.s1z_1 = enabled;
-    this.t1z_1 = toleranceM;
-    this.u1z_1 = zExaggeration;
+    this.enabled_1 = enabled;
+    this.toleranceM_1 = toleranceM;
+    this.zExaggeration_1 = zExaggeration;
   }
   protoOf(SimplifyPathOptions).toString = function () {
-    return 'SimplifyPathOptions(enabled=' + this.s1z_1 + ', toleranceM=' + this.t1z_1 + ', zExaggeration=' + this.u1z_1 + ')';
+    return 'SimplifyPathOptions(enabled=' + this.enabled_1 + ', toleranceM=' + this.toleranceM_1 + ', zExaggeration=' + this.zExaggeration_1 + ')';
   };
   protoOf(SimplifyPathOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.s1z_1);
-    result = imul(result, 31) + getNumberHashCode(this.t1z_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u1z_1) | 0;
+    var result = getBooleanHashCode(this.enabled_1);
+    result = imul(result, 31) + getNumberHashCode(this.toleranceM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.zExaggeration_1) | 0;
     return result;
   };
   protoOf(SimplifyPathOptions).equals = function (other) {
@@ -393,46 +404,57 @@
       return true;
     if (!(other instanceof SimplifyPathOptions))
       return false;
-    if (!(this.s1z_1 === other.s1z_1))
+    if (!(this.enabled_1 === other.enabled_1))
       return false;
-    if (!equals(this.t1z_1, other.t1z_1))
+    if (!equals(this.toleranceM_1, other.toleranceM_1))
       return false;
-    if (!equals(this.u1z_1, other.u1z_1))
+    if (!equals(this.zExaggeration_1, other.zExaggeration_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_2 = this;
-    this.v1z_1 = new EnhanceOptions();
+    this.DEFAULT_1 = new EnhanceOptions();
   }
   var Companion_instance_2;
-  function Companion_getInstance_4() {
+  function Companion_getInstance_5() {
     if (Companion_instance_2 == null)
       new Companion_2();
     return Companion_instance_2;
   }
   function EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath) {
-    Companion_getInstance_4();
+    Companion_getInstance_5();
     fixElevation = fixElevation === VOID ? true : fixElevation;
     computeMaxSpeeds = computeMaxSpeeds === VOID ? true : computeMaxSpeeds;
     virtualizeTrack = virtualizeTrack === VOID ? true : virtualizeTrack;
     computeOnePointPerSecond = computeOnePointPerSecond === VOID ? true : computeOnePointPerSecond;
     simplifyPath = simplifyPath === VOID ? new SimplifyPathOptions() : simplifyPath;
-    this.w1z_1 = fixElevation;
-    this.x1z_1 = computeMaxSpeeds;
-    this.y1z_1 = virtualizeTrack;
-    this.z1z_1 = computeOnePointPerSecond;
-    this.a20_1 = simplifyPath;
-  }
+    this.fixElevation_1 = fixElevation;
+    this.computeMaxSpeeds_1 = computeMaxSpeeds;
+    this.virtualizeTrack_1 = virtualizeTrack;
+    this.computeOnePointPerSecond_1 = computeOnePointPerSecond;
+    this.simplifyPath_1 = simplifyPath;
+  }
+  protoOf(EnhanceOptions).copy_8buhav_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath) {
+    return new EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath);
+  };
+  protoOf(EnhanceOptions).copy$default_9zz8ww_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, $super) {
+    fixElevation = fixElevation === VOID ? this.fixElevation_1 : fixElevation;
+    computeMaxSpeeds = computeMaxSpeeds === VOID ? this.computeMaxSpeeds_1 : computeMaxSpeeds;
+    virtualizeTrack = virtualizeTrack === VOID ? this.virtualizeTrack_1 : virtualizeTrack;
+    computeOnePointPerSecond = computeOnePointPerSecond === VOID ? this.computeOnePointPerSecond_1 : computeOnePointPerSecond;
+    simplifyPath = simplifyPath === VOID ? this.simplifyPath_1 : simplifyPath;
+    return $super === VOID ? this.copy_8buhav_k$(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath) : $super.copy_8buhav_k$.call(this, fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath);
+  };
   protoOf(EnhanceOptions).toString = function () {
-    return 'EnhanceOptions(fixElevation=' + this.w1z_1 + ', computeMaxSpeeds=' + this.x1z_1 + ', virtualizeTrack=' + this.y1z_1 + ', computeOnePointPerSecond=' + this.z1z_1 + ', simplifyPath=' + this.a20_1.toString() + ')';
+    return 'EnhanceOptions(fixElevation=' + this.fixElevation_1 + ', computeMaxSpeeds=' + this.computeMaxSpeeds_1 + ', virtualizeTrack=' + this.virtualizeTrack_1 + ', computeOnePointPerSecond=' + this.computeOnePointPerSecond_1 + ', simplifyPath=' + this.simplifyPath_1.toString() + ')';
   };
   protoOf(EnhanceOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.w1z_1);
-    result = imul(result, 31) + getBooleanHashCode(this.x1z_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.y1z_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.z1z_1) | 0;
-    result = imul(result, 31) + this.a20_1.hashCode() | 0;
+    var result = getBooleanHashCode(this.fixElevation_1);
+    result = imul(result, 31) + getBooleanHashCode(this.computeMaxSpeeds_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.virtualizeTrack_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.computeOnePointPerSecond_1) | 0;
+    result = imul(result, 31) + this.simplifyPath_1.hashCode() | 0;
     return result;
   };
   protoOf(EnhanceOptions).equals = function (other) {
@@ -440,161 +462,166 @@
       return true;
     if (!(other instanceof EnhanceOptions))
       return false;
-    if (!(this.w1z_1 === other.w1z_1))
+    if (!(this.fixElevation_1 === other.fixElevation_1))
       return false;
-    if (!(this.x1z_1 === other.x1z_1))
+    if (!(this.computeMaxSpeeds_1 === other.computeMaxSpeeds_1))
       return false;
-    if (!(this.y1z_1 === other.y1z_1))
+    if (!(this.virtualizeTrack_1 === other.virtualizeTrack_1))
       return false;
-    if (!(this.z1z_1 === other.z1z_1))
+    if (!(this.computeOnePointPerSecond_1 === other.computeOnePointPerSecond_1))
       return false;
-    if (!this.a20_1.equals(other.a20_1))
+    if (!this.simplifyPath_1.equals(other.simplifyPath_1))
       return false;
     return true;
   };
   function $enhanceCourseCOROUTINE$(_this__u8e3s4, course, options, elevationProvider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.j20_1 = _this__u8e3s4;
-    this.k20_1 = course;
-    this.l20_1 = options;
-    this.m20_1 = elevationProvider;
+    this._this__u8e3s4__1 = _this__u8e3s4;
+    this.course_1 = course;
+    this.options_1 = options;
+    this.elevationProvider_1 = elevationProvider;
   }
-  protoOf($enhanceCourseCOROUTINE$).p6 = function () {
-    var suspendResult = this.j6_1;
+  protoOf($enhanceCourseCOROUTINE$).doResume_5yljmg_k$ = function () {
+    var suspendResult = this.result_1;
     $sm: do
       try {
-        var tmp = this.h6_1;
+        var tmp = this.state_1;
         switch (tmp) {
           case 0:
-            this.i6_1 = 3;
-            this.n20_1 = this.k20_1.e1z();
-            this.n20_1 = PointPerDistance_instance.p1w(this.n20_1, -1.0, 30.0);
-            if (this.l20_1.w1z_1 && !(this.m20_1 == null)) {
-              this.h6_1 = 1;
-              suspendResult = ElevationStep_instance.g1u(this.n20_1, this.m20_1, this);
+            this.exceptionState_1 = 3;
+            if (!(!this.options_1.fixElevation_1 || !(this.elevationProvider_1 == null))) {
+              var message = 'fixElevation = true but elevationProvider is null. Pass a provider, or set fixElevation = false (enhanceCourseDefault resolves this automatically).';
+              throw IllegalArgumentException_init_$Create$(toString(message));
+            }
+
+            this.path0__1 = this.course_1.get_path_wos8ry_k$();
+            this.path0__1 = PointPerDistance_instance.compute_7vlifv_k$(this.path0__1, -1.0, 30.0);
+            if (this.options_1.fixElevation_1 && !(this.elevationProvider_1 == null)) {
+              this.state_1 = 1;
+              suspendResult = ElevationStep_instance.fixElevation_nhpf8r_k$(this.path0__1, this.elevationProvider_1, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              this.h6_1 = 2;
+              this.state_1 = 2;
               continue $sm;
             }
 
           case 1:
-            this.n20_1 = suspendResult;
-            this.h6_1 = 2;
+            this.path0__1 = suspendResult;
+            this.state_1 = 2;
             continue $sm;
           case 2:
-            this.n20_1 = PointPerDistance_instance.p1w(this.n20_1, 1.0, 2.0);
-            this.n20_1 = ElevationStep_instance.j1u(this.n20_1);
-            var working = this.k20_1.i1z(this.k20_1.z1y_1.x1y(this.n20_1));
-            if (this.l20_1.x1z_1 || this.l20_1.y1z_1) {
-              MaxSpeedComputer_instance.t20(working.z1y_1);
+            this.path0__1 = PointPerDistance_instance.compute_7vlifv_k$(this.path0__1, 1.0, 2.0);
+            this.path0__1 = ElevationStep_instance.smoothElevation$default_3c035p_k$(this.path0__1);
+            var working = this.course_1.copy$default_a3dskc_k$(this.course_1.course_1.copy$default_mmxsnj_k$(this.path0__1));
+            if (this.options_1.computeMaxSpeeds_1 || this.options_1.virtualizeTrack_1) {
+              MaxSpeedComputer_instance.computeMaxSpeeds_jc4v4o_k$(working.course_1);
             }
 
-            if (this.l20_1.y1z_1) {
-              this.n20_1 = VirtualizeService_instance.v20(working);
-              working = working.i1z(working.z1y_1.x1y(this.n20_1));
+            if (this.options_1.virtualizeTrack_1) {
+              this.path0__1 = VirtualizeService_instance.virtualizeTrack_tp3afi_k$(working);
+              working = working.copy$default_a3dskc_k$(working.course_1.copy$default_mmxsnj_k$(this.path0__1));
             }
 
-            if (this.l20_1.z1z_1) {
-              this.n20_1 = PointPerSecond_instance.v1w(this.n20_1);
+            if (this.options_1.computeOnePointPerSecond_1) {
+              this.path0__1 = PointPerSecond_instance.computeOnePointPerSecond_7sah9a_k$(this.path0__1);
             }
 
-            if (this.l20_1.a20_1.s1z_1) {
-              this.n20_1 = PathSimplifier_instance.d1w(this.n20_1, this.l20_1.a20_1.t1z_1, this.l20_1.a20_1.u1z_1);
+            if (this.options_1.simplifyPath_1.enabled_1) {
+              this.path0__1 = PathSimplifier_instance.simplify_gxhj7b_k$(this.path0__1, this.options_1.simplifyPath_1.toleranceM_1, this.options_1.simplifyPath_1.zExaggeration_1);
             }
 
-            return this.n20_1;
+            return this.path0__1;
           case 3:
-            throw this.k6_1;
+            throw this.exception_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.i6_1 === 3) {
+        if (this.exceptionState_1 === 3) {
           throw e;
         } else {
-          this.h6_1 = this.i6_1;
-          this.k6_1 = e;
+          this.state_1 = this.exceptionState_1;
+          this.exception_1 = e;
         }
       }
      while (true);
   };
   function Enhancer() {
   }
-  protoOf(Enhancer).w20 = function (path) {
+  protoOf(Enhancer).getDefaultCourse_gqi1xw_k$ = function (path) {
     return new CoursePhysics(new Course(path), RhoProviderEstimate_instance, AeroProviderConstant_instance, WindProviderNone_instance, new PowerProviderConstant(280.0));
   };
-  protoOf(Enhancer).x20 = function (path, elevationProvider, options, $completion) {
-    return this.y20(this.w20(path), options, elevationProvider, $completion);
+  protoOf(Enhancer).enhanceCourseDefault_jm937y_k$ = function (path, elevationProvider, options, $completion) {
+    return this.enhanceCourse_mout3j_k$(this.getDefaultCourse_gqi1xw_k$(path), options.copy$default_9zz8ww_k$(options.fixElevation_1 && !(elevationProvider == null)), elevationProvider, $completion);
   };
-  protoOf(Enhancer).y20 = function (course, options, elevationProvider, $completion) {
+  protoOf(Enhancer).enhanceCourse_mout3j_k$ = function (course, options, elevationProvider, $completion) {
     var tmp = new $enhanceCourseCOROUTINE$(this, course, options, elevationProvider, $completion);
-    tmp.j6_1 = Unit_instance;
-    tmp.k6_1 = null;
-    return tmp.p6();
+    tmp.result_1 = Unit_instance;
+    tmp.exception_1 = null;
+    return tmp.doResume_5yljmg_k$();
   };
   var Enhancer_instance;
   function Enhancer_getInstance() {
     return Enhancer_instance;
   }
   function Climb(startIndex, endIndex, startDistanceM, endDistanceM, startElevationM, endElevationM, positiveElevationM, negativeElevationM, parts) {
-    this.z20_1 = startIndex;
-    this.a21_1 = endIndex;
-    this.b21_1 = startDistanceM;
-    this.c21_1 = endDistanceM;
-    this.d21_1 = startElevationM;
-    this.e21_1 = endElevationM;
-    this.f21_1 = positiveElevationM;
-    this.g21_1 = negativeElevationM;
-    this.h21_1 = parts;
-  }
-  protoOf(Climb).i21 = function () {
-    return this.c21_1 - this.b21_1;
-  };
-  protoOf(Climb).j21 = function () {
-    return this.e21_1 - this.d21_1;
-  };
-  protoOf(Climb).k21 = function () {
-    return this.i21() === 0.0 ? 0.0 : this.j21() / this.i21();
-  };
-  protoOf(Climb).l21 = function () {
+    this.startIndex_1 = startIndex;
+    this.endIndex_1 = endIndex;
+    this.startDistanceM_1 = startDistanceM;
+    this.endDistanceM_1 = endDistanceM;
+    this.startElevationM_1 = startElevationM;
+    this.endElevationM_1 = endElevationM;
+    this.positiveElevationM_1 = positiveElevationM;
+    this.negativeElevationM_1 = negativeElevationM;
+    this.parts_1 = parts;
+  }
+  protoOf(Climb).get_lengthM_2aqrzy_k$ = function () {
+    return this.endDistanceM_1 - this.startDistanceM_1;
+  };
+  protoOf(Climb).get_elevationGainM_6kg9eu_k$ = function () {
+    return this.endElevationM_1 - this.startElevationM_1;
+  };
+  protoOf(Climb).get_averageGrade_oooweb_k$ = function () {
+    return this.get_lengthM_2aqrzy_k$() === 0.0 ? 0.0 : this.get_elevationGainM_6kg9eu_k$() / this.get_lengthM_2aqrzy_k$();
+  };
+  protoOf(Climb).get_climbingGrade_olocdd_k$ = function () {
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = this.h21_1;
+    var tmp0 = this.parts_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var _iterator__ex2g4s = tmp0.i();
-    while (_iterator__ex2g4s.j()) {
-      var element = _iterator__ex2g4s.k();
-      if (element.j21() > 0) {
-        destination.h(element);
+    var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var element = _iterator__ex2g4s.next_20eer_k$();
+      if (element.get_elevationGainM_6kg9eu_k$() > 0) {
+        destination.add_utx5q5_k$(element);
       }
     }
     // Inline function 'kotlin.collections.sumOf' call
     var sum = 0;
-    var _iterator__ex2g4s_0 = destination.i();
-    while (_iterator__ex2g4s_0.j()) {
-      var element_0 = _iterator__ex2g4s_0.k();
+    var _iterator__ex2g4s_0 = destination.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+      var element_0 = _iterator__ex2g4s_0.next_20eer_k$();
       var tmp = sum;
-      sum = tmp + element_0.i21();
+      sum = tmp + element_0.get_lengthM_2aqrzy_k$();
     }
     var climbingLength = sum;
-    return climbingLength === 0.0 ? 0.0 : this.f21_1 / climbingLength;
+    return climbingLength === 0.0 ? 0.0 : this.positiveElevationM_1 / climbingLength;
   };
   protoOf(Climb).toString = function () {
-    return 'Climb(startIndex=' + this.z20_1 + ', endIndex=' + this.a21_1 + ', startDistanceM=' + this.b21_1 + ', endDistanceM=' + this.c21_1 + ', startElevationM=' + this.d21_1 + ', endElevationM=' + this.e21_1 + ', positiveElevationM=' + this.f21_1 + ', negativeElevationM=' + this.g21_1 + ', parts=' + toString(this.h21_1) + ')';
+    return 'Climb(startIndex=' + this.startIndex_1 + ', endIndex=' + this.endIndex_1 + ', startDistanceM=' + this.startDistanceM_1 + ', endDistanceM=' + this.endDistanceM_1 + ', startElevationM=' + this.startElevationM_1 + ', endElevationM=' + this.endElevationM_1 + ', positiveElevationM=' + this.positiveElevationM_1 + ', negativeElevationM=' + this.negativeElevationM_1 + ', parts=' + toString(this.parts_1) + ')';
   };
   protoOf(Climb).hashCode = function () {
-    var result = this.z20_1;
-    result = imul(result, 31) + this.a21_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.b21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.c21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g21_1) | 0;
-    result = imul(result, 31) + hashCode(this.h21_1) | 0;
+    var result = this.startIndex_1;
+    result = imul(result, 31) + this.endIndex_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.startDistanceM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.endDistanceM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.startElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.endElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.positiveElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.negativeElevationM_1) | 0;
+    result = imul(result, 31) + hashCode(this.parts_1) | 0;
     return result;
   };
   protoOf(Climb).equals = function (other) {
@@ -602,49 +629,49 @@
       return true;
     if (!(other instanceof Climb))
       return false;
-    if (!(this.z20_1 === other.z20_1))
+    if (!(this.startIndex_1 === other.startIndex_1))
       return false;
-    if (!(this.a21_1 === other.a21_1))
+    if (!(this.endIndex_1 === other.endIndex_1))
       return false;
-    if (!equals(this.b21_1, other.b21_1))
+    if (!equals(this.startDistanceM_1, other.startDistanceM_1))
       return false;
-    if (!equals(this.c21_1, other.c21_1))
+    if (!equals(this.endDistanceM_1, other.endDistanceM_1))
       return false;
-    if (!equals(this.d21_1, other.d21_1))
+    if (!equals(this.startElevationM_1, other.startElevationM_1))
       return false;
-    if (!equals(this.e21_1, other.e21_1))
+    if (!equals(this.endElevationM_1, other.endElevationM_1))
       return false;
-    if (!equals(this.f21_1, other.f21_1))
+    if (!equals(this.positiveElevationM_1, other.positiveElevationM_1))
       return false;
-    if (!equals(this.g21_1, other.g21_1))
+    if (!equals(this.negativeElevationM_1, other.negativeElevationM_1))
       return false;
-    if (!equals(this.h21_1, other.h21_1))
+    if (!equals(this.parts_1, other.parts_1))
       return false;
     return true;
   };
   function ClimbPart(startDistanceM, endDistanceM, startElevationM, endElevationM) {
-    this.m21_1 = startDistanceM;
-    this.n21_1 = endDistanceM;
-    this.o21_1 = startElevationM;
-    this.p21_1 = endElevationM;
+    this.startDistanceM_1 = startDistanceM;
+    this.endDistanceM_1 = endDistanceM;
+    this.startElevationM_1 = startElevationM;
+    this.endElevationM_1 = endElevationM;
   }
-  protoOf(ClimbPart).i21 = function () {
-    return this.n21_1 - this.m21_1;
+  protoOf(ClimbPart).get_lengthM_2aqrzy_k$ = function () {
+    return this.endDistanceM_1 - this.startDistanceM_1;
   };
-  protoOf(ClimbPart).j21 = function () {
-    return this.p21_1 - this.o21_1;
+  protoOf(ClimbPart).get_elevationGainM_6kg9eu_k$ = function () {
+    return this.endElevationM_1 - this.startElevationM_1;
   };
-  protoOf(ClimbPart).q21 = function () {
-    return this.i21() === 0.0 ? 0.0 : this.j21() / this.i21();
+  protoOf(ClimbPart).get_grade_is33qm_k$ = function () {
+    return this.get_lengthM_2aqrzy_k$() === 0.0 ? 0.0 : this.get_elevationGainM_6kg9eu_k$() / this.get_lengthM_2aqrzy_k$();
   };
   protoOf(ClimbPart).toString = function () {
-    return 'ClimbPart(startDistanceM=' + this.m21_1 + ', endDistanceM=' + this.n21_1 + ', startElevationM=' + this.o21_1 + ', endElevationM=' + this.p21_1 + ')';
+    return 'ClimbPart(startDistanceM=' + this.startDistanceM_1 + ', endDistanceM=' + this.endDistanceM_1 + ', startElevationM=' + this.startElevationM_1 + ', endElevationM=' + this.endElevationM_1 + ')';
   };
   protoOf(ClimbPart).hashCode = function () {
-    var result = getNumberHashCode(this.m21_1);
-    result = imul(result, 31) + getNumberHashCode(this.n21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.o21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p21_1) | 0;
+    var result = getNumberHashCode(this.startDistanceM_1);
+    result = imul(result, 31) + getNumberHashCode(this.endDistanceM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.startElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.endElevationM_1) | 0;
     return result;
   };
   protoOf(ClimbPart).equals = function (other) {
@@ -652,28 +679,28 @@
       return true;
     if (!(other instanceof ClimbPart))
       return false;
-    if (!equals(this.m21_1, other.m21_1))
+    if (!equals(this.startDistanceM_1, other.startDistanceM_1))
       return false;
-    if (!equals(this.n21_1, other.n21_1))
+    if (!equals(this.endDistanceM_1, other.endDistanceM_1))
       return false;
-    if (!equals(this.o21_1, other.o21_1))
+    if (!equals(this.startElevationM_1, other.startElevationM_1))
       return false;
-    if (!equals(this.p21_1, other.p21_1))
+    if (!equals(this.endElevationM_1, other.endElevationM_1))
       return false;
     return true;
   };
   function Companion_3() {
     Companion_instance_3 = this;
-    this.r21_1 = new ClimbOptions();
+    this.DEFAULT_1 = new ClimbOptions();
   }
   var Companion_instance_3;
-  function Companion_getInstance_5() {
+  function Companion_getInstance_6() {
     if (Companion_instance_3 == null)
       new Companion_3();
     return Companion_instance_3;
   }
   function ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGradeRatio, booster, maxAnalysisPoints) {
-    Companion_getInstance_5();
+    Companion_getInstance_6();
     minMinClimbElevationM = minMinClimbElevationM === VOID ? 10.0 : minMinClimbElevationM;
     maxMinClimbElevationM = maxMinClimbElevationM === VOID ? 35.0 : maxMinClimbElevationM;
     minClimbElevationRatio = minClimbElevationRatio === VOID ? 100.0 : minClimbElevationRatio;
@@ -681,30 +708,30 @@
     maxDiffRealGradeRatio = maxDiffRealGradeRatio === VOID ? 1.3 : maxDiffRealGradeRatio;
     booster = booster === VOID ? 1.3 : booster;
     maxAnalysisPoints = maxAnalysisPoints === VOID ? 3000 : maxAnalysisPoints;
-    this.s21_1 = minMinClimbElevationM;
-    this.t21_1 = maxMinClimbElevationM;
-    this.u21_1 = minClimbElevationRatio;
-    this.v21_1 = minGradePercent;
-    this.w21_1 = maxDiffRealGradeRatio;
-    this.x21_1 = booster;
-    this.y21_1 = maxAnalysisPoints;
+    this.minMinClimbElevationM_1 = minMinClimbElevationM;
+    this.maxMinClimbElevationM_1 = maxMinClimbElevationM;
+    this.minClimbElevationRatio_1 = minClimbElevationRatio;
+    this.minGradePercent_1 = minGradePercent;
+    this.maxDiffRealGradeRatio_1 = maxDiffRealGradeRatio;
+    this.booster_1 = booster;
+    this.maxAnalysisPoints_1 = maxAnalysisPoints;
     // Inline function 'kotlin.require' call
-    if (!(this.y21_1 >= 2)) {
+    if (!(this.maxAnalysisPoints_1 >= 2)) {
       var message = 'maxAnalysisPoints must be at least 2';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
   }
   protoOf(ClimbOptions).toString = function () {
-    return 'ClimbOptions(minMinClimbElevationM=' + this.s21_1 + ', maxMinClimbElevationM=' + this.t21_1 + ', minClimbElevationRatio=' + this.u21_1 + ', minGradePercent=' + this.v21_1 + ', maxDiffRealGradeRatio=' + this.w21_1 + ', booster=' + this.x21_1 + ', maxAnalysisPoints=' + this.y21_1 + ')';
+    return 'ClimbOptions(minMinClimbElevationM=' + this.minMinClimbElevationM_1 + ', maxMinClimbElevationM=' + this.maxMinClimbElevationM_1 + ', minClimbElevationRatio=' + this.minClimbElevationRatio_1 + ', minGradePercent=' + this.minGradePercent_1 + ', maxDiffRealGradeRatio=' + this.maxDiffRealGradeRatio_1 + ', booster=' + this.booster_1 + ', maxAnalysisPoints=' + this.maxAnalysisPoints_1 + ')';
   };
   protoOf(ClimbOptions).hashCode = function () {
-    var result = getNumberHashCode(this.s21_1);
-    result = imul(result, 31) + getNumberHashCode(this.t21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w21_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x21_1) | 0;
-    result = imul(result, 31) + this.y21_1 | 0;
+    var result = getNumberHashCode(this.minMinClimbElevationM_1);
+    result = imul(result, 31) + getNumberHashCode(this.maxMinClimbElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.minClimbElevationRatio_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.minGradePercent_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.maxDiffRealGradeRatio_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.booster_1) | 0;
+    result = imul(result, 31) + this.maxAnalysisPoints_1 | 0;
     return result;
   };
   protoOf(ClimbOptions).equals = function (other) {
@@ -712,29 +739,29 @@
       return true;
     if (!(other instanceof ClimbOptions))
       return false;
-    if (!equals(this.s21_1, other.s21_1))
+    if (!equals(this.minMinClimbElevationM_1, other.minMinClimbElevationM_1))
       return false;
-    if (!equals(this.t21_1, other.t21_1))
+    if (!equals(this.maxMinClimbElevationM_1, other.maxMinClimbElevationM_1))
       return false;
-    if (!equals(this.u21_1, other.u21_1))
+    if (!equals(this.minClimbElevationRatio_1, other.minClimbElevationRatio_1))
       return false;
-    if (!equals(this.v21_1, other.v21_1))
+    if (!equals(this.minGradePercent_1, other.minGradePercent_1))
       return false;
-    if (!equals(this.w21_1, other.w21_1))
+    if (!equals(this.maxDiffRealGradeRatio_1, other.maxDiffRealGradeRatio_1))
       return false;
-    if (!equals(this.x21_1, other.x21_1))
+    if (!equals(this.booster_1, other.booster_1))
       return false;
-    if (!(this.y21_1 === other.y21_1))
+    if (!(this.maxAnalysisPoints_1 === other.maxAnalysisPoints_1))
       return false;
     return true;
   };
   function Companion_4() {
   }
-  protoOf(Companion_4).z21 = function (path, maxPoints) {
+  protoOf(Companion_4).of_tmvbpf_k$ = function (path, maxPoints) {
     var tmp;
-    if (path.u1q_1 <= maxPoints) {
+    if (path.size_1 <= maxPoints) {
       var tmp_0 = 0;
-      var tmp_1 = path.u1q_1;
+      var tmp_1 = path.size_1;
       var tmp_2 = new Int32Array(tmp_1);
       while (tmp_0 < tmp_1) {
         var tmp_3 = tmp_0;
@@ -743,15 +770,15 @@
       }
       tmp = tmp_2;
     } else {
-      var stride = ((path.u1q_1 + maxPoints | 0) - 1 | 0) / maxPoints | 0;
+      var stride = ((path.size_1 + maxPoints | 0) - 1 | 0) / maxPoints | 0;
       var kept = ArrayList_init_$Create$_0(maxPoints + 1 | 0);
       var i = 0;
-      while (i < path.u1q_1) {
-        kept.h(i);
+      while (i < path.size_1) {
+        kept.add_utx5q5_k$(i);
         i = i + stride | 0;
       }
-      if (!(last(kept) === (path.u1q_1 - 1 | 0))) {
-        kept.h(path.u1q_1 - 1 | 0);
+      if (!(last(kept) === (path.size_1 - 1 | 0))) {
+        kept.add_utx5q5_k$(path.size_1 - 1 | 0);
       }
       tmp = toIntArray(kept);
     }
@@ -761,7 +788,7 @@
     var tmp_6 = new Float64Array(tmp_5);
     while (tmp_4 < tmp_5) {
       var tmp_7 = tmp_4;
-      tmp_6[tmp_7] = path.k1u(indices[tmp_7]);
+      tmp_6[tmp_7] = path.distance_5s4s77_k$(indices[tmp_7]);
       tmp_4 = tmp_4 + 1 | 0;
     }
     var tmp_8 = 0;
@@ -769,43 +796,43 @@
     var tmp_10 = new Float64Array(tmp_9);
     while (tmp_8 < tmp_9) {
       var tmp_11 = tmp_8;
-      tmp_10[tmp_11] = path.y1q(indices[tmp_11]);
+      tmp_10[tmp_11] = path.elevation_iziwkb_k$(indices[tmp_11]);
       tmp_8 = tmp_8 + 1 | 0;
     }
     return new Profile(tmp_6, tmp_10, indices);
   };
   var Companion_instance_4;
-  function Companion_getInstance_6() {
+  function Companion_getInstance_7() {
     return Companion_instance_4;
   }
   function Profile(distance, elevation, sourceIndex) {
-    this.a22_1 = distance;
-    this.b22_1 = elevation;
-    this.c22_1 = sourceIndex;
+    this.distance_1 = distance;
+    this.elevation_1 = elevation;
+    this.sourceIndex_1 = sourceIndex;
   }
-  protoOf(Profile).l = function () {
-    return this.a22_1.length;
+  protoOf(Profile).get_size_woubt6_k$ = function () {
+    return this.distance_1.length;
   };
   function bestCandidateFrom($this, profile, i, minClimbElevation, options) {
-    var startDist = profile.a22_1[i];
-    var startEle = profile.b22_1[i];
+    var startDist = profile.distance_1[i];
+    var startEle = profile.elevation_1[i];
     var positiveElevation = 0.0;
     var negativeElevation = 0.0;
     var distClimbing = 0.0;
     var bestScore = 0.0;
     var best = null;
     var inductionVariable = i + 1 | 0;
-    var last = profile.l();
+    var last = profile.get_size_woubt6_k$();
     if (inductionVariable < last)
       $l$loop: do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var endDist = profile.a22_1[j];
-        var endEle = profile.b22_1[j];
-        var dEle = endEle - profile.b22_1[j - 1 | 0];
+        var endDist = profile.distance_1[j];
+        var endEle = profile.elevation_1[j];
+        var dEle = endEle - profile.elevation_1[j - 1 | 0];
         if (dEle > 0) {
           positiveElevation = positiveElevation + dEle;
-          distClimbing = distClimbing + (endDist - profile.a22_1[j - 1 | 0]);
+          distClimbing = distClimbing + (endDist - profile.distance_1[j - 1 | 0]);
         } else {
           negativeElevation = negativeElevation + dEle;
         }
@@ -816,9 +843,9 @@
         var gradePercent = 100.0 * netElevation / length;
         var climbingGradePercent = distClimbing > 0 ? 100.0 * positiveElevation / distClimbing : 0.0;
         // Inline function 'kotlin.math.pow' call
-        var x = options.x21_1;
+        var x = options.booster_1;
         var score = length * Math.pow(gradePercent, x);
-        var qualifies = gradePercent >= options.v21_1 && netElevation >= minClimbElevation && score >= bestScore && climbingGradePercent / gradePercent <= options.w21_1;
+        var qualifies = gradePercent >= options.minGradePercent_1 && netElevation >= minClimbElevation && score >= bestScore && climbingGradePercent / gradePercent <= options.maxDiffRealGradeRatio_1;
         if (qualifies) {
           bestScore = score;
           best = new Candidate(i, j, score, positiveElevation, negativeElevation);
@@ -838,60 +865,60 @@
     var kept = ArrayList_init_$Create$();
     $l$loop: while (true) {
       // Inline function 'kotlin.collections.isNotEmpty' call
-      if (!!remaining.n()) {
+      if (!!remaining.isEmpty_y1axqb_k$()) {
         break $l$loop;
       }
       var best = first(remaining);
-      kept.h(best);
+      kept.add_utx5q5_k$(best);
       removeAll(remaining, ClimbDetector$dedupeByScore$lambda_0(best));
     }
     return kept;
   }
   function toClimb($this, $receiver, path, profile) {
-    return new Climb(profile.c22_1[$receiver.d22_1], profile.c22_1[$receiver.e22_1], profile.a22_1[$receiver.d22_1], profile.a22_1[$receiver.e22_1], profile.b22_1[$receiver.d22_1], profile.b22_1[$receiver.e22_1], $receiver.g22_1, $receiver.h22_1, splitIntoParts($this, profile, $receiver.d22_1, $receiver.e22_1));
+    return new Climb(profile.sourceIndex_1[$receiver.startIndex_1], profile.sourceIndex_1[$receiver.endIndex_1], profile.distance_1[$receiver.startIndex_1], profile.distance_1[$receiver.endIndex_1], profile.elevation_1[$receiver.startIndex_1], profile.elevation_1[$receiver.endIndex_1], $receiver.positiveElevationM_1, $receiver.negativeElevationM_1, splitIntoParts($this, profile, $receiver.startIndex_1, $receiver.endIndex_1));
   }
   function splitIntoParts($this, profile, startIndex, endIndex) {
     // Inline function 'kotlin.collections.map' call
     var this_0 = numberRangeToNumber(startIndex, endIndex);
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var inductionVariable = this_0.lc_1;
-    var last = this_0.mc_1;
+    var inductionVariable = this_0.first_1;
+    var last = this_0.last_1;
     if (inductionVariable <= last)
       do {
         var item = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         var i = item;
-        var tmp$ret$2 = new Vector3D(profile.a22_1[i], profile.b22_1[i], 0.0);
-        destination.h(tmp$ret$2);
+        var tmp$ret$2 = new Vector3D(profile.distance_1[i], profile.elevation_1[i], 0.0);
+        destination.add_utx5q5_k$(tmp$ret$2);
       }
        while (!(item === last));
     var points = destination;
-    if (points.l() < 2)
+    if (points.get_size_woubt6_k$() < 2)
       return emptyList();
-    var elevationGain = profile.b22_1[endIndex] - profile.b22_1[startIndex];
+    var elevationGain = profile.elevation_1[endIndex] - profile.elevation_1[startIndex];
     var tolerance = coerceIn(elevationGain / 50.0, 10.0, 50.0);
-    var keptIndices = DouglasPeucker_instance.ix(points, tolerance);
+    var keptIndices = DouglasPeucker_instance.simplifyIndices_1yk9dd_k$(points, tolerance);
     var tmp$ret$3;
     $l$block: {
       // Inline function 'kotlin.collections.zipWithNext' call
-      var iterator = keptIndices.i();
-      if (!iterator.j()) {
+      var iterator = keptIndices.iterator_jk1svi_k$();
+      if (!iterator.hasNext_bitz1p_k$()) {
         tmp$ret$3 = emptyList();
         break $l$block;
       }
       // Inline function 'kotlin.collections.mutableListOf' call
       var result = ArrayList_init_$Create$();
-      var current = iterator.k();
-      while (iterator.j()) {
-        var next = iterator.k();
+      var current = iterator.next_20eer_k$();
+      while (iterator.hasNext_bitz1p_k$()) {
+        var next = iterator.next_20eer_k$();
         var a = current;
-        var tmp0_startDistanceM = points.m(a).dx_1;
-        var tmp1_startElevationM = points.m(a).ex_1;
-        var tmp2_endDistanceM = points.m(next).dx_1;
-        var tmp3_endElevationM = points.m(next).ex_1;
+        var tmp0_startDistanceM = points.get_c1px32_k$(a).x_1;
+        var tmp1_startElevationM = points.get_c1px32_k$(a).y_1;
+        var tmp2_endDistanceM = points.get_c1px32_k$(next).x_1;
+        var tmp3_endElevationM = points.get_c1px32_k$(next).y_1;
         var tmp$ret$5 = new ClimbPart(tmp0_startDistanceM, tmp2_endDistanceM, tmp1_startElevationM, tmp3_endElevationM);
-        result.h(tmp$ret$5);
+        result.add_utx5q5_k$(tmp$ret$5);
         current = next;
       }
       tmp$ret$3 = result;
@@ -899,24 +926,24 @@
     return tmp$ret$3;
   }
   function Candidate(startIndex, endIndex, score, positiveElevationM, negativeElevationM) {
-    this.d22_1 = startIndex;
-    this.e22_1 = endIndex;
-    this.f22_1 = score;
-    this.g22_1 = positiveElevationM;
-    this.h22_1 = negativeElevationM;
+    this.startIndex_1 = startIndex;
+    this.endIndex_1 = endIndex;
+    this.score_1 = score;
+    this.positiveElevationM_1 = positiveElevationM;
+    this.negativeElevationM_1 = negativeElevationM;
   }
-  protoOf(Candidate).i22 = function (other) {
-    return other.d22_1 <= this.d22_1 && this.d22_1 <= other.e22_1 || (other.d22_1 <= this.e22_1 && this.e22_1 <= other.e22_1) || (this.d22_1 <= other.d22_1 && other.e22_1 <= this.e22_1);
+  protoOf(Candidate).overlaps_wp0rru_k$ = function (other) {
+    return other.startIndex_1 <= this.startIndex_1 && this.startIndex_1 <= other.endIndex_1 || (other.startIndex_1 <= this.endIndex_1 && this.endIndex_1 <= other.endIndex_1) || (this.startIndex_1 <= other.startIndex_1 && other.endIndex_1 <= this.endIndex_1);
   };
   protoOf(Candidate).toString = function () {
-    return 'Candidate(startIndex=' + this.d22_1 + ', endIndex=' + this.e22_1 + ', score=' + this.f22_1 + ', positiveElevationM=' + this.g22_1 + ', negativeElevationM=' + this.h22_1 + ')';
+    return 'Candidate(startIndex=' + this.startIndex_1 + ', endIndex=' + this.endIndex_1 + ', score=' + this.score_1 + ', positiveElevationM=' + this.positiveElevationM_1 + ', negativeElevationM=' + this.negativeElevationM_1 + ')';
   };
   protoOf(Candidate).hashCode = function () {
-    var result = this.d22_1;
-    result = imul(result, 31) + this.e22_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f22_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g22_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h22_1) | 0;
+    var result = this.startIndex_1;
+    result = imul(result, 31) + this.endIndex_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.score_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.positiveElevationM_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.negativeElevationM_1) | 0;
     return result;
   };
   protoOf(Candidate).equals = function (other) {
@@ -924,36 +951,36 @@
       return true;
     if (!(other instanceof Candidate))
       return false;
-    if (!(this.d22_1 === other.d22_1))
+    if (!(this.startIndex_1 === other.startIndex_1))
       return false;
-    if (!(this.e22_1 === other.e22_1))
+    if (!(this.endIndex_1 === other.endIndex_1))
       return false;
-    if (!equals(this.f22_1, other.f22_1))
+    if (!equals(this.score_1, other.score_1))
       return false;
-    if (!equals(this.g22_1, other.g22_1))
+    if (!equals(this.positiveElevationM_1, other.positiveElevationM_1))
       return false;
-    if (!equals(this.h22_1, other.h22_1))
+    if (!equals(this.negativeElevationM_1, other.negativeElevationM_1))
       return false;
     return true;
   };
   function sam$kotlin_Comparator$0(function_0) {
-    this.j22_1 = function_0;
+    this.function_1 = function_0;
   }
-  protoOf(sam$kotlin_Comparator$0).l9 = function (a, b) {
-    return this.j22_1(a, b);
+  protoOf(sam$kotlin_Comparator$0).compare_bczr_k$ = function (a, b) {
+    return this.function_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
-    return this.l9(a, b);
+    return this.compare_bczr_k$(a, b);
   };
-  protoOf(sam$kotlin_Comparator$0).x1 = function () {
-    return this.j22_1;
+  protoOf(sam$kotlin_Comparator$0).getFunctionDelegate_jtodtf_k$ = function () {
+    return this.function_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
     if (!(other == null) ? isInterface(other, Comparator) : false) {
       var tmp_0;
       if (!(other == null) ? isInterface(other, FunctionAdapter) : false) {
-        tmp_0 = equals(this.x1(), other.x1());
+        tmp_0 = equals(this.getFunctionDelegate_jtodtf_k$(), other.getFunctionDelegate_jtodtf_k$());
       } else {
         tmp_0 = false;
       }
@@ -964,26 +991,26 @@
     return tmp;
   };
   protoOf(sam$kotlin_Comparator$0).hashCode = function () {
-    return hashCode(this.x1());
+    return hashCode(this.getFunctionDelegate_jtodtf_k$());
   };
   function sam$kotlin_Comparator$0_0(function_0) {
-    this.k22_1 = function_0;
+    this.function_1 = function_0;
   }
-  protoOf(sam$kotlin_Comparator$0_0).l9 = function (a, b) {
-    return this.k22_1(a, b);
+  protoOf(sam$kotlin_Comparator$0_0).compare_bczr_k$ = function (a, b) {
+    return this.function_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0_0).compare = function (a, b) {
-    return this.l9(a, b);
+    return this.compare_bczr_k$(a, b);
   };
-  protoOf(sam$kotlin_Comparator$0_0).x1 = function () {
-    return this.k22_1;
+  protoOf(sam$kotlin_Comparator$0_0).getFunctionDelegate_jtodtf_k$ = function () {
+    return this.function_1;
   };
   protoOf(sam$kotlin_Comparator$0_0).equals = function (other) {
     var tmp;
     if (!(other == null) ? isInterface(other, Comparator) : false) {
       var tmp_0;
       if (!(other == null) ? isInterface(other, FunctionAdapter) : false) {
-        tmp_0 = equals(this.x1(), other.x1());
+        tmp_0 = equals(this.getFunctionDelegate_jtodtf_k$(), other.getFunctionDelegate_jtodtf_k$());
       } else {
         tmp_0 = false;
       }
@@ -994,49 +1021,49 @@
     return tmp;
   };
   protoOf(sam$kotlin_Comparator$0_0).hashCode = function () {
-    return hashCode(this.x1());
+    return hashCode(this.getFunctionDelegate_jtodtf_k$());
   };
   function ClimbDetector$detect$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.d22_1;
-    var tmp$ret$2 = b.d22_1;
+    var tmp = a.startIndex_1;
+    var tmp$ret$2 = b.startIndex_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function ClimbDetector$dedupeByScore$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = b.f22_1;
-    var tmp$ret$2 = a.f22_1;
+    var tmp = b.score_1;
+    var tmp$ret$2 = a.score_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function ClimbDetector$dedupeByScore$lambda_0($best) {
     return function (it) {
-      return it.i22($best);
+      return it.overlaps_wp0rru_k$($best);
     };
   }
   function ClimbDetector() {
-    this.l22_1 = 10.0;
-    this.m22_1 = 10.0;
-    this.n22_1 = 50.0;
-    this.o22_1 = 50.0;
+    this.MIN_CANDIDATE_LENGTH_M_1 = 10.0;
+    this.MIN_PART_TOLERANCE_M_1 = 10.0;
+    this.MAX_PART_TOLERANCE_M_1 = 50.0;
+    this.PART_TOLERANCE_DIVISOR_1 = 50.0;
   }
-  protoOf(ClimbDetector).p22 = function (path, options) {
-    if (path.u1q_1 < 2)
+  protoOf(ClimbDetector).detect_llooq2_k$ = function (path, options) {
+    if (path.size_1 < 2)
       return emptyList();
-    var tmp0 = options.s21_1;
-    var tmp0_0 = options.t21_1;
+    var tmp0 = options.minMinClimbElevationM_1;
+    var tmp0_0 = options.maxMinClimbElevationM_1;
     // Inline function 'kotlin.comparisons.minOf' call
-    var b = path.a1s_1 / options.u21_1;
+    var b = path.elevationGain_1 / options.minClimbElevationRatio_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = Math.min(tmp0_0, b);
     var minClimbElevation = Math.max(tmp0, b_0);
-    var profile = Companion_instance_4.z21(path, options.y21_1);
+    var profile = Companion_instance_4.of_tmvbpf_k$(path, options.maxAnalysisPoints_1);
     // Inline function 'kotlin.collections.mapNotNull' call
-    var tmp0_1 = until(0, profile.l());
+    var tmp0_1 = until(0, profile.get_size_woubt6_k$());
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var destination = ArrayList_init_$Create$();
     // Inline function 'kotlin.collections.forEach' call
-    var inductionVariable = tmp0_1.lc_1;
-    var last = tmp0_1.mc_1;
+    var inductionVariable = tmp0_1.first_1;
+    var last = tmp0_1.last_1;
     if (inductionVariable <= last)
       do {
         var element = inductionVariable;
@@ -1047,7 +1074,7 @@
           null;
         else {
           // Inline function 'kotlin.let' call
-          destination.h(tmp0_safe_receiver);
+          destination.add_utx5q5_k$(tmp0_safe_receiver);
         }
       }
        while (!(element === last));
@@ -1061,32 +1088,123 @@
     var this_1 = sortedWith(this_0, tmp$ret$10);
     // Inline function 'kotlin.collections.mapTo' call
     var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
-    var _iterator__ex2g4s = this_1.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_1.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var tmp$ret$13 = toClimb(ClimbDetector_instance, item, path, profile);
-      destination_0.h(tmp$ret$13);
+      destination_0.add_utx5q5_k$(tmp$ret$13);
     }
     return destination_0;
   };
-  protoOf(ClimbDetector).q22 = function (path, options, $super) {
-    options = options === VOID ? Companion_getInstance_5().r21_1 : options;
-    return $super === VOID ? this.p22(path, options) : $super.p22.call(this, path, options);
+  protoOf(ClimbDetector).detect$default_6ml3ny_k$ = function (path, options, $super) {
+    options = options === VOID ? Companion_getInstance_6().DEFAULT_1 : options;
+    return $super === VOID ? this.detect_llooq2_k$(path, options) : $super.detect_llooq2_k$.call(this, path, options);
   };
   var ClimbDetector_instance;
   function ClimbDetector_getInstance() {
     return ClimbDetector_instance;
   }
+  function dominantHeadwindDirection(_this__u8e3s4) {
+    var sumX = 0.0;
+    var sumY = 0.0;
+    var contributing = 0;
+    var _iterator__ex2g4s = _this__u8e3s4.iterator_jk1svi_k$();
+    $l$loop: while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var path = _iterator__ex2g4s.next_20eer_k$();
+      var tmp0_elvis_lhs = meanDirectionFromStart(path);
+      var tmp;
+      if (tmp0_elvis_lhs == null) {
+        continue $l$loop;
+      } else {
+        tmp = tmp0_elvis_lhs;
+      }
+      var mean = tmp;
+      sumX = sumX + mean.first_1;
+      sumY = sumY + mean.second_1;
+      contributing = contributing + 1 | 0;
+    }
+    if (contributing === 0)
+      return null;
+    var tmp0 = sumX;
+    // Inline function 'kotlin.math.hypot' call
+    var y = sumY;
+    var magnitude = hypot(tmp0, y);
+    if (magnitude < 1.0E-12)
+      return null;
+    return new Vector3D(-sumX / magnitude, -sumY / magnitude, 0.0);
+  }
+  function meanDirectionFromStart(_this__u8e3s4) {
+    if (_this__u8e3s4.size_1 <= 3)
+      return null;
+    var lat0 = _this__u8e3s4.latitude_gb4iok_k$(0);
+    var lon0 = _this__u8e3s4.longitude_a9xl_k$(0);
+    // Inline function 'kotlin.math.cos' call
+    var cosLat0 = Math.cos(lat0);
+    var sumX = 0.0;
+    var sumY = 0.0;
+    var inductionVariable = 1;
+    var last = _this__u8e3s4.size_1;
+    if (inductionVariable < last)
+      $l$loop: do {
+        var i = inductionVariable;
+        inductionVariable = inductionVariable + 1 | 0;
+        var dx = (_this__u8e3s4.longitude_a9xl_k$(i) - lon0) * cosLat0;
+        var dy = _this__u8e3s4.latitude_gb4iok_k$(i) - lat0;
+        // Inline function 'kotlin.math.hypot' call
+        var length = hypot(dx, dy);
+        if (length < 1.0E-12)
+          continue $l$loop;
+        sumX = sumX + dx / length;
+        sumY = sumY + dy / length;
+      }
+       while (inductionVariable < last);
+    var n = _this__u8e3s4.size_1 - 1 | 0;
+    return new Pair(sumX / n, sumY / n);
+  }
+  function dominantHeadwindAzimuthDeg(_this__u8e3s4) {
+    return dominantHeadwindAzimuthDeg_0(listOf(_this__u8e3s4));
+  }
+  function dominantHeadwindAzimuthDeg_0(_this__u8e3s4) {
+    var tmp0_elvis_lhs = dominantHeadwindDirection(_this__u8e3s4);
+    var tmp;
+    if (tmp0_elvis_lhs == null) {
+      return NaN;
+    } else {
+      tmp = tmp0_elvis_lhs;
+    }
+    var direction = tmp;
+    var tmp0 = direction.x_1;
+    // Inline function 'kotlin.math.atan2' call
+    var x = direction.y_1;
+    // Inline function 'kotlin.mod' call
+    var r = Math.atan2(tmp0, x) * 57.29577951308232 % 360.0;
+    var tmp_0;
+    var tmp_1;
+    if (!(r === 0.0)) {
+      // Inline function 'kotlin.math.sign' call
+      var tmp_2 = sign(r);
+      // Inline function 'kotlin.math.sign' call
+      tmp_1 = !(tmp_2 === sign(360.0));
+    } else {
+      tmp_1 = false;
+    }
+    if (tmp_1) {
+      tmp_0 = r + 360.0;
+    } else {
+      tmp_0 = r;
+    }
+    return tmp_0;
+  }
   function computeWithWind($this, path, i, aeroCoef, wind) {
-    var speed = path.m1v(i);
-    var bearing = path.r1u(i);
-    path.s1v(i, wind.r22_1);
-    path.t1v(i, wind.s22_1);
-    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.s22_1;
-    path.x1u(i, windDirectionAsBearing);
+    var speed = path.speed_npav2n_k$(i);
+    var bearing = path.bearing_fz5vxm_k$(i);
+    path.setWindSpeed_ggaslh_k$(i, wind.speedMS_1);
+    path.setWindDirection_86vnxv_k$(i, wind.directionRad_1);
+    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.directionRad_1;
+    path.setWindBearing_44dbry_k$(i, windDirectionAsBearing);
     var alpha = windDirectionAsBearing - bearing;
-    path.y1u(i, alpha);
-    var v = wind.r22_1;
+    path.setWindAlpha_xkbtf2_k$(i, alpha);
+    var v = wind.speedMS_1;
     // Inline function 'kotlin.math.cos' call
     var l1 = speed + v * Math.cos(alpha);
     var l2 = l1 * l1;
@@ -1101,21 +1219,21 @@
     return tmp_1 * Math.sqrt(l3) * l1 * speed;
   }
   function AeroPowerProvider() {
-    this.t22_1 = 1.2;
+    this.MU_1 = 1.2;
   }
-  protoOf(AeroPowerProvider).u22 = function (course, path, pointIndex) {
-    var aeroCoef = course.b1z_1.v22(course, path, pointIndex);
-    path.w1u(pointIndex, aeroCoef);
-    var wind = course.c1z_1.w22(course.z1y_1, path, pointIndex);
+  protoOf(AeroPowerProvider).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var aeroCoef = course.aeroProvider_1.aeroCoef_5n4cco_k$(course, path, pointIndex);
+    path.setAeroCoef_tmjifm_k$(pointIndex, aeroCoef);
+    var wind = course.windProvider_1.wind_umf2tf_k$(course.course_1, path, pointIndex);
     var tmp;
-    if (wind.r22_1 === 0.0) {
-      var v = path.m1v(pointIndex);
+    if (wind.speedMS_1 === 0.0) {
+      var v = path.speed_npav2n_k$(pointIndex);
       tmp = -aeroCoef * v * v * v;
     } else {
       tmp = computeWithWind(this, path, pointIndex, aeroCoef, wind);
     }
     var pAir = tmp;
-    path.z1u(pointIndex, pAir);
+    path.setPAero_mmc4mr_k$(pointIndex, pAir);
     return pAir;
   };
   var AeroPowerProvider_instance;
@@ -1124,28 +1242,28 @@
   }
   function AeroProviderConstant() {
   }
-  protoOf(AeroProviderConstant).v22 = function (course, path, pointIndex) {
-    var rho = course.a1z_1.x22(course.z1y_1, path, pointIndex);
-    return course.f1z().l1z_1 * course.f1z().m1z_1 * rho / 2.0;
+  protoOf(AeroProviderConstant).aeroCoef_5n4cco_k$ = function (course, path, pointIndex) {
+    var rho = course.rhoProvider_1.rho_pwqvzi_k$(course.course_1, path, pointIndex);
+    return course.get_cyclist_lkc0de_k$().cd_1 * course.get_cyclist_lkc0de_k$().frontalAreaM2__1 * rho / 2.0;
   };
   var AeroProviderConstant_instance;
   function AeroProviderConstant_getInstance() {
     return AeroProviderConstant_instance;
   }
   function Companion_5() {
-    this.y22_1 = 0.05;
-    this.z22_1 = 3.0;
+    this.TOLERANCE_1 = 0.05;
+    this.MAX_MULTIPLIER_1 = 3.0;
   }
   var Companion_instance_5;
-  function Companion_getInstance_7() {
+  function Companion_getInstance_8() {
     return Companion_instance_5;
   }
   function CyclistPowerProviderBase(useHarmonics, random) {
     random = random === VOID ? Default_getInstance() : random;
-    this.a23_1 = useHarmonics;
+    this.useHarmonics_1 = useHarmonics;
     var tmp = this;
     var tmp_0;
-    if (this.a23_1) {
+    if (this.useHarmonics_1) {
       // Inline function 'kotlin.collections.List' call
       // Inline function 'kotlin.collections.MutableList' call
       var list = ArrayList_init_$Create$_0(20);
@@ -1155,48 +1273,48 @@
         do {
           var index = inductionVariable;
           inductionVariable = inductionVariable + 1 | 0;
-          var tmp$ret$4 = new Harmonic(1.0 + random.zb() * 9.0, random.zb() * 3.141592653589793, random.zb() * 0.01);
-          list.h(tmp$ret$4);
+          var tmp$ret$4 = new Harmonic(1.0 + random.nextDouble_s2xvfg_k$() * 9.0, random.nextDouble_s2xvfg_k$() * 3.141592653589793, random.nextDouble_s2xvfg_k$() * 0.01);
+          list.add_utx5q5_k$(tmp$ret$4);
         }
          while (inductionVariable < 20);
       tmp_0 = list;
     } else {
       tmp_0 = emptyList();
     }
-    tmp.b23_1 = tmp_0;
-  }
-  protoOf(CyclistPowerProviderBase).u22 = function (course, path, pointIndex) {
-    var power = this.c23(course, path, pointIndex);
-    path.d1v(pointIndex, power);
-    if (this.a23_1) {
-      var x = path.z1q(pointIndex) / 10000.0;
-      var _iterator__ex2g4s = this.b23_1.i();
-      while (_iterator__ex2g4s.j()) {
-        var h = _iterator__ex2g4s.k();
+    tmp.harmonics_1 = tmp_0;
+  }
+  protoOf(CyclistPowerProviderBase).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var power = this.optimalPower_36kg19_k$(course, path, pointIndex);
+    path.setPCyclistProvidedOptimalPower_gha9up_k$(pointIndex, power);
+    if (this.useHarmonics_1) {
+      var x = path.time_ryc845_k$(pointIndex) / 10000.0;
+      var _iterator__ex2g4s = this.harmonics_1.iterator_jk1svi_k$();
+      while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+        var h = _iterator__ex2g4s.next_20eer_k$();
         var tmp = power;
-        var tmp_0 = h.f23_1 * power;
+        var tmp_0 = h.amp_1 * power;
         // Inline function 'kotlin.math.cos' call
-        var x_0 = h.d23_1 * x - h.e23_1;
+        var x_0 = h.freqRadS_1 * x - h.phaseRad_1;
         power = tmp + tmp_0 * Math.cos(x_0);
       }
     }
-    path.e1v(pointIndex, power);
-    var powerNeeded = -PowerComputer_instance.g23(course, path, pointIndex, false);
-    path.f1v(pointIndex, powerNeeded);
+    path.setPCyclistProvidedOptimalPowerWithHarmonics_tg3fol_k$(pointIndex, power);
+    var powerNeeded = -PowerComputer_instance.getNewPower_puvq9i_k$(course, path, pointIndex, false);
+    path.setPCyclistPowerNeeded_54po1x_k$(pointIndex, powerNeeded);
     return power;
   };
   function GravPowerProvider() {
   }
-  protoOf(GravPowerProvider).u22 = function (course, path, pointIndex) {
-    var m = course.f1z().j1z_1;
-    var grade = path.t1u(pointIndex);
-    var speed = path.m1v(pointIndex);
+  protoOf(GravPowerProvider).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var m = course.get_cyclist_lkc0de_k$().massKg_1;
+    var grade = path.grade_c4yjz5_k$(pointIndex);
+    var speed = path.speed_npav2n_k$(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.a1v(pointIndex, p);
+    path.setPGravity_tegtcu_k$(pointIndex, p);
     return p;
   };
   var GravPowerProvider_instance;
@@ -1204,17 +1322,17 @@
     return GravPowerProvider_instance;
   }
   function Harmonic(freqRadS, phaseRad, amp) {
-    this.d23_1 = freqRadS;
-    this.e23_1 = phaseRad;
-    this.f23_1 = amp;
+    this.freqRadS_1 = freqRadS;
+    this.phaseRad_1 = phaseRad;
+    this.amp_1 = amp;
   }
   protoOf(Harmonic).toString = function () {
-    return 'Harmonic(freqRadS=' + this.d23_1 + ', phaseRad=' + this.e23_1 + ', amp=' + this.f23_1 + ')';
+    return 'Harmonic(freqRadS=' + this.freqRadS_1 + ', phaseRad=' + this.phaseRad_1 + ', amp=' + this.amp_1 + ')';
   };
   protoOf(Harmonic).hashCode = function () {
-    var result = getNumberHashCode(this.d23_1);
-    result = imul(result, 31) + getNumberHashCode(this.e23_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f23_1) | 0;
+    var result = getNumberHashCode(this.freqRadS_1);
+    result = imul(result, 31) + getNumberHashCode(this.phaseRad_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.amp_1) | 0;
     return result;
   };
   protoOf(Harmonic).equals = function (other) {
@@ -1222,39 +1340,39 @@
       return true;
     if (!(other instanceof Harmonic))
       return false;
-    if (!equals(this.d23_1, other.d23_1))
+    if (!equals(this.freqRadS_1, other.freqRadS_1))
       return false;
-    if (!equals(this.e23_1, other.e23_1))
+    if (!equals(this.phaseRad_1, other.phaseRad_1))
       return false;
-    if (!equals(this.f23_1, other.f23_1))
+    if (!equals(this.amp_1, other.amp_1))
       return false;
     return true;
   };
   function computeCorneringLimit($this, course, currentIndex, window_0) {
-    var path = course.t1y_1;
+    var path = course.path_1;
     var radius = computeRadiusWindowed($this, path, currentIndex, window_0);
     // Inline function 'kotlin.math.sqrt' call
-    var x = 9.8 * radius * course.u1y_1.p1z();
+    var x = 9.8 * radius * course.cyclist_1.get_tanMaxLeanAngle_qqiag1_k$();
     var vMax = Math.sqrt(x);
     // Inline function 'kotlin.math.min' call
-    var a = course.u1y_1.r1z();
+    var a = course.cyclist_1.get_maxSpeedMS_xz2r7y_k$();
     var result = Math.min(a, vMax);
-    path.q1v(currentIndex, result);
+    path.setSpeedMaxIncline_8l69w1_k$(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.u1q_1 - 1 | 0;
+    var tmp0 = path.size_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.h23(path.r1u(maxi) - path.r1u(mini));
-    var totalDistance = path.k1u(maxi) - path.k1u(mini);
+    var totalBearingChange = $this.normalizeAngleDiff_6gshzi_k$(path.bearing_fz5vxm_k$(maxi) - path.bearing_fz5vxm_k$(mini));
+    var totalDistance = path.distance_5s4s77_k$(maxi) - path.distance_5s4s77_k$(mini);
     // Inline function 'kotlin.math.abs' call
     if (Math.abs(totalBearingChange) < 0.001) {
-      path.v1u(i, 200.0);
+      path.setRadius_p1cueq_k$(i, 200.0);
       return 200.0;
     }
     // Inline function 'kotlin.math.abs' call
@@ -1263,47 +1381,47 @@
     // Inline function 'kotlin.math.max' call
     var b_1 = Math.min(200.0, raw);
     var clamped = Math.max(5.0, b_1);
-    path.v1u(i, clamped);
+    path.setRadius_p1cueq_k$(i, clamped);
     return clamped;
   }
   function computeBrakingLimit($this, course, currentIndex, nextIndex) {
-    var path = course.t1y_1;
-    var vf = path.o1v(nextIndex);
-    var a = course.u1y_1.q1z();
-    var d = path.k1u(nextIndex) - path.k1u(currentIndex);
+    var path = course.path_1;
+    var vf = path.speedMax_mjo2cl_k$(nextIndex);
+    var a = course.cyclist_1.get_maxBrakeMS2_nzouxw_k$();
+    var d = path.distance_5s4s77_k$(nextIndex) - path.distance_5s4s77_k$(currentIndex);
     // Inline function 'kotlin.math.sqrt' call
     var x = vf * vf + 2.0 * a * d;
     return Math.sqrt(x);
   }
   function MaxSpeedComputer() {
-    this.o20_1 = 200.0;
-    this.p20_1 = 5.0;
-    this.q20_1 = 2.0;
-    this.r20_1 = 0.001;
-    this.s20_1 = 10;
-  }
-  protoOf(MaxSpeedComputer).t20 = function (course) {
-    var path = course.t1y_1;
-    var n = path.u1q_1;
+    this.MAX_RADIUS_M_1 = 200.0;
+    this.MIN_RADIUS_M_1 = 5.0;
+    this.END_SPEED_MS_1 = 2.0;
+    this.BEARING_THRESHOLD_1 = 0.001;
+    this.DEFAULT_WINDOW_1 = 10;
+  }
+  protoOf(MaxSpeedComputer).computeMaxSpeeds_jc4v4o_k$ = function (course) {
+    var path = course.path_1;
+    var n = path.size_1;
     var inductionVariable = n - 1 | 0;
     if (0 <= inductionVariable)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + -1 | 0;
         if (i === (n - 1 | 0)) {
-          path.p1v(i, 2.0);
+          path.setSpeedMax_7xvqir_k$(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.p1v(i, tmp$ret$0);
+          path.setSpeedMax_7xvqir_k$(i, tmp$ret$0);
         }
       }
        while (0 <= inductionVariable);
-    path.e1s();
+    path.computeDerivedData_uoxpeo_k$();
   };
-  protoOf(MaxSpeedComputer).h23 = function (angleIn) {
+  protoOf(MaxSpeedComputer).normalizeAngleDiff_6gshzi_k$ = function (angleIn) {
     var a = angleIn;
     while (a > 3.141592653589793)
       a = a - 2.0 * 3.141592653589793;
@@ -1317,11 +1435,11 @@
   }
   function MuscularPowerProvider() {
   }
-  protoOf(MuscularPowerProvider).u22 = function (course, path, pointIndex) {
-    var muscular = course.d1z_1.u22(course, path, pointIndex);
-    path.g1v(pointIndex, muscular);
-    var wheel = muscular * course.g1z().r1y_1;
-    path.h1v(pointIndex, wheel);
+  protoOf(MuscularPowerProvider).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var muscular = course.cyclistPowerProvider_1.powerAt_ejucaq_k$(course, path, pointIndex);
+    path.setPCyclistProvidedMuscular_aori9q_k$(pointIndex, muscular);
+    var wheel = muscular * course.get_bike_wojgoa_k$().efficiency_1;
+    path.setPCyclistProvidedWheel_ofsihz_k$(pointIndex, wheel);
     return wheel;
   };
   var MuscularPowerProvider_instance;
@@ -1334,7 +1452,7 @@
     var tol = dx / 1.0E7;
     while (dt2 - dt1 >= tol) {
       var dtMid = (dt1 + dt2) / 2.0;
-      var dxMid = $this.i23(pSum, equivalentMass, currentSpeed, dtMid);
+      var dxMid = $this.getDx_xtszre_k$(pSum, equivalentMass, currentSpeed, dtMid);
       if (dxMid < dx)
         dt1 = dtMid;
       else
@@ -1344,18 +1462,18 @@
   }
   function PowerComputer() {
   }
-  protoOf(PowerComputer).g23 = function (course, path, pointIndex, withCyclist) {
+  protoOf(PowerComputer).getNewPower_puvq9i_k$ = function (course, path, pointIndex, withCyclist) {
     var pSum = 0.0;
-    pSum = pSum + WheelBearingsPowerProvider_instance.u22(course, path, pointIndex);
-    pSum = pSum + RollingResistancePowerProvider_instance.u22(course, path, pointIndex);
-    pSum = pSum + AeroPowerProvider_instance.u22(course, path, pointIndex);
-    pSum = pSum + GravPowerProvider_instance.u22(course, path, pointIndex);
+    pSum = pSum + WheelBearingsPowerProvider_instance.powerAt_ejucaq_k$(course, path, pointIndex);
+    pSum = pSum + RollingResistancePowerProvider_instance.powerAt_ejucaq_k$(course, path, pointIndex);
+    pSum = pSum + AeroPowerProvider_instance.powerAt_ejucaq_k$(course, path, pointIndex);
+    pSum = pSum + GravPowerProvider_instance.powerAt_ejucaq_k$(course, path, pointIndex);
     if (withCyclist) {
-      pSum = pSum + MuscularPowerProvider_instance.u22(course, path, pointIndex);
+      pSum = pSum + MuscularPowerProvider_instance.powerAt_ejucaq_k$(course, path, pointIndex);
     }
     return pSum;
   };
-  protoOf(PowerComputer).i23 = function (pSum, equivalentMass, currentSpeed, dt) {
+  protoOf(PowerComputer).getDx_xtszre_k$ = 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);
@@ -1364,40 +1482,40 @@
     var newSpeed = Math.max(tmp0, b);
     return (currentSpeed + newSpeed) * dt / 2.0;
   };
-  protoOf(PowerComputer).j23 = function (equivalentMass, s1, s2, dt) {
+  protoOf(PowerComputer).getTotPower_kfbciq_k$ = function (equivalentMass, s1, s2, dt) {
     return 0.5 * equivalentMass * (s2 * s2 - s1 * s1) / dt;
   };
-  protoOf(PowerComputer).k23 = function (pSum, equivalentMass, currentSpeed, dx) {
+  protoOf(PowerComputer).getDt_t0pcee_k$ = function (pSum, equivalentMass, currentSpeed, dx) {
     var dt = 0.1;
-    while (this.i23(pSum, equivalentMass, currentSpeed, dt) <= dx) {
+    while (this.getDx_xtszre_k$(pSum, equivalentMass, currentSpeed, dt) <= dx) {
       dt = dt + 0.1;
     }
     return getDtInner(this, pSum, equivalentMass, currentSpeed, dx, dt - 0.1, dt);
   };
-  protoOf(PowerComputer).l23 = function (course, path, equivalentMass, i) {
+  protoOf(PowerComputer).computeCyclistPower_kgcsa3_k$ = function (course, path, equivalentMass, i) {
     if (i === 0) {
-      path.l1v(i, 0.0);
+      path.setPComputedPower_c3m6yw_k$(i, 0.0);
       return Unit_instance;
     }
-    var resistive = this.g23(course, path, i - 1 | 0, false);
-    var s1 = path.m1v(i - 1 | 0);
-    var s2 = path.m1v(i);
-    var dtSeconds = path.p1u(i) / 1000.0;
-    var totPower = this.j23(equivalentMass, s1, s2, dtSeconds);
-    path.i1v(i, totPower);
+    var resistive = this.getNewPower_puvq9i_k$(course, path, i - 1 | 0, false);
+    var s1 = path.speed_npav2n_k$(i - 1 | 0);
+    var s2 = path.speed_npav2n_k$(i);
+    var dtSeconds = path.dt_17uzp4_k$(i) / 1000.0;
+    var totPower = this.getTotPower_kfbciq_k$(equivalentMass, s1, s2, dtSeconds);
+    path.setPComputedTotalPower_wm6di_k$(i, totPower);
     var powerWheel = totPower - resistive;
-    path.j1v(i, powerWheel);
+    path.setPComputedWheelPower_qplog3_k$(i, powerWheel);
     // Inline function 'kotlin.math.max' call
-    var computed = Math.max(0.0, powerWheel) / course.g1z().r1y_1;
-    path.l1v(i, computed);
+    var computed = Math.max(0.0, powerWheel) / course.get_bike_wojgoa_k$().efficiency_1;
+    path.setPComputedPower_c3m6yw_k$(i, computed);
   };
-  protoOf(PowerComputer).m23 = function (course) {
-    var m = course.u1y_1.j1z_1;
-    var totalInertia = course.v1y_1.o1y_1 + course.v1y_1.p1y_1;
-    return m + totalInertia / (course.v1y_1.q1y_1 * course.v1y_1.q1y_1);
+  protoOf(PowerComputer).equivalentMass_3uxz65_k$ = function (course) {
+    var m = course.cyclist_1.massKg_1;
+    var totalInertia = course.bike_1.inertiaFront_1 + course.bike_1.inertiaRear_1;
+    return m + totalInertia / (course.bike_1.wheelRadiusM_1 * course.bike_1.wheelRadiusM_1);
   };
-  protoOf(PowerComputer).n23 = function (course) {
-    return this.m23(course.z1y_1);
+  protoOf(PowerComputer).equivalentMass_e3djhu_k$ = function (course) {
+    return this.equivalentMass_3uxz65_k$(course.course_1);
   };
   var PowerComputer_instance;
   function PowerComputer_getInstance() {
@@ -1407,34 +1525,34 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.q23_1 = power;
+    this.power_1 = power;
   }
-  protoOf(PowerProviderConstant).c23 = function (course, path, pointIndex) {
-    return this.q23_1;
+  protoOf(PowerProviderConstant).optimalPower_36kg19_k$ = function (course, path, pointIndex) {
+    return this.power_1;
   };
   function PowerProviderConstantWithTiring(power, useHarmonics, durationSeconds, random) {
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.t23_1 = power;
-    this.u23_1 = durationSeconds;
+    this.power_1 = power;
+    this.durationSeconds_1 = durationSeconds;
     // Inline function 'kotlin.require' call
-    if (!(this.u23_1 > 0.0)) {
-      var message = 'durationSeconds must be > 0, got ' + this.u23_1;
+    if (!(this.durationSeconds_1 > 0.0)) {
+      var message = 'durationSeconds must be > 0, got ' + this.durationSeconds_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
   }
-  protoOf(PowerProviderConstantWithTiring).c23 = function (course, path, pointIndex) {
-    var elapsedS = path.n1u(pointIndex) / 1000.0;
+  protoOf(PowerProviderConstantWithTiring).optimalPower_36kg19_k$ = function (course, path, pointIndex) {
+    var elapsedS = path.elapsed_7307rw_k$(pointIndex) / 1000.0;
     // Inline function 'kotlin.math.max' call
-    var b = 1.0 - 0.6 * elapsedS / this.u23_1;
+    var b = 1.0 - 0.6 * elapsedS / this.durationSeconds_1;
     var c = Math.max(0.5, b);
-    return this.t23_1 * c;
+    return this.power_1 * c;
   };
   function PowerProviderFromData() {
   }
-  protoOf(PowerProviderFromData).u22 = function (course, path, pointIndex) {
-    return path.d1r(pointIndex);
+  protoOf(PowerProviderFromData).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    return path.pInputPower_ybhudp_k$(pointIndex);
   };
   var PowerProviderFromData_instance;
   function PowerProviderFromData_getInstance() {
@@ -1442,7 +1560,7 @@
   }
   function RhoProviderDefault() {
   }
-  protoOf(RhoProviderDefault).x22 = function (course, path, pointIndex) {
+  protoOf(RhoProviderDefault).rho_pwqvzi_k$ = function (course, path, pointIndex) {
     return 1.225;
   };
   var RhoProviderDefault_instance;
@@ -1450,16 +1568,16 @@
     return RhoProviderDefault_instance;
   }
   function RhoProviderEstimate() {
-    this.v23_1 = 101325.0;
-    this.w23_1 = 288.15;
-    this.x23_1 = 9.80665;
-    this.y23_1 = 0.0065;
-    this.z23_1 = 287.05;
-  }
-  protoOf(RhoProviderEstimate).x22 = function (course, path, pointIndex) {
-    var providedTemp = path.m1t(pointIndex, PointField_TEMPERATURE_getInstance());
+    this.P0__1 = 101325.0;
+    this.T0__1 = 288.15;
+    this.G_ISA_1 = 9.80665;
+    this.L_1 = 0.0065;
+    this.R_1 = 287.05;
+  }
+  protoOf(RhoProviderEstimate).rho_pwqvzi_k$ = function (course, path, pointIndex) {
+    var providedTemp = path.get_z3le6l_k$(pointIndex, PointField_TEMPERATURE_getInstance());
     var temperatureC = isNaN_0(providedTemp) ? 15.0 : providedTemp;
-    var providedElevation = path.y1q(pointIndex);
+    var providedElevation = path.elevation_iziwkb_k$(pointIndex);
     var altitude = isNaN_0(providedElevation) ? 0.0 : providedElevation;
     var tKelvin = temperatureC + 273.15;
     var tmp0 = 1.0 - 0.0065 * altitude / 288.15;
@@ -1474,17 +1592,17 @@
   }
   function RollingResistancePowerProvider() {
   }
-  protoOf(RollingResistancePowerProvider).u22 = function (course, path, pointIndex) {
-    var m = course.f1z().j1z_1;
-    var crr = course.g1z().n1y_1;
-    var grade = path.t1u(pointIndex);
-    var speed = path.m1v(pointIndex);
+  protoOf(RollingResistancePowerProvider).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var m = course.get_cyclist_lkc0de_k$().massKg_1;
+    var crr = course.get_bike_wojgoa_k$().crr_1;
+    var grade = path.grade_c4yjz5_k$(pointIndex);
+    var speed = path.speed_npav2n_k$(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.b1v(pointIndex, p);
+    path.setPRollingResistance_h04uz6_k$(pointIndex, p);
     return p;
   };
   var RollingResistancePowerProvider_instance;
@@ -1492,18 +1610,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.t1t(j, field, src.m1t(i, field));
+    var _iterator__ex2g4s = get_entries().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var field = _iterator__ex2g4s.next_20eer_k$();
+      dst.set_b3ze83_k$(j, field, src.get_z3le6l_k$(i, field));
     }
   }
   function VirtualizeService() {
-    this.u20_1 = 100000;
+    this.MAX_ITERATIONS_1 = 100000;
   }
-  protoOf(VirtualizeService).v20 = function (course) {
-    var input = course.e1z();
-    var n = input.u1q_1;
+  protoOf(VirtualizeService).virtualizeTrack_tp3afi_k$ = function (course) {
+    var input = course.get_path_wos8ry_k$();
+    var n = input.size_1;
     if (n === 0)
       return new Path(0);
     if (n === 1) {
@@ -1511,54 +1629,54 @@
       copyAllFields(this, input, 0, singleton, 0);
       return singleton;
     }
-    var mEq = PowerComputer_instance.n23(course);
+    var mEq = PowerComputer_instance.equivalentMass_e3djhu_k$(course);
     var out = new Path(n);
     copyAllFields(this, input, 0, out, 0);
     var speed = 0.5555555555555556;
     var startTimeMs = 0.0;
     var timeMs = startTimeMs;
-    out.q1r(0, timeMs);
-    out.o1u(0, 0.0);
-    out.n1v(0, speed);
-    out.r1v(0, speed);
+    out.setTime_rfmvcd_k$(0, timeMs);
+    out.setElapsed_916ug_k$(0, 0.0);
+    out.setSpeed_1slan1_k$(0, speed);
+    out.setVirtSpeedCurrent_kvg8yv_k$(0, speed);
     var i = 1;
     var iter = 0;
     $l$loop: while (i < n) {
-      var dx = input.k1u(i) - input.k1u(i - 1 | 0);
-      var pSum = PowerComputer_instance.g23(course, out, i - 1 | 0, true);
-      var dt = PowerComputer_instance.k23(pSum, mEq, speed, dx);
+      var dx = input.distance_5s4s77_k$(i) - input.distance_5s4s77_k$(i - 1 | 0);
+      var pSum = PowerComputer_instance.getNewPower_puvq9i_k$(course, out, i - 1 | 0, true);
+      var dt = PowerComputer_instance.getDt_t0pcee_k$(pSum, mEq, speed, dx);
       var speedNew = 2.0 * dx / dt - speed;
       copyAllFields(this, input, i, out, i);
-      var speedMax = input.o1v(i);
+      var speedMax = input.speedMax_mjo2cl_k$(i);
       if (speedNew > speedMax) {
         speedNew = speedMax;
         dt = 2.0 * dx / (speedNew + speed);
       }
       speed = speedNew;
       timeMs = timeMs + dt * 1000.0;
-      out.q1r(i, timeMs);
-      out.o1u(i, timeMs - startTimeMs);
-      out.m1u(i, dx);
-      out.q1u(i, dt * 1000.0);
-      out.n1v(i, speed);
-      out.r1v(i, speed);
+      out.setTime_rfmvcd_k$(i, timeMs);
+      out.setElapsed_916ug_k$(i, timeMs - startTimeMs);
+      out.setDx_uk0ky4_k$(i, dx);
+      out.setDt_sgarxs_k$(i, dt * 1000.0);
+      out.setSpeed_1slan1_k$(i, speed);
+      out.setVirtSpeedCurrent_kvg8yv_k$(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.z1v();
-    var inductionVariable = progression.lc_1;
-    var last = progression.mc_1;
+    var progression = out.get_indices_xelk8u_k$();
+    var inductionVariable = progression.first_1;
+    var last = progression.last_1;
     if (inductionVariable <= last)
       do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        PowerComputer_instance.l23(course, out, mEq, j);
+        PowerComputer_instance.computeCyclistPower_kgcsa3_k$(course, out, mEq, j);
       }
        while (!(j === last));
-    out.e1s();
+    out.computeDerivedData_uoxpeo_k$();
     return out;
   };
   var VirtualizeService_instance;
@@ -1567,10 +1685,10 @@
   }
   function WheelBearingsPowerProvider() {
   }
-  protoOf(WheelBearingsPowerProvider).u22 = function (course, path, pointIndex) {
-    var speed = path.m1v(pointIndex);
+  protoOf(WheelBearingsPowerProvider).powerAt_ejucaq_k$ = function (course, path, pointIndex) {
+    var speed = path.speed_npav2n_k$(pointIndex);
     var p = -speed * (91.0 + 8.7 * speed) / 1000.0;
-    path.c1v(pointIndex, p);
+    path.setPWheelBearings_djmhww_k$(pointIndex, p);
     return p;
   };
   var WheelBearingsPowerProvider_instance;
@@ -1579,25 +1697,25 @@
   }
   function Companion_6() {
     Companion_instance_6 = this;
-    this.a24_1 = new Wind(0.0, 0.0);
+    this.NONE_1 = new Wind(0.0, 0.0);
   }
   var Companion_instance_6;
-  function Companion_getInstance_8() {
+  function Companion_getInstance_9() {
     if (Companion_instance_6 == null)
       new Companion_6();
     return Companion_instance_6;
   }
   function Wind(speedMS, directionRad) {
-    Companion_getInstance_8();
-    this.r22_1 = speedMS;
-    this.s22_1 = directionRad;
+    Companion_getInstance_9();
+    this.speedMS_1 = speedMS;
+    this.directionRad_1 = directionRad;
   }
   protoOf(Wind).toString = function () {
-    return 'Wind(speedMS=' + this.r22_1 + ', directionRad=' + this.s22_1 + ')';
+    return 'Wind(speedMS=' + this.speedMS_1 + ', directionRad=' + this.directionRad_1 + ')';
   };
   protoOf(Wind).hashCode = function () {
-    var result = getNumberHashCode(this.r22_1);
-    result = imul(result, 31) + getNumberHashCode(this.s22_1) | 0;
+    var result = getNumberHashCode(this.speedMS_1);
+    result = imul(result, 31) + getNumberHashCode(this.directionRad_1) | 0;
     return result;
   };
   protoOf(Wind).equals = function (other) {
@@ -1605,55 +1723,65 @@
       return true;
     if (!(other instanceof Wind))
       return false;
-    if (!equals(this.r22_1, other.r22_1))
+    if (!equals(this.speedMS_1, other.speedMS_1))
       return false;
-    if (!equals(this.s22_1, other.s22_1))
+    if (!equals(this.directionRad_1, other.directionRad_1))
       return false;
     return true;
   };
   function WindProviderNone() {
   }
-  protoOf(WindProviderNone).w22 = function (course, path, pointIndex) {
-    return Companion_getInstance_8().a24_1;
+  protoOf(WindProviderNone).wind_umf2tf_k$ = function (course, path, pointIndex) {
+    return Companion_getInstance_9().NONE_1;
   };
   var WindProviderNone_instance;
   function WindProviderNone_getInstance() {
     return WindProviderNone_instance;
   }
   function WindProviderConstant(wind) {
-    this.b24_1 = wind;
+    this.wind_1 = wind;
   }
-  protoOf(WindProviderConstant).w22 = function (course, path, pointIndex) {
-    return this.b24_1;
+  protoOf(WindProviderConstant).wind_umf2tf_k$ = function (course, path, pointIndex) {
+    return this.wind_1;
   };
   function parseGpxWaypoints(xml) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = GpxParser_instance.m1r(xml).e1q_1;
+    var this_0 = GpxParser_instance.parse$default_ez0f31_k$(xml).waypoints_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var tmp$ret$2 = waypointObj(item);
-      destination.h(tmp$ret$2);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     return copyToArray(destination);
   }
   function parseGpx(xml) {
-    return firstTrackAsPath(GpxParser_instance.m1r(xml));
+    return firstTrackAsPath(GpxParser_instance.parse$default_ez0f31_k$(xml));
   }
   function parseGpxTracks(xml) {
     // Inline function 'kotlin.collections.toTypedArray' call
-    var this_0 = tracksAsPaths(GpxParser_instance.m1r(xml));
+    var this_0 = tracksAsPaths(GpxParser_instance.parse$default_ez0f31_k$(xml));
     return copyToArray(this_0);
   }
   function parseGpxSegments(xml) {
     // Inline function 'kotlin.collections.toTypedArray' call
-    var this_0 = segmentsAsPaths(GpxParser_instance.m1r(xml));
+    var this_0 = segmentsAsPaths(GpxParser_instance.parse$default_ez0f31_k$(xml));
+    return copyToArray(this_0);
+  }
+  function parseGpxTracksOnly(xml) {
+    // Inline function 'kotlin.collections.toTypedArray' call
+    var this_0 = tracksAsPaths(GpxParser_instance.parse$default_ez0f31_k$(xml), setOf(GpxPathKind_TRACK_getInstance()));
     return copyToArray(this_0);
   }
-  function writeGpxTracks(paths, waypoints) {
+  function parseGpxRoutesOnly(xml) {
+    // Inline function 'kotlin.collections.toTypedArray' call
+    var this_0 = tracksAsPaths(GpxParser_instance.parse$default_ez0f31_k$(xml), setOf(GpxPathKind_ROUTE_getInstance()));
+    return copyToArray(this_0);
+  }
+  function writeGpxTracks(paths, waypoints, writeExtensions) {
     var tmp;
     if (waypoints === VOID) {
       // Inline function 'kotlin.emptyArray' call
@@ -1662,6 +1790,7 @@
       tmp = waypoints;
     }
     waypoints = tmp;
+    writeExtensions = writeExtensions === VOID ? true : writeExtensions;
     var tmp_0 = GpxWriter_instance;
     var tmp_1 = toList(paths);
     // Inline function 'kotlin.collections.map' call
@@ -1673,33 +1802,35 @@
       var item = waypoints[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
       var tmp$ret$3 = toGpxWaypoint(item);
-      destination.h(tmp$ret$3);
+      destination.add_utx5q5_k$(tmp$ret$3);
     }
-    return tmp_0.o1s(tmp_1, VOID, VOID, destination);
+    return tmp_0.write$default_koqy5u_k$(tmp_1, VOID, VOID, destination, VOID, writeExtensions);
   }
   function pathSize(path) {
-    return path.u1q_1;
+    return path.size_1;
   }
   function pathTotalDistance(path) {
-    return path.x1r_1;
+    return path.totalDistance_1;
   }
   function pathDurationMs(path) {
-    return path.c1s_1;
+    return path.durationMs_1;
   }
   function pathElevationGain(path) {
-    return path.a1s_1;
+    return path.elevationGain_1;
   }
   function pathElevationLoss(path) {
-    return path.b1s_1;
+    return path.elevationLoss_1;
   }
   function pointAt(path, i) {
-    return pointObj(path.a1w(i), path.b1w(i), path.y1q(i), path.z1q(i), path.m1v(i), path.k1v(i), path.k1u(i), path.t1u(i));
+    return pointObj(path.latitudeDeg_i25sm6_k$(i), path.longitudeDeg_ikk1un_k$(i), path.elevation_iziwkb_k$(i), path.time_ryc845_k$(i), path.speed_npav2n_k$(i), path.pComputedPower_g6dnn4_k$(i), path.distance_5s4s77_k$(i), path.grade_c4yjz5_k$(i));
   }
-  function writeGpx(path) {
-    return GpxWriter_instance.m1s(toGpxDocument(path, VOID, 'virtualized'));
+  function writeGpx(path, writeExtensions) {
+    writeExtensions = writeExtensions === VOID ? true : writeExtensions;
+    return GpxWriter_instance.write_7y52k2_k$(toGpxDocument(path, VOID, 'virtualized'), writeExtensions);
   }
-  function writeGpxAt(path, startTimeEpochMs) {
-    return GpxWriter_instance.m1s(toGpxDocument(path, VOID, 'virtualized', Companion_getInstance().nd(numberToLong(startTimeEpochMs))));
+  function writeGpxAt(path, startTimeEpochMs, writeExtensions) {
+    writeExtensions = writeExtensions === VOID ? true : writeExtensions;
+    return GpxWriter_instance.write_7y52k2_k$(toGpxDocument(path, VOID, 'virtualized', Companion_getInstance().fromEpochMilliseconds_uaz65_k$(numberToLong(startTimeEpochMs))), writeExtensions);
   }
   function enhance(path, options) {
     var tmp = GlobalScope_instance;
@@ -1710,7 +1841,7 @@
     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_0().g1w(fieldProp);
+    var tmp0_elvis_lhs = Companion_getInstance_0().byProp_kdf1eo_k$(fieldProp);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -1720,35 +1851,35 @@
       tmp = tmp0_elvis_lhs;
     }
     var field = tmp;
-    return path.m1t(i, field);
+    return path.get_z3le6l_k$(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$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var o = {};
-      o.prop = item.a1t_1;
-      o.unit = item.b1t_1;
-      o.shortDescription = item.c1t_1;
-      o.categoryId = item.d1t_1.j1w_1;
-      o.categoryName = item.d1t_1.k1w_1;
-      o.notSelectable = item.e1t_1;
-      o.anglesInRadians = item.f1t_1;
+      o.prop = item.prop_1;
+      o.unit = item.unit_1;
+      o.shortDescription = item.shortDescription_1;
+      o.categoryId = item.category_1.id_1;
+      o.categoryName = item.category_1.displayName_1;
+      o.notSelectable = item.notSelectable_1;
+      o.anglesInRadians = item.anglesInRadians_1;
       // Inline function 'kotlin.js.unsafeCast' call
-      destination.h(o);
+      destination.add_utx5q5_k$(o);
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     return copyToArray(destination);
   }
   function pathLatitudeDeg(path, i) {
-    return path.a1w(i);
+    return path.latitudeDeg_i25sm6_k$(i);
   }
   function pathLongitudeDeg(path, i) {
-    return path.b1w(i);
+    return path.longitudeDeg_ikk1un_k$(i);
   }
   function pathToCsv(path, separator, unitsInHeader) {
     var tmp = CsvWriter_instance;
@@ -1760,52 +1891,68 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    return tmp.l1t(path, new CsvOptions(VOID, tmp_0, unitsInHeader));
+    return tmp.write_p5vnh4_k$(path, new CsvOptions(VOID, tmp_0, unitsInHeader));
   }
   function pathToJson(path, pretty) {
-    return JsonWriter_instance.s1t(path, new JsonOptions(VOID, pretty));
+    return JsonWriter_instance.write_lwqeog_k$(path, new JsonOptions(VOID, pretty));
   }
   function pathToFit(path, name, startTimeEpochMs) {
-    return toFitBytes(path, name, Companion_getInstance().nd(numberToLong(startTimeEpochMs)));
+    return toFitBytes(path, name, Companion_getInstance().fromEpochMilliseconds_uaz65_k$(numberToLong(startTimeEpochMs)));
+  }
+  function pathsToFit(paths, name, startTimeEpochMs, interPathGapMs) {
+    interPathGapMs = interPathGapMs === VOID ? 0.0 : interPathGapMs;
+    var tmp = toList(paths);
+    var tmp_0 = Companion_getInstance().fromEpochMilliseconds_uaz65_k$(numberToLong(startTimeEpochMs));
+    Companion_getInstance_1();
+    // Inline function 'kotlin.time.Companion.milliseconds' call
+    var this_0 = numberToLong(interPathGapMs);
+    var tmp$ret$0 = toDuration(this_0, DurationUnit_MILLISECONDS_getInstance());
+    return toFitBytes_0(tmp, name, tmp_0, VOID, tmp$ret$0);
+  }
+  function dominantHeadwindAzimuth(path) {
+    return dominantHeadwindAzimuthDeg(path);
+  }
+  function dominantHeadwindAzimuthOfTracks(paths) {
+    return dominantHeadwindAzimuthDeg_0(toList(paths));
   }
   function detectClimbs(path) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = ClimbDetector_instance.q22(path);
+    var this_0 = ClimbDetector_instance.detect$default_6ml3ny_k$(path);
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var tmp$ret$2 = toDto_0(item);
-      destination.h(tmp$ret$2);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     return copyToArray(destination);
   }
   function detectClimbsWithOptions(path, minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = ClimbDetector_instance.p22(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster));
+    var this_0 = ClimbDetector_instance.detect_llooq2_k$(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster));
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var tmp$ret$2 = toDto_0(item);
-      destination.h(tmp$ret$2);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     return copyToArray(destination);
   }
   function waypointObj(w) {
     var o = {};
-    o.latitudeDeg = w.u1p_1;
-    o.longitudeDeg = w.v1p_1;
-    o.elevationM = w.w1p_1;
-    o.name = w.x1p_1;
-    o.description = w.y1p_1;
-    o.symbol = w.z1p_1;
-    o.type = w.a1q_1;
-    var tmp0_safe_receiver = w.b1q_1;
+    o.latitudeDeg = w.latitudeDeg_1;
+    o.longitudeDeg = w.longitudeDeg_1;
+    o.elevationM = w.elevationM_1;
+    o.name = w.name_1;
+    o.description = w.description_1;
+    o.symbol = w.symbol_1;
+    o.type = w.type_1;
+    var tmp0_safe_receiver = w.timeEpochMs_1;
     o.timeEpochMs = tmp0_safe_receiver == null ? null : toNumber(tmp0_safe_receiver);
     // Inline function 'kotlin.js.unsafeCast' call
     return o;
@@ -1902,39 +2049,39 @@
   }
   function toDto(_this__u8e3s4) {
     var o = {};
-    o.startDistanceM = _this__u8e3s4.m21_1;
-    o.endDistanceM = _this__u8e3s4.n21_1;
-    o.startElevationM = _this__u8e3s4.o21_1;
-    o.endElevationM = _this__u8e3s4.p21_1;
-    o.lengthM = _this__u8e3s4.i21();
-    o.elevationGainM = _this__u8e3s4.j21();
-    o.grade = _this__u8e3s4.q21();
+    o.startDistanceM = _this__u8e3s4.startDistanceM_1;
+    o.endDistanceM = _this__u8e3s4.endDistanceM_1;
+    o.startElevationM = _this__u8e3s4.startElevationM_1;
+    o.endElevationM = _this__u8e3s4.endElevationM_1;
+    o.lengthM = _this__u8e3s4.get_lengthM_2aqrzy_k$();
+    o.elevationGainM = _this__u8e3s4.get_elevationGainM_6kg9eu_k$();
+    o.grade = _this__u8e3s4.get_grade_is33qm_k$();
     // Inline function 'kotlin.js.unsafeCast' call
     return o;
   }
   function toDto_0(_this__u8e3s4) {
     var o = {};
-    o.startIndex = _this__u8e3s4.z20_1;
-    o.endIndex = _this__u8e3s4.a21_1;
-    o.startDistanceM = _this__u8e3s4.b21_1;
-    o.endDistanceM = _this__u8e3s4.c21_1;
-    o.startElevationM = _this__u8e3s4.d21_1;
-    o.endElevationM = _this__u8e3s4.e21_1;
-    o.lengthM = _this__u8e3s4.i21();
-    o.elevationGainM = _this__u8e3s4.j21();
-    o.averageGrade = _this__u8e3s4.k21();
-    o.climbingGrade = _this__u8e3s4.l21();
-    o.positiveElevationM = _this__u8e3s4.f21_1;
-    o.negativeElevationM = _this__u8e3s4.g21_1;
+    o.startIndex = _this__u8e3s4.startIndex_1;
+    o.endIndex = _this__u8e3s4.endIndex_1;
+    o.startDistanceM = _this__u8e3s4.startDistanceM_1;
+    o.endDistanceM = _this__u8e3s4.endDistanceM_1;
+    o.startElevationM = _this__u8e3s4.startElevationM_1;
+    o.endElevationM = _this__u8e3s4.endElevationM_1;
+    o.lengthM = _this__u8e3s4.get_lengthM_2aqrzy_k$();
+    o.elevationGainM = _this__u8e3s4.get_elevationGainM_6kg9eu_k$();
+    o.averageGrade = _this__u8e3s4.get_averageGrade_oooweb_k$();
+    o.climbingGrade = _this__u8e3s4.get_climbingGrade_olocdd_k$();
+    o.positiveElevationM = _this__u8e3s4.positiveElevationM_1;
+    o.negativeElevationM = _this__u8e3s4.negativeElevationM_1;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.h21_1;
+    var this_0 = _this__u8e3s4.parts_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var tmp$ret$2 = toDto(item);
-      destination.h(tmp$ret$2);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     o.parts = copyToArray(destination);
@@ -1942,31 +2089,31 @@
     return o;
   }
   function enhance$slambda($options, $path, resultContinuation) {
-    this.k24_1 = $options;
-    this.l24_1 = $path;
+    this.$options_1 = $options;
+    this.$path_1 = $path;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(enhance$slambda).n24 = function ($this$promise, $completion) {
-    var tmp = this.n11($this$promise, $completion);
-    tmp.j6_1 = Unit_instance;
-    tmp.k6_1 = null;
-    return tmp.p6();
+  protoOf(enhance$slambda).invoke_jiwoso_k$ = function ($this$promise, $completion) {
+    var tmp = this.create_rcuf4x_k$($this$promise, $completion);
+    tmp.result_1 = Unit_instance;
+    tmp.exception_1 = null;
+    return tmp.doResume_5yljmg_k$();
   };
-  protoOf(enhance$slambda).x6 = function (p1, $completion) {
-    return this.n24((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+  protoOf(enhance$slambda).invoke_qns8j1_k$ = function (p1, $completion) {
+    return this.invoke_jiwoso_k$((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(enhance$slambda).p6 = function () {
-    var suspendResult = this.j6_1;
+  protoOf(enhance$slambda).doResume_5yljmg_k$ = function () {
+    var suspendResult = this.result_1;
     $sm: do
       try {
-        var tmp = this.h6_1;
+        var tmp = this.state_1;
         switch (tmp) {
           case 0:
-            this.i6_1 = 2;
-            var opts = toEnhanceOptions(this.k24_1);
-            var provider = opts.w1z_1 ? new ElevationProvider() : null;
-            this.h6_1 = 1;
-            suspendResult = Enhancer_instance.x20(this.l24_1, provider, opts, this);
+            this.exceptionState_1 = 2;
+            var opts = toEnhanceOptions(this.$options_1);
+            var provider = opts.fixElevation_1 ? new ElevationProvider() : null;
+            this.state_1 = 1;
+            suspendResult = Enhancer_instance.enhanceCourseDefault_jm937y_k$(this.$path_1, provider, opts, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -1975,61 +2122,61 @@
           case 1:
             return suspendResult;
           case 2:
-            throw this.k6_1;
+            throw this.exception_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.i6_1 === 2) {
+        if (this.exceptionState_1 === 2) {
           throw e;
         } else {
-          this.h6_1 = this.i6_1;
-          this.k6_1 = e;
+          this.state_1 = this.exceptionState_1;
+          this.exception_1 = e;
         }
       }
      while (true);
   };
-  protoOf(enhance$slambda).n11 = function ($this$promise, completion) {
-    var i = new enhance$slambda(this.k24_1, this.l24_1, completion);
-    i.m24_1 = $this$promise;
+  protoOf(enhance$slambda).create_rcuf4x_k$ = function ($this$promise, completion) {
+    var i = new enhance$slambda(this.$options_1, this.$path_1, completion);
+    i.$this$promise_1 = $this$promise;
     return i;
   };
   function enhance$slambda_0($options, $path, resultContinuation) {
     var i = new enhance$slambda($options, $path, resultContinuation);
     return constructCallableReference(function ($this$promise, $completion) {
-      return i.n24($this$promise, $completion);
+      return i.invoke_jiwoso_k$($this$promise, $completion);
     }, 1);
   }
   function enhanceWithCourse$slambda($options, $path, $cyclist, $bike, $wind, $power, resultContinuation) {
-    this.w24_1 = $options;
-    this.x24_1 = $path;
-    this.y24_1 = $cyclist;
-    this.z24_1 = $bike;
-    this.a25_1 = $wind;
-    this.b25_1 = $power;
+    this.$options_1 = $options;
+    this.$path_1 = $path;
+    this.$cyclist_1 = $cyclist;
+    this.$bike_1 = $bike;
+    this.$wind_1 = $wind;
+    this.$power_1 = $power;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(enhanceWithCourse$slambda).n24 = function ($this$promise, $completion) {
-    var tmp = this.n11($this$promise, $completion);
-    tmp.j6_1 = Unit_instance;
-    tmp.k6_1 = null;
-    return tmp.p6();
+  protoOf(enhanceWithCourse$slambda).invoke_jiwoso_k$ = function ($this$promise, $completion) {
+    var tmp = this.create_rcuf4x_k$($this$promise, $completion);
+    tmp.result_1 = Unit_instance;
+    tmp.exception_1 = null;
+    return tmp.doResume_5yljmg_k$();
   };
-  protoOf(enhanceWithCourse$slambda).x6 = function (p1, $completion) {
-    return this.n24((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+  protoOf(enhanceWithCourse$slambda).invoke_qns8j1_k$ = function (p1, $completion) {
+    return this.invoke_jiwoso_k$((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(enhanceWithCourse$slambda).p6 = function () {
-    var suspendResult = this.j6_1;
+  protoOf(enhanceWithCourse$slambda).doResume_5yljmg_k$ = function () {
+    var suspendResult = this.result_1;
     $sm: do
       try {
-        var tmp = this.h6_1;
+        var tmp = this.state_1;
         switch (tmp) {
           case 0:
-            this.i6_1 = 2;
-            var opts = toEnhanceOptions(this.w24_1);
-            var provider = opts.w1z_1 ? new ElevationProvider() : null;
-            var course = new CoursePhysics(new Course(this.x24_1, toCyclist(this.y24_1), toBike(this.z24_1)), RhoProviderEstimate_instance, AeroProviderConstant_instance, toWindProvider(this.a25_1), toCyclistPowerProvider(this.b25_1));
-            this.h6_1 = 1;
-            suspendResult = Enhancer_instance.y20(course, opts, provider, this);
+            this.exceptionState_1 = 2;
+            var opts = toEnhanceOptions(this.$options_1);
+            var provider = opts.fixElevation_1 ? new ElevationProvider() : null;
+            var course = new CoursePhysics(new Course(this.$path_1, toCyclist(this.$cyclist_1), toBike(this.$bike_1)), RhoProviderEstimate_instance, AeroProviderConstant_instance, toWindProvider(this.$wind_1), toCyclistPowerProvider(this.$power_1));
+            this.state_1 = 1;
+            suspendResult = Enhancer_instance.enhanceCourse_mout3j_k$(course, opts, provider, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -2038,28 +2185,28 @@
           case 1:
             return suspendResult;
           case 2:
-            throw this.k6_1;
+            throw this.exception_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.i6_1 === 2) {
+        if (this.exceptionState_1 === 2) {
           throw e;
         } else {
-          this.h6_1 = this.i6_1;
-          this.k6_1 = e;
+          this.state_1 = this.exceptionState_1;
+          this.exception_1 = e;
         }
       }
      while (true);
   };
-  protoOf(enhanceWithCourse$slambda).n11 = function ($this$promise, completion) {
-    var i = new enhanceWithCourse$slambda(this.w24_1, this.x24_1, this.y24_1, this.z24_1, this.a25_1, this.b25_1, completion);
-    i.c25_1 = $this$promise;
+  protoOf(enhanceWithCourse$slambda).create_rcuf4x_k$ = function ($this$promise, completion) {
+    var i = new enhanceWithCourse$slambda(this.$options_1, this.$path_1, this.$cyclist_1, this.$bike_1, this.$wind_1, this.$power_1, completion);
+    i.$this$promise_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.n24($this$promise, $completion);
+      return i.invoke_jiwoso_k$($this$promise, $completion);
     }, 1);
   }
   //region block: init
@@ -2091,6 +2238,8 @@
     engine.parseGpx = parseGpx;
     engine.parseGpxTracks = parseGpxTracks;
     engine.parseGpxSegments = parseGpxSegments;
+    engine.parseGpxTracksOnly = parseGpxTracksOnly;
+    engine.parseGpxRoutesOnly = parseGpxRoutesOnly;
     engine.writeGpxTracks = writeGpxTracks;
     engine.pathSize = pathSize;
     engine.pathTotalDistance = pathTotalDistance;
@@ -2109,6 +2258,9 @@
     engine.pathToCsv = pathToCsv;
     engine.pathToJson = pathToJson;
     engine.pathToFit = pathToFit;
+    engine.pathsToFit = pathsToFit;
+    engine.dominantHeadwindAzimuth = dominantHeadwindAzimuth;
+    engine.dominantHeadwindAzimuthOfTracks = dominantHeadwindAzimuthOfTracks;
     engine.detectClimbs = detectClimbs;
     engine.detectClimbsWithOptions = detectClimbsWithOptions;
   }