@glandais/vcyclist-engine 4.3.0 → 5.0.1

package/vcyclist-engine.js

@@ -38,21 +38,28 @@
   var initMetadataForClass = kotlin_kotlin.$_$.u6;
   var toString = kotlin_kotlin.$_$.m7;
   var hashCode = kotlin_kotlin.$_$.t6;
+  var ElevationGainPreset_DEM_getInstance = kotlin_io_github_glandais_gpx.$_$.c;
   var initMetadataForObject = kotlin_kotlin.$_$.a7;
   var getBooleanHashCode = kotlin_kotlin.$_$.p6;
   var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.a2;
   var Unit_instance = kotlin_kotlin.$_$.g1;
+  var ElevationGainOptions = kotlin_io_github_glandais_gpx.$_$.y;
+  var isFinite = kotlin_kotlin.$_$.ma;
   var CoroutineImpl = kotlin_kotlin.$_$.d5;
-  var PointPerDistance_instance = kotlin_io_github_glandais_gpx.$_$.l;
-  var ElevationStep_instance = kotlin_io_github_glandais_gpx.$_$.i;
+  var PointPerDistance_instance = kotlin_io_github_glandais_gpx.$_$.o;
+  var ElevationStep_instance = kotlin_io_github_glandais_gpx.$_$.l;
   var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.o4;
-  var PointPerSecond_instance = kotlin_io_github_glandais_gpx.$_$.m;
-  var PathSimplifier_instance = kotlin_io_github_glandais_gpx.$_$.j;
+  var PointPerSecond_instance = kotlin_io_github_glandais_gpx.$_$.p;
+  var PathSimplifier_instance = kotlin_io_github_glandais_gpx.$_$.m;
+  var ElevationGain_instance = kotlin_io_github_glandais_gpx.$_$.k;
   var initMetadataForCoroutine = kotlin_kotlin.$_$.w6;
+  var Companion_instance = kotlin_kotlin.$_$.e1;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.x2;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.i1;
   var enumEntries = kotlin_kotlin.$_$.f5;
   var Enum = kotlin_kotlin.$_$.t9;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.j1;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.i1;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.qa;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.j1;
   var last = kotlin_kotlin.$_$.q3;
   var toIntArray = kotlin_kotlin.$_$.f4;
   var sortedWith = kotlin_kotlin.$_$.b4;
@@ -60,8 +67,7 @@
   var first = kotlin_kotlin.$_$.j3;
   var removeAll = kotlin_kotlin.$_$.w3;
   var numberRangeToNumber = kotlin_kotlin.$_$.f7;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.x2;
-  var Vector3D = kotlin_io_github_glandais_elevation.$_$.g;
+  var Vector3D = kotlin_io_github_glandais_elevation.$_$.h;
   var emptyList = kotlin_kotlin.$_$.g3;
   var coerceIn = kotlin_kotlin.$_$.u7;
   var DouglasPeucker_instance = kotlin_io_github_glandais_elevation.$_$.b;
@@ -73,14 +79,11 @@
   var Pair = kotlin_kotlin.$_$.z9;
   var listOf = kotlin_kotlin.$_$.r3;
   var Default_getInstance = kotlin_kotlin.$_$.b1;
-  var Companion_instance = kotlin_kotlin.$_$.e1;
   var equals_0 = kotlin_kotlin.$_$.p8;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.qa;
   var isNaN_0 = kotlin_kotlin.$_$.oa;
-  var isFinite = kotlin_kotlin.$_$.ma;
-  var PointField_TEMPERATURE_getInstance = kotlin_io_github_glandais_gpx.$_$.c;
-  var get_entries = kotlin_io_github_glandais_gpx.$_$.w;
-  var Path = kotlin_io_github_glandais_gpx.$_$.v;
+  var PointField_TEMPERATURE_getInstance = kotlin_io_github_glandais_gpx.$_$.d;
+  var get_entries = kotlin_io_github_glandais_gpx.$_$.a1;
+  var Path = kotlin_io_github_glandais_gpx.$_$.z;
   var arrayCopy = kotlin_kotlin.$_$.t2;
   var sort = kotlin_kotlin.$_$.d4;
   var numberToInt = kotlin_kotlin.$_$.h7;
@@ -102,42 +105,44 @@
   var zipWithNext = kotlin_kotlin.$_$.l4;
   var toDoubleArray = kotlin_kotlin.$_$.e4;
   var joinToString = kotlin_kotlin.$_$.m3;
-  var GpxParser_instance = kotlin_io_github_glandais_gpx.$_$.d;
+  var GpxParser_instance = kotlin_io_github_glandais_gpx.$_$.e;
   var copyToArray = kotlin_kotlin.$_$.f3;
-  var firstTrackAsPath = kotlin_io_github_glandais_gpx.$_$.o;
-  var tracksAsPaths = kotlin_io_github_glandais_gpx.$_$.s;
-  var segmentsAsPaths = kotlin_io_github_glandais_gpx.$_$.q;
+  var firstTrackAsPath = kotlin_io_github_glandais_gpx.$_$.r;
+  var tracksAsPaths = kotlin_io_github_glandais_gpx.$_$.v;
+  var segmentsAsPaths = kotlin_io_github_glandais_gpx.$_$.t;
   var GpxPathKind_TRACK_getInstance = kotlin_io_github_glandais_gpx.$_$.b;
   var setOf = kotlin_kotlin.$_$.z3;
   var GpxPathKind_ROUTE_getInstance = kotlin_io_github_glandais_gpx.$_$.a;
-  var GpxWriter_instance = kotlin_io_github_glandais_gpx.$_$.f;
+  var GpxWriter_instance = kotlin_io_github_glandais_gpx.$_$.g;
   var toList = kotlin_kotlin.$_$.i4;
-  var pathsToGpxDocument = kotlin_io_github_glandais_gpx.$_$.p;
-  var toGpxDocument = kotlin_io_github_glandais_gpx.$_$.r;
   var Companion_getInstance = kotlin_kotlin.$_$.d1;
+  var pathsToGpxDocument = kotlin_io_github_glandais_gpx.$_$.s;
+  var toGpxDocument = kotlin_io_github_glandais_gpx.$_$.u;
   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.$_$.k;
+  var Companion_getInstance_0 = kotlin_io_github_glandais_gpx.$_$.n;
   var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.c2;
-  var CsvWriter_instance = kotlin_io_github_glandais_gpx.$_$.g;
+  var CsvOptions = kotlin_io_github_glandais_gpx.$_$.w;
+  var CsvWriter_instance = kotlin_io_github_glandais_gpx.$_$.h;
   var firstOrNull = kotlin_kotlin.$_$.q8;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.b;
   var Char = kotlin_kotlin.$_$.r9;
-  var CsvOptions = kotlin_io_github_glandais_gpx.$_$.t;
-  var JsonWriter_instance = kotlin_io_github_glandais_gpx.$_$.h;
-  var JsonOptions = kotlin_io_github_glandais_gpx.$_$.u;
+  var charSequenceLength = kotlin_kotlin.$_$.i6;
+  var JsonOptions = kotlin_io_github_glandais_gpx.$_$.x;
+  var JsonWriter_instance = kotlin_io_github_glandais_gpx.$_$.i;
   var toFitBytes = kotlin_io_github_glandais_fit.$_$.a;
   var Companion_getInstance_1 = kotlin_kotlin.$_$.c1;
   var DurationUnit_MILLISECONDS_getInstance = kotlin_kotlin.$_$.w;
   var toDuration = kotlin_kotlin.$_$.q9;
   var toFitBytes_0 = kotlin_io_github_glandais_fit.$_$.b;
   var toNumber = kotlin_kotlin.$_$.a6;
-  var Companion_getInstance_2 = kotlin_io_github_glandais_gpx.$_$.e;
-  var GpxWaypoint = kotlin_io_github_glandais_gpx.$_$.n;
+  var Companion_getInstance_2 = kotlin_io_github_glandais_gpx.$_$.f;
+  var GpxWaypoint = kotlin_io_github_glandais_gpx.$_$.q;
+  var Companion_instance_0 = kotlin_io_github_glandais_gpx.$_$.j;
+  var ElevationProvider = kotlin_io_github_glandais_elevation.$_$.e;
+  var ElevationProviderConfig = kotlin_io_github_glandais_elevation.$_$.d;
   var sorted = kotlin_kotlin.$_$.c4;
   var THROW_CCE = kotlin_kotlin.$_$.ca;
   var CoroutineScope = kotlin_org_jetbrains_kotlinx_kotlinx_coroutines_core.$_$.h;
-  var ElevationProvider = kotlin_io_github_glandais_elevation.$_$.d;
   var initMetadataForLambda = kotlin_kotlin.$_$.z6;
   var constructCallableReference = kotlin_kotlin.$_$.k6;
   var setOf_0 = kotlin_kotlin.$_$.a4;
@@ -157,12 +162,13 @@
   initMetadataForClass(EnhanceOptions, 'EnhanceOptions', EnhanceOptions);
   initMetadataForCoroutine($enhanceCourseCOROUTINE$, CoroutineImpl);
   initMetadataForObject(Enhancer, 'Enhancer', VOID, VOID, VOID, [3]);
+  initMetadataForCompanion(Companion_3);
   initMetadataForClass(RoadCondition, 'RoadCondition', VOID, Enum);
   initMetadataForClass(Climb, 'Climb');
   initMetadataForClass(ClimbPart, 'ClimbPart');
-  initMetadataForCompanion(Companion_3);
-  initMetadataForClass(ClimbOptions, 'ClimbOptions', ClimbOptions);
   initMetadataForCompanion(Companion_4);
+  initMetadataForClass(ClimbOptions, 'ClimbOptions', ClimbOptions);
+  initMetadataForCompanion(Companion_5);
   initMetadataForClass(Profile, 'Profile');
   initMetadataForClass(Candidate, 'Candidate');
   initMetadataForClass(sam$kotlin_Comparator$0, 'sam$kotlin_Comparator$0', VOID, VOID, [Comparator, FunctionAdapter]);
@@ -170,9 +176,9 @@
   initMetadataForObject(ClimbDetector, 'ClimbDetector');
   initMetadataForObject(AeroPowerProvider, 'AeroPowerProvider');
   initMetadataForObject(AeroProviderConstant, 'AeroProviderConstant');
-  initMetadataForCompanion(Companion_5);
-  initMetadataForClass(CyclistPowerProviderBase, 'CyclistPowerProviderBase');
   initMetadataForCompanion(Companion_6);
+  initMetadataForClass(CyclistPowerProviderBase, 'CyclistPowerProviderBase');
+  initMetadataForCompanion(Companion_7);
   initMetadataForClass(PowerModel, 'PowerModel', VOID, Enum);
   initMetadataForClass(CyclistPowerSpec, 'CyclistPowerSpec', CyclistPowerSpec);
   initMetadataForObject(GravPowerProvider, 'GravPowerProvider');
@@ -181,20 +187,20 @@
   initMetadataForObject(MuscularPowerProvider, 'MuscularPowerProvider');
   initMetadataForObject(PowerComputer, 'PowerComputer');
   initMetadataForClass(PowerProviderConstant, 'PowerProviderConstant', VOID, CyclistPowerProviderBase);
-  initMetadataForCompanion(Companion_7);
-  initMetadataForClass(PowerProviderCriticalPower, 'PowerProviderCriticalPower', VOID, CyclistPowerProviderBase);
   initMetadataForCompanion(Companion_8);
+  initMetadataForClass(PowerProviderCriticalPower, 'PowerProviderCriticalPower', VOID, CyclistPowerProviderBase);
+  initMetadataForCompanion(Companion_9);
   initMetadataForClass(PowerProviderDurability, 'PowerProviderDurability', VOID, CyclistPowerProviderBase);
   initMetadataForObject(PowerProviderFromData, 'PowerProviderFromData');
   initMetadataForClass(PowerProviderSlewLimited, 'PowerProviderSlewLimited');
-  initMetadataForCompanion(Companion_9);
+  initMetadataForCompanion(Companion_10);
   initMetadataForClass(PowerProviderTerrainPacing, 'PowerProviderTerrainPacing');
   initMetadataForObject(RhoProviderDefault, 'RhoProviderDefault');
   initMetadataForObject(RhoProviderEstimate, 'RhoProviderEstimate');
   initMetadataForObject(RollingResistancePowerProvider, 'RollingResistancePowerProvider');
   initMetadataForObject(VirtualizeService, 'VirtualizeService');
   initMetadataForObject(WheelBearingsPowerProvider, 'WheelBearingsPowerProvider');
-  initMetadataForCompanion(Companion_10);
+  initMetadataForCompanion(Companion_11);
   initMetadataForClass(Wind, 'Wind');
   initMetadataForObject(WindProviderNone, 'WindProviderNone');
   initMetadataForClass(WindProviderConstant, 'WindProviderConstant');
@@ -207,33 +213,33 @@
   initMetadataForClass(Fit, 'Fit');
   initMetadataForObject(CurvatureEstimator, 'CurvatureEstimator');
   initMetadataForObject(LocalFrame, 'LocalFrame');
-  initMetadataForCompanion(Companion_11);
+  initMetadataForCompanion(Companion_12);
   initMetadataForClass(OffsetEnergy, 'OffsetEnergy');
   initMetadataForClass(QpResult, 'QpResult');
   initMetadataForObject(OffsetQp, 'OffsetQp');
-  initMetadataForCompanion(Companion_12);
+  initMetadataForCompanion(Companion_13);
   initMetadataForClass(CurvatureOptions, 'CurvatureOptions', CurvatureOptions);
   initMetadataForObject(PathCurvature, 'PathCurvature');
   initMetadataForClass(PlanarFrame, 'PlanarFrame');
   initMetadataForClass(RacingLineReport, 'RacingLineReport');
   initMetadataForObject(RacingLine, 'RacingLine');
-  initMetadataForCompanion(Companion_13);
+  initMetadataForCompanion(Companion_14);
   initMetadataForClass(CorridorMode, 'CorridorMode', VOID, Enum);
   initMetadataForClass(CornerKind, 'CornerKind', VOID, Enum);
-  initMetadataForCompanion(Companion_14);
+  initMetadataForCompanion(Companion_15);
   initMetadataForClass(RacingLineOptions, 'RacingLineOptions', RacingLineOptions);
   initMetadataForLambda(enhance$slambda, CoroutineImpl, VOID, [1]);
   initMetadataForLambda(enhanceWithCourse$slambda, CoroutineImpl, VOID, [1]);
   //endregion
   function Companion() {
-    Companion_instance_0 = this;
+    Companion_instance_1 = this;
     this.DEFAULT_1 = new Bike();
   }
-  var Companion_instance_0;
+  var Companion_instance_1;
   function Companion_getInstance_3() {
-    if (Companion_instance_0 == null)
+    if (Companion_instance_1 == null)
       new Companion();
-    return Companion_instance_0;
+    return Companion_instance_1;
   }
   function Bike(crr, inertiaFront, inertiaRear, wheelRadiusM, efficiency, maxPedalingLeanAngleDeg) {
     Companion_getInstance_3();
@@ -331,14 +337,14 @@
     return true;
   };
   function Companion_0() {
-    Companion_instance_1 = this;
+    Companion_instance_2 = this;
     this.DEFAULT_CYCLIST_POWER_PROVIDER_1 = new PowerProviderConstant(280.0);
   }
-  var Companion_instance_1;
+  var Companion_instance_2;
   function Companion_getInstance_4() {
-    if (Companion_instance_1 == null)
+    if (Companion_instance_2 == null)
       new Companion_0();
-    return Companion_instance_1;
+    return Companion_instance_2;
   }
   function CoursePhysics(course, rhoProvider, aeroProvider, windProvider, cyclistPowerProvider) {
     Companion_getInstance_4();
@@ -401,14 +407,14 @@
     return true;
   };
   function Companion_1() {
-    Companion_instance_2 = this;
+    Companion_instance_3 = this;
     this.DEFAULT_1 = new Cyclist();
   }
-  var Companion_instance_2;
+  var Companion_instance_3;
   function Companion_getInstance_5() {
-    if (Companion_instance_2 == null)
+    if (Companion_instance_3 == null)
       new Companion_1();
-    return Companion_instance_2;
+    return Companion_instance_3;
   }
   function Cyclist(massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH) {
     Companion_getInstance_5();
@@ -436,6 +442,18 @@
   protoOf(Cyclist).get_maxSpeedMS_xz2r7y_k$ = function () {
     return this.maxSpeedKmH_1 / 3.6;
   };
+  protoOf(Cyclist).copy_q986iz_k$ = function (massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH) {
+    return new Cyclist(massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH);
+  };
+  protoOf(Cyclist).copy$default_8ozrtu_k$ = function (massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH, $super) {
+    massKg = massKg === VOID ? this.massKg_1 : massKg;
+    maxBrakeG = maxBrakeG === VOID ? this.maxBrakeG_1 : maxBrakeG;
+    cd = cd === VOID ? this.cd_1 : cd;
+    frontalAreaM2 = frontalAreaM2 === VOID ? this.frontalAreaM2__1 : frontalAreaM2;
+    maxLeanAngleDeg = maxLeanAngleDeg === VOID ? this.maxLeanAngleDeg_1 : maxLeanAngleDeg;
+    maxSpeedKmH = maxSpeedKmH === VOID ? this.maxSpeedKmH_1 : maxSpeedKmH;
+    return $super === VOID ? this.copy_q986iz_k$(massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH) : $super.copy_q986iz_k$.call(this, massKg, maxBrakeG, cd, frontalAreaM2, maxLeanAngleDeg, maxSpeedKmH);
+  };
   protoOf(Cyclist).toString = function () {
     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 + ')';
   };
@@ -497,6 +515,7 @@
     this.DEFAULT_DRAG_COEFFICIENT_1 = 0.7;
     this.DEFAULT_FRONTAL_AREA_M2__1 = 0.5;
     this.DEFAULT_AIR_DENSITY_1 = 1.225;
+    this.DEFAULT_ELEVATION_GAIN_PRESET_1 = ElevationGainPreset_DEM_getInstance();
   }
   var EngineConstants_instance;
   function EngineConstants_getInstance() {
@@ -575,16 +594,16 @@
     return true;
   };
   function Companion_2() {
-    Companion_instance_3 = this;
+    Companion_instance_4 = this;
     this.DEFAULT_1 = new EnhanceOptions();
   }
-  var Companion_instance_3;
+  var Companion_instance_4;
   function Companion_getInstance_6() {
-    if (Companion_instance_3 == null)
+    if (Companion_instance_4 == null)
       new Companion_2();
-    return Companion_instance_3;
+    return Companion_instance_4;
   }
-  function EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine) {
+  function EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM) {
     Companion_getInstance_6();
     fixElevation = fixElevation === VOID ? true : fixElevation;
     computeMaxSpeeds = computeMaxSpeeds === VOID ? true : computeMaxSpeeds;
@@ -594,6 +613,8 @@
     wPrimeBalance = wPrimeBalance === VOID ? new WPrimeBalanceOptions() : wPrimeBalance;
     curvature = curvature === VOID ? new CurvatureOptions() : curvature;
     racingLine = racingLine === VOID ? new RacingLineOptions() : racingLine;
+    elevationGain = elevationGain === VOID ? new ElevationGainOptions(VOID, EngineConstants_getInstance().DEFAULT_ELEVATION_GAIN_PRESET_1) : elevationGain;
+    elevationSmoothWindowM = elevationSmoothWindowM === VOID ? 150.0 : elevationSmoothWindowM;
     this.fixElevation_1 = fixElevation;
     this.computeMaxSpeeds_1 = computeMaxSpeeds;
     this.virtualizeTrack_1 = virtualizeTrack;
@@ -602,11 +623,18 @@
     this.wPrimeBalance_1 = wPrimeBalance;
     this.curvature_1 = curvature;
     this.racingLine_1 = racingLine;
+    this.elevationGain_1 = elevationGain;
+    this.elevationSmoothWindowM_1 = elevationSmoothWindowM;
+    // Inline function 'kotlin.require' call
+    if (!(this.elevationSmoothWindowM_1 > 0.0 && isFinite(this.elevationSmoothWindowM_1))) {
+      var message = 'elevationSmoothWindowM must be finite and > 0, got ' + this.elevationSmoothWindowM_1;
+      throw IllegalArgumentException_init_$Create$(toString(message));
+    }
   }
-  protoOf(EnhanceOptions).copy_i8t81g_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine) {
-    return new EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine);
+  protoOf(EnhanceOptions).copy_la5bwq_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM) {
+    return new EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM);
   };
-  protoOf(EnhanceOptions).copy$default_q3w1nk_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, $super) {
+  protoOf(EnhanceOptions).copy$default_31cnvc_k$ = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, $super) {
     fixElevation = fixElevation === VOID ? this.fixElevation_1 : fixElevation;
     computeMaxSpeeds = computeMaxSpeeds === VOID ? this.computeMaxSpeeds_1 : computeMaxSpeeds;
     virtualizeTrack = virtualizeTrack === VOID ? this.virtualizeTrack_1 : virtualizeTrack;
@@ -615,10 +643,12 @@
     wPrimeBalance = wPrimeBalance === VOID ? this.wPrimeBalance_1 : wPrimeBalance;
     curvature = curvature === VOID ? this.curvature_1 : curvature;
     racingLine = racingLine === VOID ? this.racingLine_1 : racingLine;
-    return $super === VOID ? this.copy_i8t81g_k$(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine) : $super.copy_i8t81g_k$.call(this, fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine);
+    elevationGain = elevationGain === VOID ? this.elevationGain_1 : elevationGain;
+    elevationSmoothWindowM = elevationSmoothWindowM === VOID ? this.elevationSmoothWindowM_1 : elevationSmoothWindowM;
+    return $super === VOID ? this.copy_la5bwq_k$(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM) : $super.copy_la5bwq_k$.call(this, fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM);
   };
   protoOf(EnhanceOptions).toString = function () {
-    return 'EnhanceOptions(fixElevation=' + this.fixElevation_1 + ', computeMaxSpeeds=' + this.computeMaxSpeeds_1 + ', virtualizeTrack=' + this.virtualizeTrack_1 + ', computeOnePointPerSecond=' + this.computeOnePointPerSecond_1 + ', simplifyPath=' + this.simplifyPath_1.toString() + ', wPrimeBalance=' + this.wPrimeBalance_1.toString() + ', curvature=' + this.curvature_1.toString() + ', racingLine=' + this.racingLine_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() + ', wPrimeBalance=' + this.wPrimeBalance_1.toString() + ', curvature=' + this.curvature_1.toString() + ', racingLine=' + this.racingLine_1.toString() + ', elevationGain=' + this.elevationGain_1.toString() + ', elevationSmoothWindowM=' + this.elevationSmoothWindowM_1 + ')';
   };
   protoOf(EnhanceOptions).hashCode = function () {
     var result = getBooleanHashCode(this.fixElevation_1);
@@ -629,6 +659,8 @@
     result = imul(result, 31) + this.wPrimeBalance_1.hashCode() | 0;
     result = imul(result, 31) + this.curvature_1.hashCode() | 0;
     result = imul(result, 31) + this.racingLine_1.hashCode() | 0;
+    result = imul(result, 31) + this.elevationGain_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.elevationSmoothWindowM_1) | 0;
     return result;
   };
   protoOf(EnhanceOptions).equals = function (other) {
@@ -652,6 +684,10 @@
       return false;
     if (!this.racingLine_1.equals(other.racingLine_1))
       return false;
+    if (!this.elevationGain_1.equals(other.elevationGain_1))
+      return false;
+    if (!equals(this.elevationSmoothWindowM_1, other.elevationSmoothWindowM_1))
+      return false;
     return true;
   };
   function $enhanceCourseCOROUTINE$(_this__u8e3s4, course, options, elevationProvider, resultContinuation) {
@@ -694,7 +730,7 @@
             continue $sm;
           case 2:
             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);
+            this.path0__1 = ElevationStep_instance.smoothElevation_ahln31_k$(this.path0__1, this.options_1.elevationSmoothWindowM_1);
             var racingLineApplied = this.options_1.racingLine_1.enabled_1;
             if (racingLineApplied) {
               this.path0__1 = RacingLine_instance.compute_uyx32p_k$(this.path0__1, this.options_1.racingLine_1);
@@ -733,6 +769,10 @@
               this.path0__1 = PathSimplifier_instance.simplify_gxhj7b_k$(this.path0__1, tolerance, this.options_1.simplifyPath_1.zExaggeration_1);
             }
 
+            if (this.options_1.elevationGain_1.enabled_1) {
+              ElevationGain_instance.annotate_eeml8q_k$(this.path0__1, this.options_1.elevationGain_1);
+            }
+
             return this.path0__1;
           case 3:
             throw this.exception_1;
@@ -754,7 +794,7 @@
     return new CoursePhysics(new Course(path), RhoProviderEstimate_instance, AeroProviderConstant_instance, WindProviderNone_instance, new PowerProviderConstant(280.0));
   };
   protoOf(Enhancer).enhanceCourseDefault_jm937y_k$ = function (path, elevationProvider, options, $completion) {
-    return this.enhanceCourse_mout3j_k$(this.getDefaultCourse_gqi1xw_k$(path), options.copy$default_q3w1nk_k$(options.fixElevation_1 && !(elevationProvider == null)), elevationProvider, $completion);
+    return this.enhanceCourse_mout3j_k$(this.getDefaultCourse_gqi1xw_k$(path), options.copy$default_31cnvc_k$(options.fixElevation_1 && !(elevationProvider == null)), elevationProvider, $completion);
   };
   protoOf(Enhancer).enhanceCourse_mout3j_k$ = function (course, options, elevationProvider, $completion) {
     var tmp = new $enhanceCourseCOROUTINE$(this, course, options, elevationProvider, $completion);
@@ -776,9 +816,55 @@
     var tmp$ret$0 = Math.tan(x);
     RoadCondition_DRY_instance = new RoadCondition('DRY', 0, tmp$ret$0, 0.4);
     RoadCondition_WET_instance = new RoadCondition('WET', 1, EngineConstants_getInstance().RIDER_GRIP_FRACTION_1 * 0.36, 0.634920634920635 * 0.36);
+    if (Companion_instance_5 == null) {
+      Companion_instance;
+      new Companion_3();
+    }
   }
   var RoadCondition_DRY_instance;
   var RoadCondition_WET_instance;
+  function Companion_3() {
+    Companion_instance_5 = this;
+    this.DEFAULT_1 = RoadCondition_DRY_getInstance();
+  }
+  protoOf(Companion_3).fromWire_2092k5_k$ = function (value) {
+    var tmp0 = get_entries_0();
+    var tmp$ret$0;
+    $l$block: {
+      // Inline function 'kotlin.collections.firstOrNull' call
+      var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
+      while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+        var element = _iterator__ex2g4s.next_20eer_k$();
+        var tmp = element.get_wireName_mo8n7d_k$();
+        // Inline function 'kotlin.text.lowercase' call
+        // Inline function 'kotlin.js.asDynamic' call
+        if (tmp === value.toLowerCase()) {
+          tmp$ret$0 = element;
+          break $l$block;
+        }
+      }
+      tmp$ret$0 = null;
+    }
+    return tmp$ret$0;
+  };
+  protoOf(Companion_3).get_wireNames_7fokbq_k$ = function () {
+    // Inline function 'kotlin.collections.map' call
+    var this_0 = get_entries_0();
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+    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 = item.get_wireName_mo8n7d_k$();
+      destination.add_utx5q5_k$(tmp$ret$2);
+    }
+    return destination;
+  };
+  var Companion_instance_5;
+  function Companion_getInstance_7() {
+    static_init();
+    return Companion_instance_5;
+  }
   function values() {
     static_init();
     return [RoadCondition_DRY_getInstance(), RoadCondition_WET_getInstance()];
@@ -800,6 +886,32 @@
     var x = this.mu_1;
     return Math.atan(x) * 180.0 / 3.141592653589793;
   };
+  protoOf(RoadCondition).get_wireName_mo8n7d_k$ = function () {
+    var tmp;
+    switch (this.ordinal_1) {
+      case 0:
+        tmp = 'dry';
+        break;
+      case 1:
+        tmp = 'wet';
+        break;
+      default:
+        noWhenBranchMatchedException();
+        break;
+    }
+    return tmp;
+  };
+  function applyTo(_this__u8e3s4, cyclist) {
+    var tmp;
+    if (_this__u8e3s4 == null) {
+      tmp = cyclist;
+    } else {
+      var tmp0_maxLeanAngleDeg = _this__u8e3s4.get_leanAngleDeg_9xbhfm_k$();
+      var tmp1_maxBrakeG = _this__u8e3s4.maxBrakeG_1;
+      tmp = cyclist.copy$default_8ozrtu_k$(VOID, tmp1_maxBrakeG, VOID, VOID, tmp0_maxLeanAngleDeg);
+    }
+    return tmp;
+  }
   function RoadCondition_DRY_getInstance() {
     static_init();
     return RoadCondition_DRY_instance;
@@ -832,7 +944,7 @@
     // Inline function 'kotlin.collections.filter' call
     var tmp0 = this.parts_1;
     // Inline function 'kotlin.collections.filterTo' call
-    var destination = ArrayList_init_$Create$();
+    var destination = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var element = _iterator__ex2g4s.next_20eer_k$();
@@ -931,18 +1043,18 @@
       return false;
     return true;
   };
-  function Companion_3() {
-    Companion_instance_4 = this;
+  function Companion_4() {
+    Companion_instance_6 = this;
     this.DEFAULT_1 = new ClimbOptions();
   }
-  var Companion_instance_4;
-  function Companion_getInstance_7() {
-    if (Companion_instance_4 == null)
-      new Companion_3();
-    return Companion_instance_4;
+  var Companion_instance_6;
+  function Companion_getInstance_8() {
+    if (Companion_instance_6 == null)
+      new Companion_4();
+    return Companion_instance_6;
   }
   function ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGradeRatio, booster, maxAnalysisPoints) {
-    Companion_getInstance_7();
+    Companion_getInstance_8();
     minMinClimbElevationM = minMinClimbElevationM === VOID ? 10.0 : minMinClimbElevationM;
     maxMinClimbElevationM = maxMinClimbElevationM === VOID ? 35.0 : maxMinClimbElevationM;
     minClimbElevationRatio = minClimbElevationRatio === VOID ? 100.0 : minClimbElevationRatio;
@@ -997,9 +1109,9 @@
       return false;
     return true;
   };
-  function Companion_4() {
+  function Companion_5() {
   }
-  protoOf(Companion_4).of_tmvbpf_k$ = function (path, maxPoints) {
+  protoOf(Companion_5).of_tmvbpf_k$ = function (path, maxPoints) {
     var tmp;
     if (path.size_1 <= maxPoints) {
       var tmp_0 = 0;
@@ -1013,7 +1125,7 @@
       tmp = tmp_2;
     } else {
       var stride = ((path.size_1 + maxPoints | 0) - 1 | 0) / maxPoints | 0;
-      var kept = ArrayList_init_$Create$_0(maxPoints + 1 | 0);
+      var kept = ArrayList_init_$Create$(maxPoints + 1 | 0);
       var i = 0;
       while (i < path.size_1) {
         kept.add_utx5q5_k$(i);
@@ -1043,9 +1155,9 @@
     }
     return new Profile(tmp_6, tmp_10, indices);
   };
-  var Companion_instance_5;
-  function Companion_getInstance_8() {
-    return Companion_instance_5;
+  var Companion_instance_7;
+  function Companion_getInstance_9() {
+    return Companion_instance_7;
   }
   function Profile(distance, elevation, sourceIndex) {
     this.distance_1 = distance;
@@ -1104,7 +1216,7 @@
     var tmp$ret$0 = sortedWith(candidates, tmp$ret$1);
     var remaining = toMutableList(tmp$ret$0);
     // Inline function 'kotlin.collections.mutableListOf' call
-    var kept = ArrayList_init_$Create$();
+    var kept = ArrayList_init_$Create$_0();
     $l$loop: while (true) {
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!!remaining.isEmpty_y1axqb_k$()) {
@@ -1123,7 +1235,7 @@
     // 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 destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var inductionVariable = this_0.first_1;
     var last = this_0.last_1;
     if (inductionVariable <= last)
@@ -1150,7 +1262,7 @@
         break $l$block;
       }
       // Inline function 'kotlin.collections.mutableListOf' call
-      var result = ArrayList_init_$Create$();
+      var result = ArrayList_init_$Create$_0();
       var current = iterator.next_20eer_k$();
       while (iterator.hasNext_bitz1p_k$()) {
         var next = iterator.next_20eer_k$();
@@ -1298,11 +1410,11 @@
     // 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_5.of_tmvbpf_k$(path, options.maxAnalysisPoints_1);
+    var profile = Companion_instance_7.of_tmvbpf_k$(path, options.maxAnalysisPoints_1);
     // Inline function 'kotlin.collections.mapNotNull' call
     var tmp0_1 = until(0, profile.get_size_woubt6_k$());
     // Inline function 'kotlin.collections.mapNotNullTo' call
-    var destination = ArrayList_init_$Create$();
+    var destination = ArrayList_init_$Create$_0();
     // Inline function 'kotlin.collections.forEach' call
     var inductionVariable = tmp0_1.first_1;
     var last = tmp0_1.last_1;
@@ -1329,7 +1441,7 @@
     // Inline function 'kotlin.collections.map' call
     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 destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(this_1, 10));
     var _iterator__ex2g4s = this_1.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -1339,7 +1451,7 @@
     return destination_0;
   };
   protoOf(ClimbDetector).detect$default_6ml3ny_k$ = function (path, options, $super) {
-    options = options === VOID ? Companion_getInstance_7().DEFAULT_1 : options;
+    options = options === VOID ? Companion_getInstance_8().DEFAULT_1 : options;
     return $super === VOID ? this.detect_llooq2_k$(path, options) : $super.detect_llooq2_k$.call(this, path, options);
   };
   var ClimbDetector_instance;
@@ -1492,13 +1604,13 @@
   function AeroProviderConstant_getInstance() {
     return AeroProviderConstant_instance;
   }
-  function Companion_5() {
+  function Companion_6() {
     this.TOLERANCE_1 = 0.05;
     this.MAX_MULTIPLIER_1 = 3.0;
   }
-  var Companion_instance_6;
-  function Companion_getInstance_9() {
-    return Companion_instance_6;
+  var Companion_instance_8;
+  function Companion_getInstance_10() {
+    return Companion_instance_8;
   }
   function CyclistPowerProviderBase(useHarmonics, random) {
     random = random === VOID ? Default_getInstance() : random;
@@ -1508,7 +1620,7 @@
     if (this.useHarmonics_1) {
       // Inline function 'kotlin.collections.List' call
       // Inline function 'kotlin.collections.MutableList' call
-      var list = ArrayList_init_$Create$_0(20);
+      var list = ArrayList_init_$Create$(20);
       // Inline function 'kotlin.repeat' call
       var inductionVariable = 0;
       if (inductionVariable < 20)
@@ -1554,22 +1666,22 @@
     PowerModel_DURABILITY_instance = new PowerModel('DURABILITY', 1, 'durability');
     PowerModel_CRITICAL_POWER_instance = new PowerModel('CRITICAL_POWER', 2, 'critical-power');
     PowerModel_FROM_DATA_instance = new PowerModel('FROM_DATA', 3, 'from_data');
-    if (Companion_instance_7 == null) {
+    if (Companion_instance_9 == null) {
       Companion_instance;
-      new Companion_6();
+      new Companion_7();
     }
   }
   var PowerModel_CONSTANT_instance;
   var PowerModel_DURABILITY_instance;
   var PowerModel_CRITICAL_POWER_instance;
   var PowerModel_FROM_DATA_instance;
-  function Companion_6() {
+  function Companion_7() {
   }
-  protoOf(Companion_6).get_ids_18j3qp_k$ = function () {
+  protoOf(Companion_7).get_ids_18j3qp_k$ = function () {
     // Inline function 'kotlin.collections.map' call
     var this_0 = get_entries_1();
     // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -1578,7 +1690,7 @@
     }
     return destination;
   };
-  protoOf(Companion_6).fromIdOrNull_83jhaj_k$ = function (id) {
+  protoOf(Companion_7).fromIdOrNull_83jhaj_k$ = function (id) {
     var tmp0 = get_entries_1();
     var tmp$ret$0;
     $l$block: {
@@ -1595,9 +1707,9 @@
     }
     return tmp$ret$0;
   };
-  var Companion_instance_7;
-  function Companion_getInstance_10() {
-    return Companion_instance_7;
+  var Companion_instance_9;
+  function Companion_getInstance_11() {
+    return Companion_instance_9;
   }
   function values_0() {
     static_init_0();
@@ -2016,12 +2128,12 @@
   protoOf(PowerProviderConstant).optimalPower_36kg19_k$ = function (course, path, pointIndex) {
     return this.power_1;
   };
-  function Companion_7() {
+  function Companion_8() {
     this.DEFAULT_TAPER_START_FRACTION_1 = 0.5;
   }
-  var Companion_instance_8;
-  function Companion_getInstance_11() {
-    return Companion_instance_8;
+  var Companion_instance_10;
+  function Companion_getInstance_12() {
+    return Companion_instance_10;
   }
   function PowerProviderCriticalPower(powerW, criticalPowerW, wPrimeJ, taperStartFraction, useHarmonics, random) {
     criticalPowerW = criticalPowerW === VOID ? 250.0 : criticalPowerW;
@@ -2099,13 +2211,13 @@
     this.lastPowerW_1 = 0.0;
     this.wPrimeBalanceJ_1 = this.wPrimeJ_1;
   };
-  function Companion_8() {
+  function Companion_9() {
     this.DEFAULT_DECLINE_PER_KJ_PER_KG_1 = 0.006666666666666667;
     this.DEFAULT_MAX_DECLINE_1 = 0.2;
   }
-  var Companion_instance_9;
-  function Companion_getInstance_12() {
-    return Companion_instance_9;
+  var Companion_instance_11;
+  function Companion_getInstance_13() {
+    return Companion_instance_11;
   }
   function PowerProviderDurability(powerW, criticalPowerW, declinePerKjPerKg, maxDecline, useHarmonics, random) {
     criticalPowerW = criticalPowerW === VOID ? 250.0 : criticalPowerW;
@@ -2238,7 +2350,7 @@
     this.lastElapsedS_1 = 0.0;
     this.lastPowerW_1 = 0.0;
   };
-  function Companion_9() {
+  function Companion_10() {
     this.DEFAULT_GRADIENT_GAIN_1 = 3.0;
     this.DEFAULT_HEADWIND_GAIN_PER_MS_1 = 0.02;
     this.DEFAULT_MIN_MULTIPLIER_1 = 0.5;
@@ -2246,9 +2358,9 @@
     this.DEFAULT_RAMP_DISTANCE_M_1 = 300.0;
     this.DEFAULT_ENERGY_BUDGET_SECONDS_1 = 600.0;
   }
-  var Companion_instance_10;
-  function Companion_getInstance_13() {
-    return Companion_instance_10;
+  var Companion_instance_12;
+  function Companion_getInstance_14() {
+    return Companion_instance_12;
   }
   function PowerProviderTerrainPacing(delegate, gradientGain, headwindGainPerMS, minMultiplier, maxMultiplier, rampDistanceM, energyBudgetSeconds) {
     gradientGain = gradientGain === VOID ? 3.0 : gradientGain;
@@ -2515,18 +2627,18 @@
   function WheelBearingsPowerProvider_getInstance() {
     return WheelBearingsPowerProvider_instance;
   }
-  function Companion_10() {
-    Companion_instance_11 = this;
+  function Companion_11() {
+    Companion_instance_13 = this;
     this.NONE_1 = new Wind(0.0, 0.0);
   }
-  var Companion_instance_11;
-  function Companion_getInstance_14() {
-    if (Companion_instance_11 == null)
-      new Companion_10();
-    return Companion_instance_11;
+  var Companion_instance_13;
+  function Companion_getInstance_15() {
+    if (Companion_instance_13 == null)
+      new Companion_11();
+    return Companion_instance_13;
   }
   function Wind(speedMS, directionRad) {
-    Companion_getInstance_14();
+    Companion_getInstance_15();
     this.speedMS_1 = speedMS;
     this.directionRad_1 = directionRad;
   }
@@ -2552,7 +2664,7 @@
   function WindProviderNone() {
   }
   protoOf(WindProviderNone).wind_umf2tf_k$ = function (course, path, pointIndex) {
-    return Companion_getInstance_14().NONE_1;
+    return Companion_getInstance_15().NONE_1;
   };
   var WindProviderNone_instance;
   function WindProviderNone_getInstance() {
@@ -2806,7 +2918,7 @@
     var exit = 1.0 / options.cornerExitRadiusM_1;
     var kappa = frame.kappa_1;
     // Inline function 'kotlin.collections.mutableListOf' call
-    var raw = ArrayList_init_$Create$();
+    var raw = ArrayList_init_$Create$_0();
     var start = -1;
     var sign = 0;
     var inductionVariable = 0;
@@ -2850,7 +2962,7 @@
       raw.add_utx5q5_k$(tmp$ret$3);
     }
     // Inline function 'kotlin.collections.mutableListOf' call
-    var merged = ArrayList_init_$Create$();
+    var merged = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s = raw.iterator_jk1svi_k$();
     $l$loop: while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var span = _iterator__ex2g4s.next_20eer_k$();
@@ -2882,7 +2994,7 @@
     var minTurn = options.minCornerTurnDeg_1 * 3.141592653589793 / 180.0;
     var hairpinTurn = options.hairpinTurnDeg_1 * 3.141592653589793 / 180.0;
     // Inline function 'kotlin.collections.mutableListOf' call
-    var out = ArrayList_init_$Create$();
+    var out = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = merged.iterator_jk1svi_k$();
     $l$loop_2: while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
       var span_0 = _iterator__ex2g4s_0.next_20eer_k$();
@@ -2982,7 +3094,7 @@
         var tmp;
         if (value == null) {
           // Inline function 'kotlin.collections.mutableListOf' call
-          var answer = ArrayList_init_$Create$();
+          var answer = ArrayList_init_$Create$_0();
           buckets.put_4fpzoq_k$(key, answer);
           tmp = answer;
         } else {
@@ -3535,9 +3647,9 @@
   function LocalFrame_getInstance() {
     return LocalFrame_instance;
   }
-  function Companion_11() {
+  function Companion_12() {
   }
-  protoOf(Companion_11).assemble_miimn7_k$ = function (frame, center, rho, steeringLengthM, centeringLengthM) {
+  protoOf(Companion_12).assemble_miimn7_k$ = function (frame, center, rho, steeringLengthM, centeringLengthM) {
     var n = frame.get_size_woubt6_k$();
     var h0 = new Float64Array(n);
     var h1 = new Float64Array(n);
@@ -3607,9 +3719,9 @@
        while (inductionVariable < n);
     return new OffsetEnergy(h0, h1, h2, linear, constant);
   };
-  var Companion_instance_12;
-  function Companion_getInstance_15() {
-    return Companion_instance_12;
+  var Companion_instance_14;
+  function Companion_getInstance_16() {
+    return Companion_instance_14;
   }
   function OffsetEnergy(h0, h1, h2, linear, constant) {
     this.h0__1 = h0;
@@ -3865,18 +3977,18 @@
   function OffsetQp_getInstance() {
     return OffsetQp_instance;
   }
-  function Companion_12() {
-    Companion_instance_13 = this;
+  function Companion_13() {
+    Companion_instance_15 = this;
     this.DEFAULT_1 = new CurvatureOptions();
   }
-  var Companion_instance_13;
-  function Companion_getInstance_16() {
-    if (Companion_instance_13 == null)
-      new Companion_12();
-    return Companion_instance_13;
+  var Companion_instance_15;
+  function Companion_getInstance_17() {
+    if (Companion_instance_15 == null)
+      new Companion_13();
+    return Companion_instance_15;
   }
   function CurvatureOptions(enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM) {
-    Companion_getInstance_16();
+    Companion_getInstance_17();
     enabled = enabled === VOID ? true : enabled;
     geometrySmoothWindowM = geometrySmoothWindowM === VOID ? 3.0 : geometrySmoothWindowM;
     curvatureWindowsM = curvatureWindowsM === VOID ? listOf_0([3.0, 6.0, 12.0, 25.0]) : curvatureWindowsM;
@@ -4124,7 +4236,7 @@
       tmp_3 = tmp_3 + 1 | 0;
     }
     var rho = tmp_5;
-    var energy = Companion_instance_12.assemble_miimn7_k$(frame, center, rho, options.steeringLengthM_1, options.centeringLengthM_1);
+    var energy = Companion_instance_14.assemble_miimn7_k$(frame, center, rho, options.steeringLengthM_1, options.centeringLengthM_1);
     var seed = center;
     var solved = OffsetQp_instance.solve_j37bz7_k$(energy, bounds.lo_1, bounds.hi_1, seed, options.maxNewtonIterations_1, options.gradientTolerance_1, options.boundEpsilonM_1);
     var trajectoryCurvature = measureOffsetCurvature($this, frame, solved.offset_1, options);
@@ -4243,17 +4355,17 @@
     CorridorMode_LANE_instance = new CorridorMode('LANE', 0);
     CorridorMode_LANE_LEFT_instance = new CorridorMode('LANE_LEFT', 1);
     CorridorMode_FULL_ROAD_instance = new CorridorMode('FULL_ROAD', 2);
-    if (Companion_instance_14 == null) {
+    if (Companion_instance_16 == null) {
       Companion_instance;
-      new Companion_13();
+      new Companion_14();
     }
   }
   var CorridorMode_LANE_instance;
   var CorridorMode_LANE_LEFT_instance;
   var CorridorMode_FULL_ROAD_instance;
-  function Companion_13() {
+  function Companion_14() {
   }
-  protoOf(Companion_13).byId_8gmd94_k$ = function (name) {
+  protoOf(Companion_14).byId_8gmd94_k$ = function (name) {
     var tmp0 = get_entries_2();
     var tmp$ret$0;
     $l$block: {
@@ -4278,9 +4390,9 @@
     }
     return tmp;
   };
-  var Companion_instance_14;
-  function Companion_getInstance_17() {
-    return Companion_instance_14;
+  var Companion_instance_16;
+  function Companion_getInstance_18() {
+    return Companion_instance_16;
   }
   function values_1() {
     static_init_1();
@@ -4329,18 +4441,18 @@
   function CornerKind(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  function Companion_14() {
-    Companion_instance_15 = this;
+  function Companion_15() {
+    Companion_instance_17 = this;
     this.DEFAULT_1 = new RacingLineOptions();
   }
-  var Companion_instance_15;
-  function Companion_getInstance_18() {
-    if (Companion_instance_15 == null)
-      new Companion_14();
-    return Companion_instance_15;
+  var Companion_instance_17;
+  function Companion_getInstance_19() {
+    if (Companion_instance_17 == null)
+      new Companion_15();
+    return Companion_instance_17;
   }
   function RacingLineOptions(enabled, defaultRoadWidthM, edgeMarginM, corridor, cornerEnterRadiusM, cornerExitRadiusM, minCornerLengthM, minCornerTurnDeg, hairpinTurnDeg, gentleRadiusM, regularityFactor, selfProximityGapM, straightRunM, straightRadiusM, widthSmoothWindowM, objectiveRadiusM, steeringLengthM, centeringLengthM, maxNewtonIterations, gradientTolerance, boundEpsilonM, curvature, simplifyToleranceCapM) {
-    Companion_getInstance_18();
+    Companion_getInstance_19();
     enabled = enabled === VOID ? false : enabled;
     defaultRoadWidthM = defaultRoadWidthM === VOID ? 6.0 : defaultRoadWidthM;
     edgeMarginM = edgeMarginM === VOID ? 0.5 : edgeMarginM;
@@ -4362,7 +4474,7 @@
     maxNewtonIterations = maxNewtonIterations === VOID ? 200 : maxNewtonIterations;
     gradientTolerance = gradientTolerance === VOID ? 1.0E-8 : gradientTolerance;
     boundEpsilonM = boundEpsilonM === VOID ? 1.0E-6 : boundEpsilonM;
-    curvature = curvature === VOID ? Companion_getInstance_16().DEFAULT_1 : curvature;
+    curvature = curvature === VOID ? Companion_getInstance_17().DEFAULT_1 : curvature;
     simplifyToleranceCapM = simplifyToleranceCapM === VOID ? 2.0 : simplifyToleranceCapM;
     this.enabled_1 = enabled;
     this.defaultRoadWidthM_1 = defaultRoadWidthM;
@@ -4559,6 +4671,11 @@
     static_init_2();
     return CornerKind_HAIRPIN_instance;
   }
+  function get_WAYPOINT_KEYS() {
+    _init_properties_EngineJsApi_kt__9bputf();
+    return WAYPOINT_KEYS;
+  }
+  var WAYPOINT_KEYS;
   function get_POWER_PROVIDER_KEYS() {
     _init_properties_EngineJsApi_kt__9bputf();
     return POWER_PROVIDER_KEYS;
@@ -4589,7 +4706,7 @@
     // Inline function 'kotlin.collections.map' call
     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 destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -4627,7 +4744,7 @@
     var this_0 = tracksAsPaths(GpxParser_instance.parse$default_ez0f31_k$(xml), setOf(GpxPathKind_ROUTE_getInstance()));
     return copyToArray(this_0);
   }
-  function writeGpxTracks(paths, waypoints, writeExtensions, powerSource) {
+  function writeGpxTracks(paths, waypoints, writeExtensions, powerSource, trackNames, startTimeEpochMs) {
     var tmp;
     if (waypoints === VOID) {
       // Inline function 'kotlin.emptyArray' call
@@ -4638,12 +4755,15 @@
     waypoints = tmp;
     writeExtensions = writeExtensions === VOID ? true : writeExtensions;
     powerSource = powerSource === VOID ? null : powerSource;
+    trackNames = trackNames === VOID ? null : trackNames;
+    startTimeEpochMs = startTimeEpochMs === VOID ? null : startTimeEpochMs;
     _init_properties_EngineJsApi_kt__9bputf();
     var tmp_0 = GpxWriter_instance;
     var tmp_1 = toList(paths);
+    var tmp_2 = trackNames == null ? null : toList(trackNames);
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(waypoints.length);
+    var destination = ArrayList_init_$Create$(waypoints.length);
     var inductionVariable = 0;
     var last = waypoints.length;
     while (inductionVariable < last) {
@@ -4652,7 +4772,15 @@
       var tmp$ret$3 = toGpxWaypoint(item);
       destination.add_utx5q5_k$(tmp$ret$3);
     }
-    return tmp_0.write_7y52k2_k$(pathsToGpxDocument(tmp_1, VOID, VOID, destination, VOID, VOID, toGpxPowerSource(powerSource)), writeExtensions);
+    var tmp_3 = destination;
+    var tmp_4;
+    if (startTimeEpochMs == null) {
+      tmp_4 = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      tmp_4 = Companion_getInstance().fromEpochMilliseconds_uaz65_k$(numberToLong(startTimeEpochMs));
+    }
+    return tmp_0.write_7y52k2_k$(pathsToGpxDocument(tmp_1, VOID, tmp_2, tmp_3, VOID, tmp_4, toGpxPowerSource(powerSource)), writeExtensions);
   }
   function pathSize(path) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -4674,6 +4802,22 @@
     _init_properties_EngineJsApi_kt__9bputf();
     return path.elevationLoss_1;
   }
+  function pathElevationGainFiltered(path) {
+    _init_properties_EngineJsApi_kt__9bputf();
+    return path.elevationGainFiltered_1;
+  }
+  function pathElevationLossFiltered(path) {
+    _init_properties_EngineJsApi_kt__9bputf();
+    return path.elevationLossFiltered_1;
+  }
+  function pathReportedElevationGain(path) {
+    _init_properties_EngineJsApi_kt__9bputf();
+    return path.get_reportedElevationGain_hffpog_k$();
+  }
+  function pathReportedElevationLoss(path) {
+    _init_properties_EngineJsApi_kt__9bputf();
+    return path.get_reportedElevationLoss_hfc84c_k$();
+  }
   function pointAt(path, i) {
     _init_properties_EngineJsApi_kt__9bputf();
     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));
@@ -4723,7 +4867,7 @@
     // 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 destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -4749,22 +4893,45 @@
     _init_properties_EngineJsApi_kt__9bputf();
     return path.longitudeDeg_ikk1un_k$(i);
   }
-  function pathToCsv(path, separator, unitsInHeader) {
+  function pathToCsv(path, separator, unitsInHeader, decimals, lineSeparator) {
+    decimals = decimals === VOID ? null : decimals;
+    lineSeparator = lineSeparator === VOID ? null : lineSeparator;
     _init_properties_EngineJsApi_kt__9bputf();
+    var defaults = new CsvOptions();
     var tmp = CsvWriter_instance;
     var tmp0_elvis_lhs = firstOrNull(separator);
     var tmp_0;
     var tmp_1 = tmp0_elvis_lhs;
     if ((tmp_1 == null ? null : new Char(tmp_1)) == null) {
-      tmp_0 = _Char___init__impl__6a9atx(44);
+      tmp_0 = defaults.separator_1;
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    return tmp.write_p5vnh4_k$(path, new CsvOptions(VOID, tmp_0, unitsInHeader));
+    var tmp_2 = tmp_0;
+    var tmp_3;
+    if (lineSeparator == null) {
+      tmp_3 = null;
+    } else {
+      // Inline function 'kotlin.text.ifEmpty' call
+      var tmp_4;
+      // Inline function 'kotlin.text.isEmpty' call
+      if (charSequenceLength(lineSeparator) === 0) {
+        tmp_4 = null;
+      } else {
+        tmp_4 = lineSeparator;
+      }
+      tmp_3 = tmp_4;
+    }
+    var tmp2_elvis_lhs = tmp_3;
+    return tmp.write_p5vnh4_k$(path, new CsvOptions(VOID, tmp_2, unitsInHeader, decimals, tmp2_elvis_lhs == null ? defaults.lineSeparator_1 : tmp2_elvis_lhs));
   }
-  function pathToJson(path, pretty) {
+  function pathToJson(path, pretty, decimals, includeMeta) {
+    decimals = decimals === VOID ? null : decimals;
+    includeMeta = includeMeta === VOID ? null : includeMeta;
     _init_properties_EngineJsApi_kt__9bputf();
-    return JsonWriter_instance.write_lwqeog_k$(path, new JsonOptions(VOID, pretty));
+    var defaults = new JsonOptions();
+    var tmp = JsonWriter_instance;
+    return tmp.write_lwqeog_k$(path, new JsonOptions(VOID, pretty, decimals, includeMeta == null ? defaults.includeMeta_1 : includeMeta));
   }
   function pathToFit(path, name, startTimeEpochMs) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -4794,7 +4961,7 @@
     // Inline function 'kotlin.collections.map' call
     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 destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -4804,12 +4971,14 @@
     // Inline function 'kotlin.collections.toTypedArray' call
     return copyToArray(destination);
   }
-  function detectClimbsWithOptions(path, minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster) {
+  function detectClimbsWithOptions(path, minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster, maxAnalysisPoints) {
+    maxAnalysisPoints = maxAnalysisPoints === VOID ? null : maxAnalysisPoints;
     _init_properties_EngineJsApi_kt__9bputf();
+    var tmp = ClimbDetector_instance;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = ClimbDetector_instance.detect_llooq2_k$(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster));
+    var this_0 = tmp.detect_llooq2_k$(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster, maxAnalysisPoints == null ? (new ClimbOptions()).maxAnalysisPoints_1 : maxAnalysisPoints));
     // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -4836,7 +5005,7 @@
     // Inline function 'kotlin.collections.map' call
     var this_0 = report.corners_1;
     // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -4903,6 +5072,7 @@
   }
   function toGpxWaypoint(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
+    requireOnlyKeys(_this__u8e3s4, 'WaypointDto', get_WAYPOINT_KEYS());
     var tmp = _this__u8e3s4.latitudeDeg;
     var tmp_0 = _this__u8e3s4.longitudeDeg;
     var tmp_1 = _this__u8e3s4.elevationM;
@@ -4915,45 +5085,82 @@
   }
   function toEnhanceOptions(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
+    var d = defaultJsOptions();
     if (_this__u8e3s4 == null)
-      return defaultJsOptions();
+      return d;
     requireOnlyKeys(_this__u8e3s4, 'EnhanceOptionsDto', get_ENHANCE_OPTIONS_KEYS());
     var tmp0_elvis_lhs = _this__u8e3s4.fixElevation;
-    var tmp = tmp0_elvis_lhs == null ? false : tmp0_elvis_lhs;
+    var tmp = tmp0_elvis_lhs == null ? d.fixElevation_1 : tmp0_elvis_lhs;
     var tmp1_elvis_lhs = _this__u8e3s4.computeMaxSpeeds;
-    var tmp_0 = tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
+    var tmp_0 = tmp1_elvis_lhs == null ? d.computeMaxSpeeds_1 : tmp1_elvis_lhs;
     var tmp2_elvis_lhs = _this__u8e3s4.virtualizeTrack;
-    var tmp_1 = tmp2_elvis_lhs == null ? true : tmp2_elvis_lhs;
+    var tmp_1 = tmp2_elvis_lhs == null ? d.virtualizeTrack_1 : tmp2_elvis_lhs;
     var tmp3_elvis_lhs = _this__u8e3s4.computeOnePointPerSecond;
-    var tmp_2 = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
+    var tmp_2 = tmp3_elvis_lhs == null ? d.computeOnePointPerSecond_1 : tmp3_elvis_lhs;
     var tmp4_elvis_lhs = _this__u8e3s4.simplifyEnabled;
-    var tmp_3 = tmp4_elvis_lhs == null ? false : tmp4_elvis_lhs;
+    var tmp_3 = tmp4_elvis_lhs == null ? d.simplifyPath_1.enabled_1 : tmp4_elvis_lhs;
     var tmp5_elvis_lhs = _this__u8e3s4.simplifyToleranceM;
-    var tmp_4 = tmp5_elvis_lhs == null ? 10.0 : tmp5_elvis_lhs;
+    var tmp_4 = tmp5_elvis_lhs == null ? d.simplifyPath_1.toleranceM_1 : tmp5_elvis_lhs;
     var tmp6_elvis_lhs = _this__u8e3s4.simplifyZExaggeration;
-    var tmp_5 = new SimplifyPathOptions(tmp_3, tmp_4, tmp6_elvis_lhs == null ? 3.0 : tmp6_elvis_lhs);
+    var tmp_5 = new SimplifyPathOptions(tmp_3, tmp_4, tmp6_elvis_lhs == null ? d.simplifyPath_1.zExaggeration_1 : tmp6_elvis_lhs);
     var tmp7_elvis_lhs = _this__u8e3s4.wPrimeBalanceEnabled;
-    var tmp_6 = tmp7_elvis_lhs == null ? (new WPrimeBalanceOptions()).enabled_1 : tmp7_elvis_lhs;
+    var tmp_6 = tmp7_elvis_lhs == null ? d.wPrimeBalance_1.enabled_1 : tmp7_elvis_lhs;
     var tmp8_elvis_lhs = _this__u8e3s4.wPrimeBalanceCriticalPower;
-    var tmp_7 = tmp8_elvis_lhs == null ? 250.0 : tmp8_elvis_lhs;
+    var tmp_7 = tmp8_elvis_lhs == null ? d.wPrimeBalance_1.criticalPowerW_1 : tmp8_elvis_lhs;
     var tmp9_elvis_lhs = _this__u8e3s4.wPrimeBalanceWPrime;
-    var tmp_8 = new WPrimeBalanceOptions(tmp_6, tmp_7, tmp9_elvis_lhs == null ? 20000.0 : tmp9_elvis_lhs);
+    var tmp_8 = new WPrimeBalanceOptions(tmp_6, tmp_7, tmp9_elvis_lhs == null ? d.wPrimeBalance_1.wPrimeJ_1 : tmp9_elvis_lhs);
     var tmp10_elvis_lhs = _this__u8e3s4.curvatureEnabled;
-    var tmp_9 = new CurvatureOptions(tmp10_elvis_lhs == null ? true : tmp10_elvis_lhs);
+    var tmp_9 = new CurvatureOptions(tmp10_elvis_lhs == null ? d.curvature_1.enabled_1 : tmp10_elvis_lhs);
     var tmp11_elvis_lhs = _this__u8e3s4.racingLineEnabled;
-    var tmp13_enabled = tmp11_elvis_lhs == null ? false : tmp11_elvis_lhs;
+    var tmp13_enabled = tmp11_elvis_lhs == null ? d.racingLine_1.enabled_1 : tmp11_elvis_lhs;
     var tmp14_corridor = parseCorridor(_this__u8e3s4.racingLineCorridor);
     var tmp12_elvis_lhs = _this__u8e3s4.racingLineRoadWidthM;
-    var tmp15_defaultRoadWidthM = tmp12_elvis_lhs == null ? Companion_getInstance_18().DEFAULT_1.defaultRoadWidthM_1 : tmp12_elvis_lhs;
-    return new EnhanceOptions(tmp, tmp_0, tmp_1, tmp_2, tmp_5, tmp_8, tmp_9, new RacingLineOptions(tmp13_enabled, tmp15_defaultRoadWidthM, VOID, tmp14_corridor));
+    var tmp15_defaultRoadWidthM = tmp12_elvis_lhs == null ? d.racingLine_1.defaultRoadWidthM_1 : tmp12_elvis_lhs;
+    var tmp_10 = new RacingLineOptions(tmp13_enabled, tmp15_defaultRoadWidthM, VOID, tmp14_corridor);
+    // Inline function 'kotlin.run' call
+    var tmp0_safe_receiver = _this__u8e3s4.elevationGainPreset;
+    var tmp_11;
+    if (tmp0_safe_receiver == null) {
+      tmp_11 = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      tmp_11 = Companion_instance_0.byId_8gmd94_k$(tmp0_safe_receiver);
+    }
+    var named = tmp_11;
+    var tmp1_elvis_lhs_0 = _this__u8e3s4.elevationGainEnabled;
+    var tmp_12 = tmp1_elvis_lhs_0 == null ? d.elevationGain_1.enabled_1 : tmp1_elvis_lhs_0;
+    var tmp_13 = named == null ? d.elevationGain_1.preset_1 : named;
+    var tmp3_elvis_lhs_0 = _this__u8e3s4.elevationGainThresholdM;
+    var tmp_14;
+    if (tmp3_elvis_lhs_0 == null) {
+      tmp_14 = named == null ? null : named.thresholdM_1;
+    } else {
+      tmp_14 = tmp3_elvis_lhs_0;
+    }
+    var tmp5_elvis_lhs_0 = tmp_14;
+    var tmp_15 = new ElevationGainOptions(tmp_12, tmp_13, tmp5_elvis_lhs_0 == null ? d.elevationGain_1.thresholdM_1 : tmp5_elvis_lhs_0);
+    var tmp16_elvis_lhs = _this__u8e3s4.elevationSmoothWindowM;
+    return new EnhanceOptions(tmp, tmp_0, tmp_1, tmp_2, tmp_5, tmp_8, tmp_9, tmp_10, tmp_15, tmp16_elvis_lhs == null ? d.elevationSmoothWindowM_1 : tmp16_elvis_lhs);
+  }
+  function elevationProviderFor(options) {
+    _init_properties_EngineJsApi_kt__9bputf();
+    var tmp1_elvis_lhs = options == null ? null : options.demZoom;
+    var tmp;
+    if (tmp1_elvis_lhs == null) {
+      return new ElevationProvider();
+    } else {
+      tmp = tmp1_elvis_lhs;
+    }
+    var zoom = tmp;
+    return new ElevationProvider(new ElevationProviderConfig(zoom));
   }
   function parseCorridor(name) {
     _init_properties_EngineJsApi_kt__9bputf();
-    return name == null ? Companion_getInstance_18().DEFAULT_1.corridor_1 : Companion_instance_14.byId_8gmd94_k$(name);
+    return name == null ? Companion_getInstance_19().DEFAULT_1.corridor_1 : Companion_instance_16.byId_8gmd94_k$(name);
   }
   function defaultJsOptions() {
     _init_properties_EngineJsApi_kt__9bputf();
-    return new EnhanceOptions(false, true, true, false, new SimplifyPathOptions(false), VOID, new CurvatureOptions(true), new RacingLineOptions(false));
+    return new EnhanceOptions(false, true, true, false, new SimplifyPathOptions(false), VOID, new CurvatureOptions(), new RacingLineOptions());
   }
   function toCyclist(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -4961,49 +5168,15 @@
       return new Cyclist();
     requireOnlyKeys(_this__u8e3s4, 'CyclistDto', get_CYCLIST_KEYS());
     var tmp0_safe_receiver = _this__u8e3s4.roadCondition;
-    var condition = tmp0_safe_receiver == null ? null : toRoadCondition(tmp0_safe_receiver);
-    var tmp = _this__u8e3s4.massKg;
-    var tmp2_elvis_lhs = condition == null ? null : condition.maxBrakeG_1;
-    var tmp_0 = tmp2_elvis_lhs == null ? _this__u8e3s4.maxBrakeG : tmp2_elvis_lhs;
-    var tmp_1 = _this__u8e3s4.cd;
-    var tmp_2 = _this__u8e3s4.frontalAreaM2;
-    var tmp4_elvis_lhs = condition == null ? null : condition.get_leanAngleDeg_9xbhfm_k$();
-    return new Cyclist(tmp, tmp_0, tmp_1, tmp_2, tmp4_elvis_lhs == null ? _this__u8e3s4.maxLeanAngleDeg : tmp4_elvis_lhs, _this__u8e3s4.maxSpeedKmH);
+    return applyTo(tmp0_safe_receiver == null ? null : toRoadCondition(tmp0_safe_receiver), new Cyclist(_this__u8e3s4.massKg, _this__u8e3s4.maxBrakeG, _this__u8e3s4.cd, _this__u8e3s4.frontalAreaM2, _this__u8e3s4.maxLeanAngleDeg, _this__u8e3s4.maxSpeedKmH));
   }
   function toRoadCondition(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
-    var tmp0 = get_entries_0();
-    var tmp$ret$0;
-    $l$block: {
-      // Inline function 'kotlin.collections.firstOrNull' call
-      var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
-      while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
-        var element = _iterator__ex2g4s.next_20eer_k$();
-        if (equals_0(element.name_1, _this__u8e3s4, true)) {
-          tmp$ret$0 = element;
-          break $l$block;
-        }
-      }
-      tmp$ret$0 = null;
-    }
-    var tmp0_elvis_lhs = tmp$ret$0;
+    var tmp0_elvis_lhs = Companion_getInstance_7().fromWire_2092k5_k$(_this__u8e3s4);
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      var tmp_0 = 'Unknown CyclistDto.roadCondition: ' + _this__u8e3s4 + ' (expected one of ';
-      // Inline function 'kotlin.collections.map' call
-      var this_0 = get_entries_0();
-      // Inline function 'kotlin.collections.mapTo' call
-      var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-      var _iterator__ex2g4s_0 = this_0.iterator_jk1svi_k$();
-      while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
-        var item = _iterator__ex2g4s_0.next_20eer_k$();
-        // Inline function 'kotlin.text.lowercase' call
-        // Inline function 'kotlin.js.asDynamic' call
-        var tmp$ret$4 = item.name_1.toLowerCase();
-        destination.add_utx5q5_k$(tmp$ret$4);
-      }
       // Inline function 'kotlin.error' call
-      var message = tmp_0 + (toString(destination) + ')');
+      var message = 'Unknown CyclistDto.roadCondition: ' + _this__u8e3s4 + ' (expected one of ' + toString(Companion_getInstance_7().get_wireNames_7fokbq_k$()) + ')';
       throw IllegalStateException_init_$Create$(toString(message));
     } else {
       tmp = tmp0_elvis_lhs;
@@ -5021,7 +5194,7 @@
     var tmp_2 = _this__u8e3s4.wheelRadiusM;
     var tmp_3 = _this__u8e3s4.efficiency;
     var tmp0_elvis_lhs = _this__u8e3s4.maxPedalingLeanAngleDeg;
-    return new Bike(tmp, tmp_0, tmp_1, tmp_2, tmp_3, tmp0_elvis_lhs == null ? 20.0 : tmp0_elvis_lhs);
+    return new Bike(tmp, tmp_0, tmp_1, tmp_2, tmp_3, tmp0_elvis_lhs == null ? (new Bike()).maxPedalingLeanAngleDeg_1 : tmp0_elvis_lhs);
   }
   function toWindProvider(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -5040,11 +5213,11 @@
       return new CyclistPowerSpec();
     requireOnlyKeys(_this__u8e3s4, 'PowerProviderDto', get_POWER_PROVIDER_KEYS());
     var defaults = new CyclistPowerSpec();
-    var tmp0_elvis_lhs = Companion_instance_7.fromIdOrNull_83jhaj_k$(_this__u8e3s4.type);
+    var tmp0_elvis_lhs = Companion_instance_9.fromIdOrNull_83jhaj_k$(_this__u8e3s4.type);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
-      var message = 'Unknown PowerProviderDto.type: ' + _this__u8e3s4.type + ' (expected one of ' + toString(Companion_instance_7.get_ids_18j3qp_k$()) + ')';
+      var message = 'Unknown PowerProviderDto.type: ' + _this__u8e3s4.type + ' (expected one of ' + toString(Companion_instance_9.get_ids_18j3qp_k$()) + ')';
       throw IllegalStateException_init_$Create$(toString(message));
     } else {
       tmp = tmp0_elvis_lhs;
@@ -5069,7 +5242,7 @@
     var keys = Object.keys(_this__u8e3s4);
     // Inline function 'kotlin.collections.filterNot' call
     // Inline function 'kotlin.collections.filterNotTo' call
-    var destination = ArrayList_init_$Create$();
+    var destination = ArrayList_init_$Create$_0();
     var inductionVariable = 0;
     var last = keys.length;
     while (inductionVariable < last) {
@@ -5118,7 +5291,7 @@
     // Inline function 'kotlin.collections.map' call
     var this_0 = _this__u8e3s4.parts_1;
     // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
     while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
       var item = _iterator__ex2g4s.next_20eer_k$();
@@ -5168,7 +5341,7 @@
           case 0:
             this.exceptionState_1 = 2;
             var opts = toEnhanceOptions(this.$options_1);
-            var provider = opts.fixElevation_1 ? new ElevationProvider() : null;
+            var provider = opts.fixElevation_1 ? elevationProviderFor(this.$options_1) : null;
             this.state_1 = 1;
             suspendResult = Enhancer_instance.enhanceCourseDefault_jm937y_k$(this.$path_1, provider, opts, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
@@ -5230,7 +5403,7 @@
           case 0:
             this.exceptionState_1 = 2;
             var opts = toEnhanceOptions(this.$options_1);
-            var provider = opts.fixElevation_1 ? new ElevationProvider() : null;
+            var provider = opts.fixElevation_1 ? elevationProviderFor(this.$options_1) : 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);
@@ -5270,29 +5443,30 @@
   function _init_properties_EngineJsApi_kt__9bputf() {
     if (!properties_initialized_EngineJsApi_kt_2x4hj5) {
       properties_initialized_EngineJsApi_kt_2x4hj5 = true;
+      WAYPOINT_KEYS = setOf_0(['latitudeDeg', 'longitudeDeg', 'elevationM', 'name', 'description', 'symbol', 'type', 'timeEpochMs']);
       POWER_PROVIDER_KEYS = setOf_0(['type', 'power', 'useHarmonics', 'criticalPower', 'wPrime', 'pacing', 'maxSlewWPerS']);
       CYCLIST_KEYS = setOf_0(['massKg', 'cd', 'frontalAreaM2', 'maxLeanAngleDeg', 'maxBrakeG', 'maxSpeedKmH', 'roadCondition']);
       BIKE_KEYS = setOf_0(['crr', 'inertiaFront', 'inertiaRear', 'wheelRadiusM', 'efficiency', 'maxPedalingLeanAngleDeg']);
       WIND_KEYS = setOf_0(['windSpeed', 'windDirection']);
-      ENHANCE_OPTIONS_KEYS = setOf_0(['fixElevation', 'computeMaxSpeeds', 'virtualizeTrack', 'computeOnePointPerSecond', 'simplifyEnabled', 'simplifyToleranceM', 'simplifyZExaggeration', 'wPrimeBalanceEnabled', 'wPrimeBalanceCriticalPower', 'wPrimeBalanceWPrime', 'curvatureEnabled', 'racingLineEnabled', 'racingLineCorridor', 'racingLineRoadWidthM']);
+      ENHANCE_OPTIONS_KEYS = setOf_0(['fixElevation', 'computeMaxSpeeds', 'virtualizeTrack', 'computeOnePointPerSecond', 'simplifyEnabled', 'simplifyToleranceM', 'simplifyZExaggeration', 'wPrimeBalanceEnabled', 'wPrimeBalanceCriticalPower', 'wPrimeBalanceWPrime', 'curvatureEnabled', 'racingLineEnabled', 'racingLineCorridor', 'racingLineRoadWidthM', 'elevationGainPreset', 'elevationGainThresholdM', 'elevationGainEnabled', 'elevationSmoothWindowM', 'demZoom']);
     }
   }
   //region block: init
   Enhancer_instance = new Enhancer();
-  Companion_instance_5 = new Companion_4();
+  Companion_instance_7 = new Companion_5();
   ClimbDetector_instance = new ClimbDetector();
   AeroPowerProvider_instance = new AeroPowerProvider();
   AeroProviderConstant_instance = new AeroProviderConstant();
-  Companion_instance_6 = new Companion_5();
-  Companion_instance_7 = new Companion_6();
+  Companion_instance_8 = new Companion_6();
+  Companion_instance_9 = new Companion_7();
   GravPowerProvider_instance = new GravPowerProvider();
   MaxSpeedComputer_instance = new MaxSpeedComputer();
   MuscularPowerProvider_instance = new MuscularPowerProvider();
   PowerComputer_instance = new PowerComputer();
-  Companion_instance_8 = new Companion_7();
-  Companion_instance_9 = new Companion_8();
+  Companion_instance_10 = new Companion_8();
+  Companion_instance_11 = new Companion_9();
   PowerProviderFromData_instance = new PowerProviderFromData();
-  Companion_instance_10 = new Companion_9();
+  Companion_instance_12 = new Companion_10();
   RhoProviderDefault_instance = new RhoProviderDefault();
   RhoProviderEstimate_instance = new RhoProviderEstimate();
   RollingResistancePowerProvider_instance = new RollingResistancePowerProvider();
@@ -5305,11 +5479,11 @@
   Corridor_instance = new Corridor();
   CurvatureEstimator_instance = new CurvatureEstimator();
   LocalFrame_instance = new LocalFrame();
-  Companion_instance_12 = new Companion_11();
+  Companion_instance_14 = new Companion_12();
   OffsetQp_instance = new OffsetQp();
   PathCurvature_instance = new PathCurvature();
   RacingLine_instance = new RacingLine();
-  Companion_instance_14 = new Companion_13();
+  Companion_instance_16 = new Companion_14();
   //endregion
   //region block: exports
   function $jsExportAll$(_) {
@@ -5329,6 +5503,10 @@
     engine.pathDurationMs = pathDurationMs;
     engine.pathElevationGain = pathElevationGain;
     engine.pathElevationLoss = pathElevationLoss;
+    engine.pathElevationGainFiltered = pathElevationGainFiltered;
+    engine.pathElevationLossFiltered = pathElevationLossFiltered;
+    engine.pathReportedElevationGain = pathReportedElevationGain;
+    engine.pathReportedElevationLoss = pathReportedElevationLoss;
     engine.pointAt = pointAt;
     engine.writeGpx = writeGpx;
     engine.writeGpxAt = writeGpxAt;