@glandais/vcyclist-engine 6.4.0 → 6.5.0

package/vcyclist-engine.js

@@ -38,13 +38,6 @@
   var initMetadataForClass = kotlin_kotlin.$_$.r7;
   var toString = kotlin_kotlin.$_$.j8;
   var hashCode = kotlin_kotlin.$_$.q7;
-  var ElevationGainPreset_DEM_getInstance = kotlin_io_github_glandais_gpx.$_$.i;
-  var initMetadataForObject = kotlin_kotlin.$_$.x7;
-  var getBooleanHashCode = kotlin_kotlin.$_$.m7;
-  var isFinite = kotlin_kotlin.$_$.xb;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.e2;
-  var Unit_instance = kotlin_kotlin.$_$.k1;
-  var ElevationGainOptions = kotlin_io_github_glandais_gpx.$_$.l1;
   var CoroutineImpl = kotlin_kotlin.$_$.z5;
   var PointPerDistance_instance = kotlin_io_github_glandais_gpx.$_$.y;
   var ElevationStep_instance = kotlin_io_github_glandais_gpx.$_$.v;
@@ -53,11 +46,18 @@
   var Companion_getInstance_0 = kotlin_io_github_glandais_gpx.$_$.p;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.e3;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.m1;
+  var Unit_instance = kotlin_kotlin.$_$.k1;
   var emptyList = kotlin_kotlin.$_$.p3;
+  var initMetadataForCoroutine = kotlin_kotlin.$_$.t7;
+  var initMetadataForObject = kotlin_kotlin.$_$.x7;
+  var ElevationGainPreset_DEM_getInstance = kotlin_io_github_glandais_gpx.$_$.i;
+  var getBooleanHashCode = kotlin_kotlin.$_$.m7;
+  var isFinite = kotlin_kotlin.$_$.xb;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.e2;
+  var ElevationGainOptions = kotlin_io_github_glandais_gpx.$_$.l1;
   var PointPerSecond_instance = kotlin_io_github_glandais_gpx.$_$.z;
   var ElevationGain_instance = kotlin_io_github_glandais_gpx.$_$.u;
   var PathSimplifier_instance = kotlin_io_github_glandais_gpx.$_$.w;
-  var initMetadataForCoroutine = kotlin_kotlin.$_$.t7;
   var Companion_instance = kotlin_kotlin.$_$.i1;
   var enumEntries = kotlin_kotlin.$_$.b6;
   var Enum = kotlin_kotlin.$_$.cb;
@@ -183,6 +183,8 @@
   initMetadataForClass(CoursePhysics, 'CoursePhysics');
   initMetadataForCompanion(Companion_1);
   initMetadataForClass(Cyclist, 'Cyclist', Cyclist);
+  initMetadataForCoroutine($runCOROUTINE$, CoroutineImpl);
+  initMetadataForObject(ElevationCorrection, 'ElevationCorrection', VOID, VOID, VOID, [4, 5]);
   initMetadataForObject(EngineConstants, 'EngineConstants');
   initMetadataForClass(SimplifyPathOptions, 'SimplifyPathOptions', SimplifyPathOptions);
   initMetadataForClass(WPrimeBalanceOptions, 'WPrimeBalanceOptions', WPrimeBalanceOptions);
@@ -527,37 +529,181 @@
       return false;
     return true;
   };
+  function $runCOROUTINE$(_this__u8e3s4, source, provider, options, minSpacingM, maxSpacingM, resultContinuation) {
+    CoroutineImpl.call(this, resultContinuation);
+    this.b50_1 = _this__u8e3s4;
+    this.c50_1 = source;
+    this.d50_1 = provider;
+    this.e50_1 = options;
+    this.f50_1 = minSpacingM;
+    this.g50_1 = maxSpacingM;
+  }
+  protoOf($runCOROUTINE$).o7 = function () {
+    var suspendResult = this.i7_1;
+    $sm: do
+      try {
+        var tmp = this.g7_1;
+        switch (tmp) {
+          case 0:
+            this.h7_1 = 7;
+            this.h50_1 = PointPerDistance_instance.l2f(this.c50_1, -1.0, 30.0);
+            if (!(this.d50_1 == null)) {
+              this.g7_1 = 1;
+              suspendResult = ElevationStep_instance.n2c(this.h50_1, this.d50_1, this);
+              if (suspendResult === get_COROUTINE_SUSPENDED()) {
+                return suspendResult;
+              }
+              continue $sm;
+            } else {
+              this.g7_1 = 2;
+              continue $sm;
+            }
+
+          case 1:
+            this.h50_1 = suspendResult;
+            this.g7_1 = 2;
+            continue $sm;
+          case 2:
+            this.h50_1 = PointPerDistance_instance.l2f(this.h50_1, this.f50_1, this.g50_1);
+            var tmp_0 = this;
+            var tmp0_safe_receiver = this.d50_1;
+            tmp_0.j50_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e15_1;
+            this.k50_1 = (!(this.d50_1 == null) && this.e50_1.m50_1);
+            this.l50_1 = null;
+            if (this.k50_1 && !(this.d50_1 == null) && !(this.j50_1 == null)) {
+              this.g7_1 = 3;
+              suspendResult = BridgeDeckStep_instance.o50(this.h50_1, this.d50_1, this.j50_1, VOID, VOID, this);
+              if (suspendResult === get_COROUTINE_SUSPENDED()) {
+                return suspendResult;
+              }
+              continue $sm;
+            } else {
+              this.g7_1 = 4;
+              continue $sm;
+            }
+
+          case 3:
+            this.l50_1 = suspendResult;
+            this.h50_1 = this.l50_1.p50_1;
+            this.g7_1 = 4;
+            continue $sm;
+          case 4:
+            this.i50_1 = null;
+            if (this.e50_1.n50_1 && !(this.d50_1 == null)) {
+              var tunnelOptions = Companion_getInstance().f2h_1;
+              var deckStep = Companion_getInstance_0().v29_1.q27_1;
+              var x = tunnelOptions.g2g_1 - deckStep;
+              var sameGrid = Math.abs(x) < 1.0E-9;
+              var tmp1_safe_receiver = this.l50_1;
+              var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.s50_1;
+              var tmp_1;
+              if (tmp2_safe_receiver == null) {
+                tmp_1 = null;
+              } else {
+                var destination = ArrayList_init_$Create$(collectionSizeOrDefault(tmp2_safe_receiver, 10));
+                var _iterator__ex2g4s = tmp2_safe_receiver.l();
+                while (_iterator__ex2g4s.m()) {
+                  var item = _iterator__ex2g4s.n();
+                  destination.k(writtenRange(item, deckStep));
+                }
+                tmp_1 = destination;
+              }
+              var tmp3_elvis_lhs = tmp_1;
+              var protected_0 = tmp3_elvis_lhs == null ? emptyList() : tmp3_elvis_lhs;
+              this.g7_1 = 5;
+              var tmp_2 = TunnelStep_instance;
+              var tmp_3 = this.h50_1;
+              var tmp4_safe_receiver = this.l50_1;
+              var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.u50_1;
+              var tmp_4;
+              if (tmp5_safe_receiver == null) {
+                tmp_4 = null;
+              } else {
+                var tmp_5;
+                if (sameGrid) {
+                  tmp_5 = tmp5_safe_receiver;
+                } else {
+                  tmp_5 = null;
+                }
+                tmp_4 = tmp_5;
+              }
+              suspendResult = tmp_2.v50(tmp_3, this.d50_1, tunnelOptions, tmp_4, protected_0, 30.0, this);
+              if (suspendResult === get_COROUTINE_SUSPENDED()) {
+                return suspendResult;
+              }
+              continue $sm;
+            } else {
+              this.g7_1 = 6;
+              continue $sm;
+            }
+
+          case 5:
+            this.i50_1 = suspendResult;
+            this.h50_1 = this.i50_1.w50_1;
+            this.g7_1 = 6;
+            continue $sm;
+          case 6:
+            if (this.h50_1 === this.c50_1)
+              this.h50_1 = this.h50_1.y2e();
+            this.h50_1.c25_1 = ElevationCorrectionReport_instance.d51(this.l50_1, this.k50_1 && this.j50_1 == null, this.i50_1);
+            return this.h50_1;
+          case 7:
+            throw this.j7_1;
+        }
+      } catch ($p) {
+        var e = $p;
+        if (this.h7_1 === 7) {
+          throw e;
+        } else {
+          this.g7_1 = this.h7_1;
+          this.j7_1 = e;
+        }
+      }
+     while (true);
+  };
+  function ElevationCorrection() {
+  }
+  protoOf(ElevationCorrection).e51 = function (source, provider, options, minSpacingM, maxSpacingM, $completion) {
+    var tmp = new $runCOROUTINE$(this, source, provider, options, minSpacingM, maxSpacingM, $completion);
+    tmp.i7_1 = Unit_instance;
+    tmp.j7_1 = null;
+    return tmp.o7();
+  };
+  var ElevationCorrection_instance;
+  function ElevationCorrection_getInstance() {
+    return ElevationCorrection_instance;
+  }
   function EngineConstants() {
     EngineConstants_instance = this;
-    this.t4z_1 = 9.80665;
-    this.u4z_1 = 0.5555555555555556;
-    this.v4z_1 = 0.004;
-    this.w4z_1 = 0.05;
-    this.x4z_1 = 0.07;
-    this.y4z_1 = 0.35;
-    this.z4z_1 = 0.976;
-    this.a50_1 = 20.0;
-    this.b50_1 = 80.0;
-    this.c50_1 = 280.0;
-    this.d50_1 = 50.0;
-    this.e50_1 = 0.4;
-    this.f50_1 = 35.0;
-    this.g50_1 = 0.9;
-    this.h50_1 = 0.36;
-    this.i50_1 = 0.63;
+    this.f51_1 = 9.80665;
+    this.g51_1 = 0.5555555555555556;
+    this.h51_1 = 0.004;
+    this.i51_1 = 0.05;
+    this.j51_1 = 0.07;
+    this.k51_1 = 0.35;
+    this.l51_1 = 0.976;
+    this.m51_1 = 20.0;
+    this.n51_1 = 80.0;
+    this.o51_1 = 280.0;
+    this.p51_1 = 50.0;
+    this.q51_1 = 0.4;
+    this.r51_1 = 35.0;
+    this.s51_1 = 0.9;
+    this.t51_1 = 0.36;
+    this.u51_1 = 0.63;
     var tmp = this;
     // Inline function 'kotlin.math.tan' call
     var x = 0.6108652381980153;
-    tmp.j50_1 = Math.tan(x) / 0.9;
-    this.k50_1 = 0.634920634920635;
-    this.l50_1 = 0.6108652381980153;
-    this.m50_1 = 100.0;
-    this.n50_1 = 250.0;
-    this.o50_1 = 20000.0;
-    this.p50_1 = 0.7;
-    this.q50_1 = 0.5;
-    this.r50_1 = 1.225;
-    this.s50_1 = ElevationGainPreset_DEM_getInstance();
+    tmp.v51_1 = Math.tan(x) / 0.9;
+    this.w51_1 = 0.634920634920635;
+    this.x51_1 = 0.6108652381980153;
+    this.y51_1 = 100.0;
+    this.z51_1 = 250.0;
+    this.a52_1 = 20000.0;
+    this.b52_1 = 0.7;
+    this.c52_1 = 0.5;
+    this.d52_1 = 1.225;
+    this.e52_1 = ElevationGainPreset_DEM_getInstance();
   }
   var EngineConstants_instance;
   function EngineConstants_getInstance() {
@@ -569,17 +715,17 @@
     enabled = enabled === VOID ? true : enabled;
     toleranceM = toleranceM === VOID ? 10.0 : toleranceM;
     zExaggeration = zExaggeration === VOID ? 3.0 : zExaggeration;
-    this.t50_1 = enabled;
-    this.u50_1 = toleranceM;
-    this.v50_1 = zExaggeration;
+    this.f52_1 = enabled;
+    this.g52_1 = toleranceM;
+    this.h52_1 = zExaggeration;
   }
   protoOf(SimplifyPathOptions).toString = function () {
-    return 'SimplifyPathOptions(enabled=' + this.t50_1 + ', toleranceM=' + this.u50_1 + ', zExaggeration=' + this.v50_1 + ')';
+    return 'SimplifyPathOptions(enabled=' + this.f52_1 + ', toleranceM=' + this.g52_1 + ', zExaggeration=' + this.h52_1 + ')';
   };
   protoOf(SimplifyPathOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.t50_1);
-    result = imul(result, 31) + getNumberHashCode(this.u50_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v50_1) | 0;
+    var result = getBooleanHashCode(this.f52_1);
+    result = imul(result, 31) + getNumberHashCode(this.g52_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h52_1) | 0;
     return result;
   };
   protoOf(SimplifyPathOptions).equals = function (other) {
@@ -587,11 +733,11 @@
       return true;
     if (!(other instanceof SimplifyPathOptions))
       return false;
-    if (!(this.t50_1 === other.t50_1))
+    if (!(this.f52_1 === other.f52_1))
       return false;
-    if (!equals(this.u50_1, other.u50_1))
+    if (!equals(this.g52_1, other.g52_1))
       return false;
-    if (!equals(this.v50_1, other.v50_1))
+    if (!equals(this.h52_1, other.h52_1))
       return false;
     return true;
   };
@@ -599,27 +745,27 @@
     enabled = enabled === VOID ? true : enabled;
     criticalPowerW = criticalPowerW === VOID ? 250.0 : criticalPowerW;
     wPrimeJ = wPrimeJ === VOID ? 20000.0 : wPrimeJ;
-    this.w50_1 = enabled;
-    this.x50_1 = criticalPowerW;
-    this.y50_1 = wPrimeJ;
+    this.i52_1 = enabled;
+    this.j52_1 = criticalPowerW;
+    this.k52_1 = wPrimeJ;
     // Inline function 'kotlin.require' call
-    if (!(this.x50_1 > 0.0 && isFinite(this.x50_1))) {
-      var message = 'criticalPowerW must be finite and > 0, got ' + this.x50_1;
+    if (!(this.j52_1 > 0.0 && isFinite(this.j52_1))) {
+      var message = 'criticalPowerW must be finite and > 0, got ' + this.j52_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.y50_1 > 0.0 && isFinite(this.y50_1))) {
-      var message_0 = 'wPrimeJ must be finite and > 0, got ' + this.y50_1;
+    if (!(this.k52_1 > 0.0 && isFinite(this.k52_1))) {
+      var message_0 = 'wPrimeJ must be finite and > 0, got ' + this.k52_1;
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
   }
   protoOf(WPrimeBalanceOptions).toString = function () {
-    return 'WPrimeBalanceOptions(enabled=' + this.w50_1 + ', criticalPowerW=' + this.x50_1 + ', wPrimeJ=' + this.y50_1 + ')';
+    return 'WPrimeBalanceOptions(enabled=' + this.i52_1 + ', criticalPowerW=' + this.j52_1 + ', wPrimeJ=' + this.k52_1 + ')';
   };
   protoOf(WPrimeBalanceOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.w50_1);
-    result = imul(result, 31) + getNumberHashCode(this.x50_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y50_1) | 0;
+    var result = getBooleanHashCode(this.i52_1);
+    result = imul(result, 31) + getNumberHashCode(this.j52_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k52_1) | 0;
     return result;
   };
   protoOf(WPrimeBalanceOptions).equals = function (other) {
@@ -627,17 +773,17 @@
       return true;
     if (!(other instanceof WPrimeBalanceOptions))
       return false;
-    if (!(this.w50_1 === other.w50_1))
+    if (!(this.i52_1 === other.i52_1))
       return false;
-    if (!equals(this.x50_1, other.x50_1))
+    if (!equals(this.j52_1, other.j52_1))
       return false;
-    if (!equals(this.y50_1, other.y50_1))
+    if (!equals(this.k52_1, other.k52_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_5 = this;
-    this.z50_1 = new ElevationCorrectionOptions();
+    this.l52_1 = new ElevationCorrectionOptions();
   }
   var Companion_instance_5;
   function Companion_getInstance_9() {
@@ -649,15 +795,15 @@
     Companion_getInstance_9();
     bridgeDecks = bridgeDecks === VOID ? true : bridgeDecks;
     tunnels = tunnels === VOID ? true : tunnels;
-    this.a51_1 = bridgeDecks;
-    this.b51_1 = tunnels;
+    this.m50_1 = bridgeDecks;
+    this.n50_1 = tunnels;
   }
   protoOf(ElevationCorrectionOptions).toString = function () {
-    return 'ElevationCorrectionOptions(bridgeDecks=' + this.a51_1 + ', tunnels=' + this.b51_1 + ')';
+    return 'ElevationCorrectionOptions(bridgeDecks=' + this.m50_1 + ', tunnels=' + this.n50_1 + ')';
   };
   protoOf(ElevationCorrectionOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.a51_1);
-    result = imul(result, 31) + getBooleanHashCode(this.b51_1) | 0;
+    var result = getBooleanHashCode(this.m50_1);
+    result = imul(result, 31) + getBooleanHashCode(this.n50_1) | 0;
     return result;
   };
   protoOf(ElevationCorrectionOptions).equals = function (other) {
@@ -665,15 +811,15 @@
       return true;
     if (!(other instanceof ElevationCorrectionOptions))
       return false;
-    if (!(this.a51_1 === other.a51_1))
+    if (!(this.m50_1 === other.m50_1))
       return false;
-    if (!(this.b51_1 === other.b51_1))
+    if (!(this.n50_1 === other.n50_1))
       return false;
     return true;
   };
   function Companion_3() {
     Companion_instance_6 = this;
-    this.c51_1 = new EnhanceOptions();
+    this.m52_1 = new EnhanceOptions();
   }
   var Companion_instance_6;
   function Companion_getInstance_10() {
@@ -691,58 +837,58 @@
     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().s50_1) : elevationGain;
+    elevationGain = elevationGain === VOID ? new ElevationGainOptions(VOID, EngineConstants_getInstance().e52_1) : elevationGain;
     elevationSmoothWindowM = elevationSmoothWindowM === VOID ? 150.0 : elevationSmoothWindowM;
-    elevationCorrections = elevationCorrections === VOID ? Companion_getInstance_9().z50_1 : elevationCorrections;
-    this.d51_1 = fixElevation;
-    this.e51_1 = computeMaxSpeeds;
-    this.f51_1 = virtualizeTrack;
-    this.g51_1 = computeOnePointPerSecond;
-    this.h51_1 = simplifyPath;
-    this.i51_1 = wPrimeBalance;
-    this.j51_1 = curvature;
-    this.k51_1 = racingLine;
-    this.l51_1 = elevationGain;
-    this.m51_1 = elevationSmoothWindowM;
-    this.n51_1 = elevationCorrections;
+    elevationCorrections = elevationCorrections === VOID ? Companion_getInstance_9().l52_1 : elevationCorrections;
+    this.n52_1 = fixElevation;
+    this.o52_1 = computeMaxSpeeds;
+    this.p52_1 = virtualizeTrack;
+    this.q52_1 = computeOnePointPerSecond;
+    this.r52_1 = simplifyPath;
+    this.s52_1 = wPrimeBalance;
+    this.t52_1 = curvature;
+    this.u52_1 = racingLine;
+    this.v52_1 = elevationGain;
+    this.w52_1 = elevationSmoothWindowM;
+    this.x52_1 = elevationCorrections;
     // Inline function 'kotlin.require' call
-    if (!(this.m51_1 > 0.0 && isFinite(this.m51_1))) {
-      var message = 'elevationSmoothWindowM must be finite and > 0, got ' + this.m51_1;
+    if (!(this.w52_1 > 0.0 && isFinite(this.w52_1))) {
+      var message = 'elevationSmoothWindowM must be finite and > 0, got ' + this.w52_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
   }
-  protoOf(EnhanceOptions).o51 = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections) {
+  protoOf(EnhanceOptions).y52 = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections) {
     return new EnhanceOptions(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections);
   };
-  protoOf(EnhanceOptions).p51 = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections, $super) {
-    fixElevation = fixElevation === VOID ? this.d51_1 : fixElevation;
-    computeMaxSpeeds = computeMaxSpeeds === VOID ? this.e51_1 : computeMaxSpeeds;
-    virtualizeTrack = virtualizeTrack === VOID ? this.f51_1 : virtualizeTrack;
-    computeOnePointPerSecond = computeOnePointPerSecond === VOID ? this.g51_1 : computeOnePointPerSecond;
-    simplifyPath = simplifyPath === VOID ? this.h51_1 : simplifyPath;
-    wPrimeBalance = wPrimeBalance === VOID ? this.i51_1 : wPrimeBalance;
-    curvature = curvature === VOID ? this.j51_1 : curvature;
-    racingLine = racingLine === VOID ? this.k51_1 : racingLine;
-    elevationGain = elevationGain === VOID ? this.l51_1 : elevationGain;
-    elevationSmoothWindowM = elevationSmoothWindowM === VOID ? this.m51_1 : elevationSmoothWindowM;
-    elevationCorrections = elevationCorrections === VOID ? this.n51_1 : elevationCorrections;
-    return $super === VOID ? this.o51(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections) : $super.o51.call(this, fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections);
+  protoOf(EnhanceOptions).z52 = function (fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections, $super) {
+    fixElevation = fixElevation === VOID ? this.n52_1 : fixElevation;
+    computeMaxSpeeds = computeMaxSpeeds === VOID ? this.o52_1 : computeMaxSpeeds;
+    virtualizeTrack = virtualizeTrack === VOID ? this.p52_1 : virtualizeTrack;
+    computeOnePointPerSecond = computeOnePointPerSecond === VOID ? this.q52_1 : computeOnePointPerSecond;
+    simplifyPath = simplifyPath === VOID ? this.r52_1 : simplifyPath;
+    wPrimeBalance = wPrimeBalance === VOID ? this.s52_1 : wPrimeBalance;
+    curvature = curvature === VOID ? this.t52_1 : curvature;
+    racingLine = racingLine === VOID ? this.u52_1 : racingLine;
+    elevationGain = elevationGain === VOID ? this.v52_1 : elevationGain;
+    elevationSmoothWindowM = elevationSmoothWindowM === VOID ? this.w52_1 : elevationSmoothWindowM;
+    elevationCorrections = elevationCorrections === VOID ? this.x52_1 : elevationCorrections;
+    return $super === VOID ? this.y52(fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections) : $super.y52.call(this, fixElevation, computeMaxSpeeds, virtualizeTrack, computeOnePointPerSecond, simplifyPath, wPrimeBalance, curvature, racingLine, elevationGain, elevationSmoothWindowM, elevationCorrections);
   };
   protoOf(EnhanceOptions).toString = function () {
-    return 'EnhanceOptions(fixElevation=' + this.d51_1 + ', computeMaxSpeeds=' + this.e51_1 + ', virtualizeTrack=' + this.f51_1 + ', computeOnePointPerSecond=' + this.g51_1 + ', simplifyPath=' + this.h51_1.toString() + ', wPrimeBalance=' + this.i51_1.toString() + ', curvature=' + this.j51_1.toString() + ', racingLine=' + this.k51_1.toString() + ', elevationGain=' + this.l51_1.toString() + ', elevationSmoothWindowM=' + this.m51_1 + ', elevationCorrections=' + this.n51_1.toString() + ')';
+    return 'EnhanceOptions(fixElevation=' + this.n52_1 + ', computeMaxSpeeds=' + this.o52_1 + ', virtualizeTrack=' + this.p52_1 + ', computeOnePointPerSecond=' + this.q52_1 + ', simplifyPath=' + this.r52_1.toString() + ', wPrimeBalance=' + this.s52_1.toString() + ', curvature=' + this.t52_1.toString() + ', racingLine=' + this.u52_1.toString() + ', elevationGain=' + this.v52_1.toString() + ', elevationSmoothWindowM=' + this.w52_1 + ', elevationCorrections=' + this.x52_1.toString() + ')';
   };
   protoOf(EnhanceOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.d51_1);
-    result = imul(result, 31) + getBooleanHashCode(this.e51_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.f51_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.g51_1) | 0;
-    result = imul(result, 31) + this.h51_1.hashCode() | 0;
-    result = imul(result, 31) + this.i51_1.hashCode() | 0;
-    result = imul(result, 31) + this.j51_1.hashCode() | 0;
-    result = imul(result, 31) + this.k51_1.hashCode() | 0;
-    result = imul(result, 31) + this.l51_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.m51_1) | 0;
-    result = imul(result, 31) + this.n51_1.hashCode() | 0;
+    var result = getBooleanHashCode(this.n52_1);
+    result = imul(result, 31) + getBooleanHashCode(this.o52_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.p52_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.q52_1) | 0;
+    result = imul(result, 31) + this.r52_1.hashCode() | 0;
+    result = imul(result, 31) + this.s52_1.hashCode() | 0;
+    result = imul(result, 31) + this.t52_1.hashCode() | 0;
+    result = imul(result, 31) + this.u52_1.hashCode() | 0;
+    result = imul(result, 31) + this.v52_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.w52_1) | 0;
+    result = imul(result, 31) + this.x52_1.hashCode() | 0;
     return result;
   };
   protoOf(EnhanceOptions).equals = function (other) {
@@ -750,36 +896,36 @@
       return true;
     if (!(other instanceof EnhanceOptions))
       return false;
-    if (!(this.d51_1 === other.d51_1))
+    if (!(this.n52_1 === other.n52_1))
       return false;
-    if (!(this.e51_1 === other.e51_1))
+    if (!(this.o52_1 === other.o52_1))
       return false;
-    if (!(this.f51_1 === other.f51_1))
+    if (!(this.p52_1 === other.p52_1))
       return false;
-    if (!(this.g51_1 === other.g51_1))
+    if (!(this.q52_1 === other.q52_1))
       return false;
-    if (!this.h51_1.equals(other.h51_1))
+    if (!this.r52_1.equals(other.r52_1))
       return false;
-    if (!this.i51_1.equals(other.i51_1))
+    if (!this.s52_1.equals(other.s52_1))
       return false;
-    if (!this.j51_1.equals(other.j51_1))
+    if (!this.t52_1.equals(other.t52_1))
       return false;
-    if (!this.k51_1.equals(other.k51_1))
+    if (!this.u52_1.equals(other.u52_1))
       return false;
-    if (!this.l51_1.equals(other.l51_1))
+    if (!this.v52_1.equals(other.v52_1))
       return false;
-    if (!equals(this.m51_1, other.m51_1))
+    if (!equals(this.w52_1, other.w52_1))
       return false;
-    if (!this.n51_1.equals(other.n51_1))
+    if (!this.x52_1.equals(other.x52_1))
       return false;
     return true;
   };
   function $enhanceCourseCOROUTINE$(_this__u8e3s4, course, options, elevationProvider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.y51_1 = _this__u8e3s4;
-    this.z51_1 = course;
-    this.a52_1 = options;
-    this.b52_1 = elevationProvider;
+    this.i53_1 = _this__u8e3s4;
+    this.j53_1 = course;
+    this.k53_1 = options;
+    this.l53_1 = elevationProvider;
   }
   protoOf($enhanceCourseCOROUTINE$).o7 = function () {
     var suspendResult = this.i7_1;
@@ -788,162 +934,89 @@
         var tmp = this.g7_1;
         switch (tmp) {
           case 0:
-            this.h7_1 = 7;
-            if (!(!this.a52_1.d51_1 || !(this.b52_1 == null))) {
+            this.h7_1 = 2;
+            if (!(!this.k53_1.n52_1 || !(this.l53_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.c52_1 = this.z51_1.d4z();
-            this.c52_1 = PointPerDistance_instance.l2f(this.c52_1, -1.0, 30.0);
-            if (this.a52_1.d51_1 && !(this.b52_1 == null)) {
-              this.g7_1 = 1;
-              suspendResult = ElevationStep_instance.n2c(this.c52_1, this.b52_1, this);
-              if (suspendResult === get_COROUTINE_SUSPENDED()) {
-                return suspendResult;
-              }
-              continue $sm;
+            this.g7_1 = 1;
+            var tmp_0 = ElevationCorrection_instance;
+            var tmp_1 = this.j53_1.d4z();
+            var tmp0_safe_receiver = this.l53_1;
+            var tmp_2;
+            if (tmp0_safe_receiver == null) {
+              tmp_2 = null;
             } else {
-              this.g7_1 = 2;
-              continue $sm;
-            }
-
-          case 1:
-            this.c52_1 = suspendResult;
-            this.g7_1 = 2;
-            continue $sm;
-          case 2:
-            this.c52_1 = PointPerDistance_instance.l2f(this.c52_1, 1.0, 2.0);
-            var tmp_0 = this;
-            var tmp0_safe_receiver = this.b52_1;
-            tmp_0.e52_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e15_1;
-            this.f52_1 = (this.a52_1.d51_1 && !(this.b52_1 == null) && this.a52_1.n51_1.a51_1);
-            this.g52_1 = null;
-            if (this.f52_1 && !(this.b52_1 == null) && !(this.e52_1 == null)) {
-              this.g7_1 = 3;
-              suspendResult = BridgeDeckStep_instance.h52(this.c52_1, this.b52_1, this.e52_1, VOID, VOID, this);
-              if (suspendResult === get_COROUTINE_SUSPENDED()) {
-                return suspendResult;
+              var tmp_3;
+              if (this.k53_1.n52_1) {
+                tmp_3 = tmp0_safe_receiver;
+              } else {
+                tmp_3 = null;
               }
-              continue $sm;
-            } else {
-              this.g7_1 = 4;
-              continue $sm;
+              tmp_2 = tmp_3;
             }
 
-          case 3:
-            this.g52_1 = suspendResult;
-            this.c52_1 = this.g52_1.i52_1;
-            this.g7_1 = 4;
-            continue $sm;
-          case 4:
-            this.d52_1 = null;
-            if (this.a52_1.n51_1.b51_1 && this.a52_1.d51_1 && !(this.b52_1 == null)) {
-              var tunnelOptions = Companion_getInstance().f2h_1;
-              var deckStep = Companion_getInstance_0().v29_1.q27_1;
-              var x = tunnelOptions.g2g_1 - deckStep;
-              var sameGrid = Math.abs(x) < 1.0E-9;
-              var tmp1_safe_receiver = this.g52_1;
-              var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.l52_1;
-              var tmp_1;
-              if (tmp2_safe_receiver == null) {
-                tmp_1 = null;
-              } else {
-                var destination = ArrayList_init_$Create$(collectionSizeOrDefault(tmp2_safe_receiver, 10));
-                var _iterator__ex2g4s = tmp2_safe_receiver.l();
-                while (_iterator__ex2g4s.m()) {
-                  var item = _iterator__ex2g4s.n();
-                  destination.k(writtenRange(item, deckStep));
-                }
-                tmp_1 = destination;
-              }
-              var tmp3_elvis_lhs = tmp_1;
-              var protected_0 = tmp3_elvis_lhs == null ? emptyList() : tmp3_elvis_lhs;
-              this.g7_1 = 5;
-              var tmp_2 = TunnelStep_instance;
-              var tmp_3 = this.c52_1;
-              var tmp4_safe_receiver = this.g52_1;
-              var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.n52_1;
-              var tmp_4;
-              if (tmp5_safe_receiver == null) {
-                tmp_4 = null;
-              } else {
-                var tmp_5;
-                if (sameGrid) {
-                  tmp_5 = tmp5_safe_receiver;
-                } else {
-                  tmp_5 = null;
-                }
-                tmp_4 = tmp_5;
-              }
-              suspendResult = tmp_2.o52(tmp_3, this.b52_1, tunnelOptions, tmp_4, protected_0, 30.0, this);
-              if (suspendResult === get_COROUTINE_SUSPENDED()) {
-                return suspendResult;
-              }
-              continue $sm;
-            } else {
-              this.g7_1 = 6;
-              continue $sm;
+            suspendResult = tmp_0.e51(tmp_1, tmp_2, this.k53_1.x52_1, 1.0, 2.0, this);
+            if (suspendResult === get_COROUTINE_SUSPENDED()) {
+              return suspendResult;
             }
 
-          case 5:
-            this.d52_1 = suspendResult;
-            this.c52_1 = this.d52_1.p52_1;
-            this.g7_1 = 6;
             continue $sm;
-          case 6:
-            var corrections = ElevationCorrectionReport_instance.w52(this.g52_1, this.f52_1 && this.e52_1 == null, this.d52_1);
-            this.c52_1 = ElevationStep_instance.o2c(this.c52_1, this.a52_1.m51_1);
-            var racingLineApplied = this.a52_1.k51_1.x52_1;
+          case 1:
+            var path = suspendResult;
+            var corrections = path.c25_1;
+            path = ElevationStep_instance.o2c(path, this.k53_1.w52_1);
+            var racingLineApplied = this.k53_1.u52_1.m53_1;
             if (racingLineApplied) {
-              this.c52_1 = RacingLine_instance.a54(this.c52_1, this.a52_1.k51_1);
-            } else if (this.a52_1.j51_1.v53_1) {
-              PathCurvature_instance.u53(this.c52_1, this.a52_1.j51_1);
+              path = RacingLine_instance.p54(path, this.k53_1.u52_1);
+            } else if (this.k53_1.t52_1.k54_1) {
+              PathCurvature_instance.j54(path, this.k53_1.t52_1);
             }
 
-            var working = this.z51_1.h4z(this.z51_1.y4y_1.w4y(this.c52_1));
-            if (this.a52_1.e51_1 || this.a52_1.f51_1) {
-              MaxSpeedComputer_instance.h54(working.y4y_1);
+            var working = this.j53_1.h4z(this.j53_1.y4y_1.w4y(path));
+            if (this.k53_1.o52_1 || this.k53_1.p52_1) {
+              MaxSpeedComputer_instance.w54(working.y4y_1);
             }
 
-            if (this.a52_1.f51_1) {
-              this.c52_1 = VirtualizeService_instance.i54(working);
-              working = working.h4z(working.y4y_1.w4y(this.c52_1));
+            if (this.k53_1.p52_1) {
+              path = VirtualizeService_instance.x54(working);
+              working = working.h4z(working.y4y_1.w4y(path));
             }
 
-            if (this.a52_1.g51_1) {
-              this.c52_1 = PointPerSecond_instance.r2f(this.c52_1);
+            if (this.k53_1.q52_1) {
+              path = PointPerSecond_instance.r2f(path);
             }
 
-            if (this.a52_1.i51_1.w50_1) {
-              WPrimeBalanceComputer_instance.j54(this.c52_1, this.a52_1.i51_1);
+            if (this.k53_1.s52_1.i52_1) {
+              WPrimeBalanceComputer_instance.y54(path, this.k53_1.s52_1);
             }
 
-            if (this.a52_1.l51_1.a2b_1) {
-              ElevationGain_instance.s2b(this.c52_1, this.a52_1.l51_1);
+            if (this.k53_1.v52_1.a2b_1) {
+              ElevationGain_instance.s2b(path, this.k53_1.v52_1);
             }
 
-            if (this.a52_1.h51_1.t50_1) {
-              var tmp_6;
+            if (this.k53_1.r52_1.f52_1) {
+              var tmp_4;
               if (racingLineApplied) {
-                var tmp0 = this.a52_1.h51_1.u50_1;
-                var b = this.a52_1.k51_1.t53_1;
-                tmp_6 = Math.min(tmp0, b);
+                var tmp0 = this.k53_1.r52_1.g52_1;
+                var b = this.k53_1.u52_1.i54_1;
+                tmp_4 = Math.min(tmp0, b);
               } else {
-                tmp_6 = this.a52_1.h51_1.u50_1;
+                tmp_4 = this.k53_1.r52_1.g52_1;
               }
-              var tolerance = tmp_6;
-              this.c52_1 = PathSimplifier_instance.z2e(this.c52_1, tolerance, this.a52_1.h51_1.v50_1);
+              var tolerance = tmp_4;
+              path = PathSimplifier_instance.z2e(path, tolerance, this.k53_1.r52_1.h52_1);
             }
 
-            this.c52_1.c25_1 = corrections;
-            return this.c52_1;
-          case 7:
+            path.c25_1 = corrections;
+            return path;
+          case 2:
             throw this.j7_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.h7_1 === 7) {
+        if (this.h7_1 === 2) {
           throw e;
         } else {
           this.g7_1 = this.h7_1;
@@ -953,17 +1026,17 @@
      while (true);
   };
   function Enhancer() {
-    this.k54_1 = 30.0;
-    this.l54_1 = 1.0;
-    this.m54_1 = 2.0;
+    this.z54_1 = 30.0;
+    this.a55_1 = 1.0;
+    this.b55_1 = 2.0;
   }
-  protoOf(Enhancer).n54 = function (path) {
+  protoOf(Enhancer).c55 = function (path) {
     return new CoursePhysics(new Course(path), RhoProviderEstimate_instance, AeroProviderConstant_instance, WindProviderNone_instance, new PowerProviderConstant(280.0));
   };
-  protoOf(Enhancer).o54 = function (path, elevationProvider, options, $completion) {
-    return this.p54(this.n54(path), options.p51(options.d51_1 && !(elevationProvider == null)), elevationProvider, $completion);
+  protoOf(Enhancer).d55 = function (path, elevationProvider, options, $completion) {
+    return this.e55(this.c55(path), options.z52(options.n52_1 && !(elevationProvider == null)), elevationProvider, $completion);
   };
-  protoOf(Enhancer).p54 = function (course, options, elevationProvider, $completion) {
+  protoOf(Enhancer).e55 = function (course, options, elevationProvider, $completion) {
     var tmp = new $enhanceCourseCOROUTINE$(this, course, options, elevationProvider, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
@@ -982,7 +1055,7 @@
     var x = 0.6108652381980153;
     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().j50_1 * 0.36, 0.634920634920635 * 0.36);
+    RoadCondition_WET_instance = new RoadCondition('WET', 1, EngineConstants_getInstance().v51_1 * 0.36, 0.634920634920635 * 0.36);
     if (Companion_instance_7 == null) {
       Companion_instance;
       new Companion_4();
@@ -992,7 +1065,7 @@
   var RoadCondition_WET_instance;
   function Companion_4() {
     Companion_instance_7 = this;
-    this.q54_1 = RoadCondition_DRY_getInstance();
+    this.f55_1 = RoadCondition_DRY_getInstance();
   }
   protoOf(Companion_4).g23 = function (value) {
     var tmp0 = get_entries_0();
@@ -1045,12 +1118,12 @@
   var $ENTRIES;
   function RoadCondition(name, ordinal, mu, maxBrakeG) {
     Enum.call(this, name, ordinal);
-    this.t54_1 = mu;
-    this.u54_1 = maxBrakeG;
+    this.i55_1 = mu;
+    this.j55_1 = maxBrakeG;
   }
-  protoOf(RoadCondition).v54 = function () {
+  protoOf(RoadCondition).k55 = function () {
     // Inline function 'kotlin.math.atan' call
-    var x = this.t54_1;
+    var x = this.i55_1;
     return Math.atan(x) * 180.0 / 3.141592653589793;
   };
   protoOf(RoadCondition).j23 = function () {
@@ -1073,8 +1146,8 @@
     if (_this__u8e3s4 == null) {
       tmp = cyclist;
     } else {
-      var tmp0_maxLeanAngleDeg = _this__u8e3s4.v54();
-      var tmp1_maxBrakeG = _this__u8e3s4.u54_1;
+      var tmp0_maxLeanAngleDeg = _this__u8e3s4.k55();
+      var tmp1_maxBrakeG = _this__u8e3s4.j55_1;
       tmp = cyclist.s4z(VOID, tmp1_maxBrakeG, VOID, VOID, tmp0_maxLeanAngleDeg);
     }
     return tmp;
@@ -1088,43 +1161,43 @@
     return RoadCondition_WET_instance;
   }
   function Climb(startIndex, endIndex, startDistanceM, endDistanceM, startElevationM, endElevationM, positiveElevationM, negativeElevationM, climbingDistanceM, parts) {
-    this.w54_1 = startIndex;
-    this.x54_1 = endIndex;
-    this.y54_1 = startDistanceM;
-    this.z54_1 = endDistanceM;
-    this.a55_1 = startElevationM;
-    this.b55_1 = endElevationM;
-    this.c55_1 = positiveElevationM;
-    this.d55_1 = negativeElevationM;
-    this.e55_1 = climbingDistanceM;
-    this.f55_1 = parts;
+    this.l55_1 = startIndex;
+    this.m55_1 = endIndex;
+    this.n55_1 = startDistanceM;
+    this.o55_1 = endDistanceM;
+    this.p55_1 = startElevationM;
+    this.q55_1 = endElevationM;
+    this.r55_1 = positiveElevationM;
+    this.s55_1 = negativeElevationM;
+    this.t55_1 = climbingDistanceM;
+    this.u55_1 = parts;
   }
-  protoOf(Climb).g55 = function () {
-    return this.z54_1 - this.y54_1;
+  protoOf(Climb).v55 = function () {
+    return this.o55_1 - this.n55_1;
   };
-  protoOf(Climb).h55 = function () {
-    return this.b55_1 - this.a55_1;
+  protoOf(Climb).w55 = function () {
+    return this.q55_1 - this.p55_1;
   };
-  protoOf(Climb).i55 = function () {
-    return this.g55() === 0.0 ? 0.0 : this.h55() / this.g55();
+  protoOf(Climb).x55 = function () {
+    return this.v55() === 0.0 ? 0.0 : this.w55() / this.v55();
   };
-  protoOf(Climb).j55 = function () {
-    return this.e55_1 === 0.0 ? 0.0 : this.c55_1 / this.e55_1;
+  protoOf(Climb).y55 = function () {
+    return this.t55_1 === 0.0 ? 0.0 : this.r55_1 / this.t55_1;
   };
   protoOf(Climb).toString = function () {
-    return 'Climb(startIndex=' + this.w54_1 + ', endIndex=' + this.x54_1 + ', startDistanceM=' + this.y54_1 + ', endDistanceM=' + this.z54_1 + ', startElevationM=' + this.a55_1 + ', endElevationM=' + this.b55_1 + ', positiveElevationM=' + this.c55_1 + ', negativeElevationM=' + this.d55_1 + ', climbingDistanceM=' + this.e55_1 + ', parts=' + toString(this.f55_1) + ')';
+    return 'Climb(startIndex=' + this.l55_1 + ', endIndex=' + this.m55_1 + ', startDistanceM=' + this.n55_1 + ', endDistanceM=' + this.o55_1 + ', startElevationM=' + this.p55_1 + ', endElevationM=' + this.q55_1 + ', positiveElevationM=' + this.r55_1 + ', negativeElevationM=' + this.s55_1 + ', climbingDistanceM=' + this.t55_1 + ', parts=' + toString(this.u55_1) + ')';
   };
   protoOf(Climb).hashCode = function () {
-    var result = this.w54_1;
-    result = imul(result, 31) + this.x54_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y54_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z54_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.a55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.b55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.c55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e55_1) | 0;
-    result = imul(result, 31) + hashCode(this.f55_1) | 0;
+    var result = this.l55_1;
+    result = imul(result, 31) + this.m55_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.o55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.p55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.q55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.r55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s55_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.t55_1) | 0;
+    result = imul(result, 31) + hashCode(this.u55_1) | 0;
     return result;
   };
   protoOf(Climb).equals = function (other) {
@@ -1132,51 +1205,51 @@
       return true;
     if (!(other instanceof Climb))
       return false;
-    if (!(this.w54_1 === other.w54_1))
+    if (!(this.l55_1 === other.l55_1))
       return false;
-    if (!(this.x54_1 === other.x54_1))
+    if (!(this.m55_1 === other.m55_1))
       return false;
-    if (!equals(this.y54_1, other.y54_1))
+    if (!equals(this.n55_1, other.n55_1))
       return false;
-    if (!equals(this.z54_1, other.z54_1))
+    if (!equals(this.o55_1, other.o55_1))
       return false;
-    if (!equals(this.a55_1, other.a55_1))
+    if (!equals(this.p55_1, other.p55_1))
       return false;
-    if (!equals(this.b55_1, other.b55_1))
+    if (!equals(this.q55_1, other.q55_1))
       return false;
-    if (!equals(this.c55_1, other.c55_1))
+    if (!equals(this.r55_1, other.r55_1))
       return false;
-    if (!equals(this.d55_1, other.d55_1))
+    if (!equals(this.s55_1, other.s55_1))
       return false;
-    if (!equals(this.e55_1, other.e55_1))
+    if (!equals(this.t55_1, other.t55_1))
       return false;
-    if (!equals(this.f55_1, other.f55_1))
+    if (!equals(this.u55_1, other.u55_1))
       return false;
     return true;
   };
   function ClimbPart(startDistanceM, endDistanceM, startElevationM, endElevationM) {
-    this.k55_1 = startDistanceM;
-    this.l55_1 = endDistanceM;
-    this.m55_1 = startElevationM;
-    this.n55_1 = endElevationM;
+    this.z55_1 = startDistanceM;
+    this.a56_1 = endDistanceM;
+    this.b56_1 = startElevationM;
+    this.c56_1 = endElevationM;
   }
-  protoOf(ClimbPart).g55 = function () {
-    return this.l55_1 - this.k55_1;
+  protoOf(ClimbPart).v55 = function () {
+    return this.a56_1 - this.z55_1;
   };
-  protoOf(ClimbPart).h55 = function () {
-    return this.n55_1 - this.m55_1;
+  protoOf(ClimbPart).w55 = function () {
+    return this.c56_1 - this.b56_1;
   };
-  protoOf(ClimbPart).o55 = function () {
-    return this.g55() === 0.0 ? 0.0 : this.h55() / this.g55();
+  protoOf(ClimbPart).d56 = function () {
+    return this.v55() === 0.0 ? 0.0 : this.w55() / this.v55();
   };
   protoOf(ClimbPart).toString = function () {
-    return 'ClimbPart(startDistanceM=' + this.k55_1 + ', endDistanceM=' + this.l55_1 + ', startElevationM=' + this.m55_1 + ', endElevationM=' + this.n55_1 + ')';
+    return 'ClimbPart(startDistanceM=' + this.z55_1 + ', endDistanceM=' + this.a56_1 + ', startElevationM=' + this.b56_1 + ', endElevationM=' + this.c56_1 + ')';
   };
   protoOf(ClimbPart).hashCode = function () {
-    var result = getNumberHashCode(this.k55_1);
-    result = imul(result, 31) + getNumberHashCode(this.l55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.m55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.n55_1) | 0;
+    var result = getNumberHashCode(this.z55_1);
+    result = imul(result, 31) + getNumberHashCode(this.a56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.b56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.c56_1) | 0;
     return result;
   };
   protoOf(ClimbPart).equals = function (other) {
@@ -1184,19 +1257,19 @@
       return true;
     if (!(other instanceof ClimbPart))
       return false;
-    if (!equals(this.k55_1, other.k55_1))
+    if (!equals(this.z55_1, other.z55_1))
       return false;
-    if (!equals(this.l55_1, other.l55_1))
+    if (!equals(this.a56_1, other.a56_1))
       return false;
-    if (!equals(this.m55_1, other.m55_1))
+    if (!equals(this.b56_1, other.b56_1))
       return false;
-    if (!equals(this.n55_1, other.n55_1))
+    if (!equals(this.c56_1, other.c56_1))
       return false;
     return true;
   };
   function Companion_5() {
     Companion_instance_8 = this;
-    this.p55_1 = new ClimbOptions();
+    this.e56_1 = new ClimbOptions();
   }
   var Companion_instance_8;
   function Companion_getInstance_12() {
@@ -1213,30 +1286,30 @@
     maxDiffRealGradeRatio = maxDiffRealGradeRatio === VOID ? 1.3 : maxDiffRealGradeRatio;
     booster = booster === VOID ? 1.3 : booster;
     maxAnalysisPoints = maxAnalysisPoints === VOID ? 3000 : maxAnalysisPoints;
-    this.q55_1 = minMinClimbElevationM;
-    this.r55_1 = maxMinClimbElevationM;
-    this.s55_1 = minClimbElevationRatio;
-    this.t55_1 = minGradePercent;
-    this.u55_1 = maxDiffRealGradeRatio;
-    this.v55_1 = booster;
-    this.w55_1 = maxAnalysisPoints;
+    this.f56_1 = minMinClimbElevationM;
+    this.g56_1 = maxMinClimbElevationM;
+    this.h56_1 = minClimbElevationRatio;
+    this.i56_1 = minGradePercent;
+    this.j56_1 = maxDiffRealGradeRatio;
+    this.k56_1 = booster;
+    this.l56_1 = maxAnalysisPoints;
     // Inline function 'kotlin.require' call
-    if (!(this.w55_1 >= 2)) {
+    if (!(this.l56_1 >= 2)) {
       var message = 'maxAnalysisPoints must be at least 2';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
   }
   protoOf(ClimbOptions).toString = function () {
-    return 'ClimbOptions(minMinClimbElevationM=' + this.q55_1 + ', maxMinClimbElevationM=' + this.r55_1 + ', minClimbElevationRatio=' + this.s55_1 + ', minGradePercent=' + this.t55_1 + ', maxDiffRealGradeRatio=' + this.u55_1 + ', booster=' + this.v55_1 + ', maxAnalysisPoints=' + this.w55_1 + ')';
+    return 'ClimbOptions(minMinClimbElevationM=' + this.f56_1 + ', maxMinClimbElevationM=' + this.g56_1 + ', minClimbElevationRatio=' + this.h56_1 + ', minGradePercent=' + this.i56_1 + ', maxDiffRealGradeRatio=' + this.j56_1 + ', booster=' + this.k56_1 + ', maxAnalysisPoints=' + this.l56_1 + ')';
   };
   protoOf(ClimbOptions).hashCode = function () {
-    var result = getNumberHashCode(this.q55_1);
-    result = imul(result, 31) + getNumberHashCode(this.r55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.s55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.t55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u55_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v55_1) | 0;
-    result = imul(result, 31) + this.w55_1 | 0;
+    var result = getNumberHashCode(this.f56_1);
+    result = imul(result, 31) + getNumberHashCode(this.g56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k56_1) | 0;
+    result = imul(result, 31) + this.l56_1 | 0;
     return result;
   };
   protoOf(ClimbOptions).equals = function (other) {
@@ -1244,25 +1317,25 @@
       return true;
     if (!(other instanceof ClimbOptions))
       return false;
-    if (!equals(this.q55_1, other.q55_1))
+    if (!equals(this.f56_1, other.f56_1))
       return false;
-    if (!equals(this.r55_1, other.r55_1))
+    if (!equals(this.g56_1, other.g56_1))
       return false;
-    if (!equals(this.s55_1, other.s55_1))
+    if (!equals(this.h56_1, other.h56_1))
       return false;
-    if (!equals(this.t55_1, other.t55_1))
+    if (!equals(this.i56_1, other.i56_1))
       return false;
-    if (!equals(this.u55_1, other.u55_1))
+    if (!equals(this.j56_1, other.j56_1))
       return false;
-    if (!equals(this.v55_1, other.v55_1))
+    if (!equals(this.k56_1, other.k56_1))
       return false;
-    if (!(this.w55_1 === other.w55_1))
+    if (!(this.l56_1 === other.l56_1))
       return false;
     return true;
   };
   function Companion_6() {
   }
-  protoOf(Companion_6).x55 = function (path, maxPoints) {
+  protoOf(Companion_6).m56 = function (path, maxPoints) {
     var tmp;
     if (path.l23_1 <= maxPoints) {
       var tmp_0 = 0;
@@ -1311,16 +1384,16 @@
     return Companion_instance_9;
   }
   function Profile(distance, elevation, sourceIndex) {
-    this.y55_1 = distance;
-    this.z55_1 = elevation;
-    this.a56_1 = sourceIndex;
+    this.n56_1 = distance;
+    this.o56_1 = elevation;
+    this.p56_1 = sourceIndex;
   }
   protoOf(Profile).o = function () {
-    return this.y55_1.length;
+    return this.n56_1.length;
   };
   function bestCandidateFrom($this, profile, i, minClimbElevation, options) {
-    var startDist = profile.y55_1[i];
-    var startEle = profile.z55_1[i];
+    var startDist = profile.n56_1[i];
+    var startEle = profile.o56_1[i];
     var positiveElevation = 0.0;
     var negativeElevation = 0.0;
     var distClimbing = 0.0;
@@ -1332,12 +1405,12 @@
       $l$loop: do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var endDist = profile.y55_1[j];
-        var endEle = profile.z55_1[j];
-        var dEle = endEle - profile.z55_1[j - 1 | 0];
+        var endDist = profile.n56_1[j];
+        var endEle = profile.o56_1[j];
+        var dEle = endEle - profile.o56_1[j - 1 | 0];
         if (dEle > 0) {
           positiveElevation = positiveElevation + dEle;
-          distClimbing = distClimbing + (endDist - profile.y55_1[j - 1 | 0]);
+          distClimbing = distClimbing + (endDist - profile.n56_1[j - 1 | 0]);
         } else {
           negativeElevation = negativeElevation + dEle;
         }
@@ -1348,9 +1421,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.v55_1;
+        var x = options.k56_1;
         var score = length * Math.pow(gradePercent, x);
-        var qualifies = gradePercent >= options.t55_1 && netElevation >= minClimbElevation && score >= bestScore && climbingGradePercent / gradePercent <= options.u55_1;
+        var qualifies = gradePercent >= options.i56_1 && netElevation >= minClimbElevation && score >= bestScore && climbingGradePercent / gradePercent <= options.j56_1;
         if (qualifies) {
           bestScore = score;
           best = new Candidate(i, j, score, positiveElevation, negativeElevation, distClimbing);
@@ -1380,7 +1453,7 @@
     return kept;
   }
   function toClimb($this, $receiver, path, profile) {
-    return new Climb(profile.a56_1[$receiver.b56_1], profile.a56_1[$receiver.c56_1], profile.y55_1[$receiver.b56_1], profile.y55_1[$receiver.c56_1], profile.z55_1[$receiver.b56_1], profile.z55_1[$receiver.c56_1], $receiver.e56_1, $receiver.f56_1, $receiver.g56_1, splitIntoParts($this, profile, $receiver.b56_1, $receiver.c56_1));
+    return new Climb(profile.p56_1[$receiver.q56_1], profile.p56_1[$receiver.r56_1], profile.n56_1[$receiver.q56_1], profile.n56_1[$receiver.r56_1], profile.o56_1[$receiver.q56_1], profile.o56_1[$receiver.r56_1], $receiver.t56_1, $receiver.u56_1, $receiver.v56_1, splitIntoParts($this, profile, $receiver.q56_1, $receiver.r56_1));
   }
   function splitIntoParts($this, profile, startIndex, endIndex) {
     // Inline function 'kotlin.collections.map' call
@@ -1394,14 +1467,14 @@
         var item = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         var i = item;
-        var tmp$ret$2 = new Vector3D(profile.y55_1[i], profile.z55_1[i], 0.0);
+        var tmp$ret$2 = new Vector3D(profile.n56_1[i], profile.o56_1[i], 0.0);
         destination.k(tmp$ret$2);
       }
        while (!(item === last));
     var points = destination;
     if (points.o() < 2)
       return emptyList();
-    var elevationGain = profile.z55_1[endIndex] - profile.z55_1[startIndex];
+    var elevationGain = profile.o56_1[endIndex] - profile.o56_1[startIndex];
     var tolerance = coerceIn(elevationGain / 50.0, 10.0, 50.0);
     var keptIndices = DouglasPeucker_instance.o11(points, tolerance);
     var tmp$ret$3;
@@ -1431,26 +1504,26 @@
     return tmp$ret$3;
   }
   function Candidate(startIndex, endIndex, score, positiveElevationM, negativeElevationM, climbingDistanceM) {
-    this.b56_1 = startIndex;
-    this.c56_1 = endIndex;
-    this.d56_1 = score;
-    this.e56_1 = positiveElevationM;
-    this.f56_1 = negativeElevationM;
-    this.g56_1 = climbingDistanceM;
+    this.q56_1 = startIndex;
+    this.r56_1 = endIndex;
+    this.s56_1 = score;
+    this.t56_1 = positiveElevationM;
+    this.u56_1 = negativeElevationM;
+    this.v56_1 = climbingDistanceM;
   }
-  protoOf(Candidate).h56 = function (other) {
-    return other.b56_1 <= this.b56_1 && this.b56_1 <= other.c56_1 || (other.b56_1 <= this.c56_1 && this.c56_1 <= other.c56_1) || (this.b56_1 <= other.b56_1 && other.c56_1 <= this.c56_1);
+  protoOf(Candidate).w56 = function (other) {
+    return other.q56_1 <= this.q56_1 && this.q56_1 <= other.r56_1 || (other.q56_1 <= this.r56_1 && this.r56_1 <= other.r56_1) || (this.q56_1 <= other.q56_1 && other.r56_1 <= this.r56_1);
   };
   protoOf(Candidate).toString = function () {
-    return 'Candidate(startIndex=' + this.b56_1 + ', endIndex=' + this.c56_1 + ', score=' + this.d56_1 + ', positiveElevationM=' + this.e56_1 + ', negativeElevationM=' + this.f56_1 + ', climbingDistanceM=' + this.g56_1 + ')';
+    return 'Candidate(startIndex=' + this.q56_1 + ', endIndex=' + this.r56_1 + ', score=' + this.s56_1 + ', positiveElevationM=' + this.t56_1 + ', negativeElevationM=' + this.u56_1 + ', climbingDistanceM=' + this.v56_1 + ')';
   };
   protoOf(Candidate).hashCode = function () {
-    var result = this.b56_1;
-    result = imul(result, 31) + this.c56_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d56_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e56_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f56_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g56_1) | 0;
+    var result = this.q56_1;
+    result = imul(result, 31) + this.r56_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.t56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u56_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.v56_1) | 0;
     return result;
   };
   protoOf(Candidate).equals = function (other) {
@@ -1458,31 +1531,31 @@
       return true;
     if (!(other instanceof Candidate))
       return false;
-    if (!(this.b56_1 === other.b56_1))
+    if (!(this.q56_1 === other.q56_1))
       return false;
-    if (!(this.c56_1 === other.c56_1))
+    if (!(this.r56_1 === other.r56_1))
       return false;
-    if (!equals(this.d56_1, other.d56_1))
+    if (!equals(this.s56_1, other.s56_1))
       return false;
-    if (!equals(this.e56_1, other.e56_1))
+    if (!equals(this.t56_1, other.t56_1))
       return false;
-    if (!equals(this.f56_1, other.f56_1))
+    if (!equals(this.u56_1, other.u56_1))
       return false;
-    if (!equals(this.g56_1, other.g56_1))
+    if (!equals(this.v56_1, other.v56_1))
       return false;
     return true;
   };
   function sam$kotlin_Comparator$0(function_0) {
-    this.i56_1 = function_0;
+    this.x56_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).la = function (a, b) {
-    return this.i56_1(a, b);
+    return this.x56_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.la(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).e2 = function () {
-    return this.i56_1;
+    return this.x56_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
@@ -1503,16 +1576,16 @@
     return hashCode(this.e2());
   };
   function sam$kotlin_Comparator$0_0(function_0) {
-    this.j56_1 = function_0;
+    this.y56_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0_0).la = function (a, b) {
-    return this.j56_1(a, b);
+    return this.y56_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0_0).compare = function (a, b) {
     return this.la(a, b);
   };
   protoOf(sam$kotlin_Comparator$0_0).e2 = function () {
-    return this.j56_1;
+    return this.y56_1;
   };
   protoOf(sam$kotlin_Comparator$0_0).equals = function (other) {
     var tmp;
@@ -1534,38 +1607,38 @@
   };
   function ClimbDetector$detect$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.b56_1;
-    var tmp$ret$2 = b.b56_1;
+    var tmp = a.q56_1;
+    var tmp$ret$2 = b.q56_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function ClimbDetector$dedupeByScore$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = b.d56_1;
-    var tmp$ret$2 = a.d56_1;
+    var tmp = b.s56_1;
+    var tmp$ret$2 = a.s56_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function ClimbDetector$dedupeByScore$lambda_0($best) {
     return function (it) {
-      return it.h56($best);
+      return it.w56($best);
     };
   }
   function ClimbDetector() {
-    this.k56_1 = 10.0;
-    this.l56_1 = 10.0;
-    this.m56_1 = 50.0;
-    this.n56_1 = 50.0;
+    this.z56_1 = 10.0;
+    this.a57_1 = 10.0;
+    this.b57_1 = 50.0;
+    this.c57_1 = 50.0;
   }
-  protoOf(ClimbDetector).o56 = function (path, options) {
+  protoOf(ClimbDetector).d57 = function (path, options) {
     if (path.l23_1 < 2)
       return emptyList();
-    var tmp0 = options.q55_1;
-    var tmp0_0 = options.r55_1;
+    var tmp0 = options.f56_1;
+    var tmp0_0 = options.g56_1;
     // Inline function 'kotlin.comparisons.minOf' call
-    var b = path.y24_1 / options.s55_1;
+    var b = path.y24_1 / options.h56_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_9.x55(path, options.w55_1);
+    var profile = Companion_instance_9.m56(path, options.l56_1);
     // Inline function 'kotlin.collections.mapNotNull' call
     var tmp0_1 = until(0, profile.o());
     // Inline function 'kotlin.collections.mapNotNullTo' call
@@ -1605,9 +1678,9 @@
     }
     return destination_0;
   };
-  protoOf(ClimbDetector).p56 = function (path, options, $super) {
-    options = options === VOID ? Companion_getInstance_12().p55_1 : options;
-    return $super === VOID ? this.o56(path, options) : $super.o56.call(this, path, options);
+  protoOf(ClimbDetector).e57 = function (path, options, $super) {
+    options = options === VOID ? Companion_getInstance_12().e56_1 : options;
+    return $super === VOID ? this.d57(path, options) : $super.d57.call(this, path, options);
   };
   var ClimbDetector_instance;
   function ClimbDetector_getInstance() {
@@ -1633,12 +1706,12 @@
   function BridgeDeckResult(path, status, detection, replacements, dropped, terrain) {
     dropped = dropped === VOID ? emptyList() : dropped;
     terrain = terrain === VOID ? null : terrain;
-    this.i52_1 = path;
-    this.j52_1 = status;
-    this.k52_1 = detection;
-    this.l52_1 = replacements;
-    this.m52_1 = dropped;
-    this.n52_1 = terrain;
+    this.p50_1 = path;
+    this.q50_1 = status;
+    this.r50_1 = detection;
+    this.s50_1 = replacements;
+    this.t50_1 = dropped;
+    this.u50_1 = terrain;
   }
   function alongTrackStations(path, stepM) {
     if (path.l23_1 === 0)
@@ -1692,17 +1765,17 @@
   }
   function BridgeDeckStep$replaceDecks$ref(p0) {
     return constructCallableReference(function (p0_0, p1, p2, p3) {
-      return p0.q56(p0_0, p1, p2, p3);
+      return p0.f57(p0_0, p1, p2, p3);
     }, 4, 0, 12, 'replaceDecks', [p0]);
   }
   function $applyCOROUTINE$(_this__u8e3s4, path, terrain, surface, options, replace, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.z56_1 = _this__u8e3s4;
-    this.a57_1 = path;
-    this.b57_1 = terrain;
-    this.c57_1 = surface;
-    this.d57_1 = options;
-    this.e57_1 = replace;
+    this.o57_1 = _this__u8e3s4;
+    this.p57_1 = path;
+    this.q57_1 = terrain;
+    this.r57_1 = surface;
+    this.s57_1 = options;
+    this.t57_1 = replace;
   }
   protoOf($applyCOROUTINE$).o7 = function () {
     var suspendResult = this.i7_1;
@@ -1712,12 +1785,12 @@
         switch (tmp) {
           case 0:
             this.h7_1 = 5;
-            if (this.a57_1.l23_1 < 2)
-              return new BridgeDeckResult(this.a57_1, BridgeDeckStatus_NO_DECK_getInstance(), null, emptyList());
-            this.h57_1 = alongTrackStations(this.a57_1, this.d57_1.q27_1);
+            if (this.p57_1.l23_1 < 2)
+              return new BridgeDeckResult(this.p57_1, BridgeDeckStatus_NO_DECK_getInstance(), null, emptyList());
+            this.w57_1 = alongTrackStations(this.p57_1, this.s57_1.q27_1);
             this.h7_1 = 3;
             this.g7_1 = 1;
-            suspendResult = this.b57_1.e16(asReversed(this.h57_1), VOID, this);
+            suspendResult = this.q57_1.e16(asReversed(this.w57_1), VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -1733,9 +1806,9 @@
             }
 
             var ARGUMENT = asReversed(destination);
-            this.g57_1 = toDoubleArray(ARGUMENT);
+            this.v57_1 = toDoubleArray(ARGUMENT);
             this.g7_1 = 2;
-            suspendResult = this.c57_1.e16(this.h57_1, VOID, this);
+            suspendResult = this.r57_1.e16(this.w57_1, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -1751,7 +1824,7 @@
             }
 
             var ARGUMENT_0 = toDoubleArray(destination_0);
-            this.f57_1 = to(this.g57_1, ARGUMENT_0);
+            this.u57_1 = to(this.v57_1, ARGUMENT_0);
             this.h7_1 = 5;
             this.g7_1 = 4;
             continue $sm;
@@ -1768,7 +1841,7 @@
                 var e_0 = this.j7_1;
                 var tmp_3 = this;
                 ensureActive(this.m7());
-                return new BridgeDeckResult(this.a57_1, BridgeDeckStatus_FETCH_FAILED_getInstance(), null, emptyList());
+                return new BridgeDeckResult(this.p57_1, BridgeDeckStatus_FETCH_FAILED_getInstance(), null, emptyList());
               } else {
                 throw this.j7_1;
               }
@@ -1776,9 +1849,9 @@
 
           case 4:
             this.h7_1 = 5;
-            var samples = this.f57_1;
-            var r = this.e57_1(this.a57_1, samples.ic_1, samples.jc_1, this.d57_1);
-            return new BridgeDeckResult(r.i52_1, r.j52_1, r.k52_1, r.l52_1, r.m52_1, samples.ic_1);
+            var samples = this.u57_1;
+            var r = this.t57_1(this.p57_1, samples.ic_1, samples.jc_1, this.s57_1);
+            return new BridgeDeckResult(r.p50_1, r.q50_1, r.r50_1, r.s50_1, r.t50_1, samples.ic_1);
           case 5:
             throw this.j7_1;
         }
@@ -1795,13 +1868,13 @@
   };
   function BridgeDeckStep() {
   }
-  protoOf(BridgeDeckStep).i57 = function (path, terrain, surface, options, replace, $completion) {
+  protoOf(BridgeDeckStep).x57 = function (path, terrain, surface, options, replace, $completion) {
     var tmp = new $applyCOROUTINE$(this, path, terrain, surface, options, replace, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
     return tmp.o7();
   };
-  protoOf(BridgeDeckStep).h52 = function (path, terrain, surface, options, replace, $completion, $super) {
+  protoOf(BridgeDeckStep).o50 = function (path, terrain, surface, options, replace, $completion, $super) {
     options = options === VOID ? Companion_getInstance_0().v29_1 : options;
     var tmp;
     if (replace === VOID) {
@@ -1810,9 +1883,9 @@
       tmp = replace;
     }
     replace = tmp;
-    return $super === VOID ? this.i57(path, terrain, surface, options, replace, $completion) : $super.i57.call(this, path, terrain, surface, options, replace, $completion);
+    return $super === VOID ? this.x57(path, terrain, surface, options, replace, $completion) : $super.x57.call(this, path, terrain, surface, options, replace, $completion);
   };
-  protoOf(BridgeDeckStep).q56 = function (path, mnt, mns, options) {
+  protoOf(BridgeDeckStep).f57 = function (path, mnt, mns, options) {
     var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.collections.all' call
@@ -1836,9 +1909,9 @@
     if (built.j2a_1.q()) {
       return new BridgeDeckResult(path, BridgeDeckStatus_NO_DECK_getInstance(), detection, emptyList(), built.k2a_1);
     }
-    return new BridgeDeckResult(this.j57(path, built.j2a_1, options.q27_1), BridgeDeckStatus_APPLIED_getInstance(), detection, built.j2a_1, built.k2a_1);
+    return new BridgeDeckResult(this.y57(path, built.j2a_1, options.q27_1), BridgeDeckStatus_APPLIED_getInstance(), detection, built.j2a_1, built.k2a_1);
   };
-  protoOf(BridgeDeckStep).j57 = function (path, replacements, stepM) {
+  protoOf(BridgeDeckStep).y57 = function (path, replacements, stepM) {
     var out = path.y2e();
     var _iterator__ex2g4s = replacements.l();
     while (_iterator__ex2g4s.m()) {
@@ -1940,18 +2013,18 @@
     return 'km ' + km(ElevationCorrectionReport_instance, first(it).a27_1) + '\u2013' + km(ElevationCorrectionReport_instance, last(it).b27_1);
   }
   function ElevationCorrectionReport() {
-    this.u52_1 = "bridge decks: a terrain- or surface-model tile could not be read; every bridge on this path keeps the terrain model's valley floor, and the same input may give a different profile once the tiles are reachable";
-    this.v52_1 = 'tunnels: a terrain tile could not be read; no tunnel on this path was flattened';
+    this.b51_1 = "bridge decks: a terrain- or surface-model tile could not be read; every bridge on this path keeps the terrain model's valley floor, and the same input may give a different profile once the tiles are reachable";
+    this.c51_1 = 'tunnels: a terrain tile could not be read; no tunnel on this path was flattened';
   }
-  protoOf(ElevationCorrectionReport).w52 = function (decks, decksUnavailable, tunnels) {
+  protoOf(ElevationCorrectionReport).d51 = function (decks, decksUnavailable, tunnels) {
     var warnings = ArrayList_init_$Create$_0();
-    var deckStatus = decks == null ? decksUnavailable ? ElevationCorrectionStatus_UNAVAILABLE_getInstance() : ElevationCorrectionStatus_NOT_RUN_getInstance() : toReport(this, decks.j52_1);
-    if (equals(decks == null ? null : decks.j52_1, BridgeDeckStatus_FETCH_FAILED_getInstance())) {
+    var deckStatus = decks == null ? decksUnavailable ? ElevationCorrectionStatus_UNAVAILABLE_getInstance() : ElevationCorrectionStatus_NOT_RUN_getInstance() : toReport(this, decks.q50_1);
+    if (equals(decks == null ? null : decks.q50_1, BridgeDeckStatus_FETCH_FAILED_getInstance())) {
       // Inline function 'kotlin.collections.plusAssign' call
       var element = "bridge decks: a terrain- or surface-model tile could not be read; every bridge on this path keeps the terrain model's valley floor, and the same input may give a different profile once the tiles are reachable";
       warnings.k(element);
     }
-    var tmp2_safe_receiver = decks == null ? null : decks.m52_1;
+    var tmp2_safe_receiver = decks == null ? null : decks.t50_1;
     var tmp;
     if (tmp2_safe_receiver == null) {
       tmp = null;
@@ -1974,29 +2047,29 @@
     // Inline function 'kotlin.collections.isNotEmpty' call
     if (!droppedDecks.q()) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var element_1 = this.k57(droppedDecks);
+      var element_1 = this.z57(droppedDecks);
       warnings.k(element_1);
     }
-    if (equals(tunnels == null ? null : tunnels.q52_1, TunnelStatus_FETCH_FAILED_getInstance())) {
+    if (equals(tunnels == null ? null : tunnels.x50_1, TunnelStatus_FETCH_FAILED_getInstance())) {
       // Inline function 'kotlin.collections.plusAssign' call
       var element_2 = 'tunnels: a terrain tile could not be read; no tunnel on this path was flattened';
       warnings.k(element_2);
     }
-    var tmp6_safe_receiver = decks == null ? null : decks.l52_1;
+    var tmp6_safe_receiver = decks == null ? null : decks.s50_1;
     var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : tmp6_safe_receiver.o();
     var tmp_0 = tmp7_elvis_lhs == null ? 0 : tmp7_elvis_lhs;
     var tmp_1 = droppedDecks.o();
-    var tmp9_safe_receiver = tunnels == null ? null : tunnels.q52_1;
+    var tmp9_safe_receiver = tunnels == null ? null : tunnels.x50_1;
     var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : toReport_0(this, tmp9_safe_receiver);
     var tmp_2 = tmp10_elvis_lhs == null ? ElevationCorrectionStatus_NOT_RUN_getInstance() : tmp10_elvis_lhs;
-    var tmp12_safe_receiver = tunnels == null ? null : tunnels.r52_1;
+    var tmp12_safe_receiver = tunnels == null ? null : tunnels.y50_1;
     var tmp13_elvis_lhs = tmp12_safe_receiver == null ? null : tmp12_safe_receiver.o();
     var tmp_3 = tmp13_elvis_lhs == null ? 0 : tmp13_elvis_lhs;
-    var tmp15_safe_receiver = tunnels == null ? null : tunnels.t52_1;
+    var tmp15_safe_receiver = tunnels == null ? null : tunnels.a51_1;
     var tmp16_elvis_lhs = tmp15_safe_receiver == null ? null : tmp15_safe_receiver.o();
     return new ElevationCorrections(deckStatus, tmp_0, tmp_1, tmp_2, tmp_3, tmp16_elvis_lhs == null ? 0 : tmp16_elvis_lhs, warnings);
   };
-  protoOf(ElevationCorrectionReport).k57 = function (dropped) {
+  protoOf(ElevationCorrectionReport).z57 = function (dropped) {
     var where = joinToString(dropped, ', ', VOID, VOID, VOID, VOID, ElevationCorrectionReport$droppedDecksWarning$lambda);
     return 'bridge decks: ' + dropped.o() + ' detected deck(s) kept the valley floor (fewer than two surface anchors) at ' + where;
   };
@@ -2048,7 +2121,7 @@
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var dx = LocalFrame_instance.n57(_this__u8e3s4.p23(i) - lon0) * cosLat0;
+        var dx = LocalFrame_instance.c58(_this__u8e3s4.p23(i) - lon0) * cosLat0;
         var dy = _this__u8e3s4.o23(i) - lat0;
         // Inline function 'kotlin.math.hypot' call
         var length = hypot(dx, dy);
@@ -2113,11 +2186,11 @@
   function TunnelResult(path, status, spans, written, dropped) {
     written = written === VOID ? emptyList() : written;
     dropped = dropped === VOID ? emptyList() : dropped;
-    this.p52_1 = path;
-    this.q52_1 = status;
-    this.r52_1 = spans;
-    this.s52_1 = written;
-    this.t52_1 = dropped;
+    this.w50_1 = path;
+    this.x50_1 = status;
+    this.y50_1 = spans;
+    this.z50_1 = written;
+    this.a51_1 = dropped;
   }
   function write$isProtected($protected, d) {
     var tmp$ret$0;
@@ -2185,13 +2258,13 @@
   }
   function $applyCOROUTINE$_0(_this__u8e3s4, path, terrain, options, samples, protected_0, refreshM, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.w57_1 = _this__u8e3s4;
-    this.x57_1 = path;
-    this.y57_1 = terrain;
-    this.z57_1 = options;
-    this.a58_1 = samples;
-    this.b58_1 = protected_0;
-    this.c58_1 = refreshM;
+    this.l58_1 = _this__u8e3s4;
+    this.m58_1 = path;
+    this.n58_1 = terrain;
+    this.o58_1 = options;
+    this.p58_1 = samples;
+    this.q58_1 = protected_0;
+    this.r58_1 = refreshM;
   }
   protoOf($applyCOROUTINE$_0).o7 = function () {
     var suspendResult = this.i7_1;
@@ -2201,22 +2274,22 @@
         switch (tmp) {
           case 0:
             this.h7_1 = 5;
-            if (this.x57_1.l23_1 < 2)
-              return new TunnelResult(this.x57_1, TunnelStatus_NO_TUNNEL_getInstance(), emptyList());
-            this.d58_1 = alongTrackStations(this.x57_1, this.z57_1.g2g_1);
-            if (!(this.a58_1 == null)) {
+            if (this.m58_1.l23_1 < 2)
+              return new TunnelResult(this.m58_1, TunnelStatus_NO_TUNNEL_getInstance(), emptyList());
+            this.s58_1 = alongTrackStations(this.m58_1, this.o58_1.g2g_1);
+            if (!(this.p58_1 == null)) {
               var tmp_0 = this;
-              if (!(this.a58_1.length === this.d58_1.o())) {
-                var message = 'terrain samples: ' + this.a58_1.length + ' for ' + this.d58_1.o() + ' stations at ' + this.z57_1.g2g_1 + ' m';
+              if (!(this.p58_1.length === this.s58_1.o())) {
+                var message = 'terrain samples: ' + this.p58_1.length + ' for ' + this.s58_1.o() + ' stations at ' + this.o58_1.g2g_1 + ' m';
                 throw IllegalArgumentException_init_$Create$(toString(message));
               }
-              tmp_0.e58_1 = this.a58_1;
+              tmp_0.t58_1 = this.p58_1;
               this.g7_1 = 4;
               continue $sm;
             } else {
               this.h7_1 = 2;
               this.g7_1 = 1;
-              suspendResult = this.y57_1.e16(asReversed(this.d58_1), VOID, this);
+              suspendResult = this.n58_1.e16(asReversed(this.s58_1), VOID, this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -2233,7 +2306,7 @@
             }
 
             var ARGUMENT = asReversed(destination);
-            this.f58_1 = toDoubleArray(ARGUMENT);
+            this.u58_1 = toDoubleArray(ARGUMENT);
             this.h7_1 = 5;
             this.g7_1 = 3;
             continue $sm;
@@ -2250,7 +2323,7 @@
                 var e_0 = this.j7_1;
                 var tmp_4 = this;
                 ensureActive(this.m7());
-                return new TunnelResult(this.x57_1, TunnelStatus_FETCH_FAILED_getInstance(), emptyList());
+                return new TunnelResult(this.m58_1, TunnelStatus_FETCH_FAILED_getInstance(), emptyList());
               } else {
                 throw this.j7_1;
               }
@@ -2258,12 +2331,12 @@
 
           case 3:
             this.h7_1 = 5;
-            this.e58_1 = this.f58_1;
+            this.t58_1 = this.u58_1;
             this.g7_1 = 4;
             continue $sm;
           case 4:
-            var mnt = this.e58_1;
-            var this_1 = this.d58_1;
+            var mnt = this.t58_1;
+            var this_1 = this.s58_1;
             var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(this_1, 10));
             var _iterator__ex2g4s_0 = this_1.l();
             while (_iterator__ex2g4s_0.m()) {
@@ -2271,7 +2344,7 @@
               destination_0.k(item_0.b11_1);
             }
 
-            var this_2 = this.d58_1;
+            var this_2 = this.s58_1;
             var destination_1 = ArrayList_init_$Create$(collectionSizeOrDefault(this_2, 10));
             var _iterator__ex2g4s_1 = this_2.l();
             while (_iterator__ex2g4s_1.m()) {
@@ -2279,7 +2352,7 @@
               destination_1.k(item_1.c11_1);
             }
 
-            return this.w57_1.g58(this.x57_1, mnt, destination_0, destination_1, this.z57_1, this.b58_1, this.c58_1);
+            return this.l58_1.v58(this.m58_1, mnt, destination_0, destination_1, this.o58_1, this.q58_1, this.r58_1);
           case 5:
             throw this.j7_1;
         }
@@ -2296,13 +2369,13 @@
   };
   function TunnelStep() {
   }
-  protoOf(TunnelStep).o52 = function (path, terrain, options, samples, protected_0, refreshM, $completion) {
+  protoOf(TunnelStep).v50 = function (path, terrain, options, samples, protected_0, refreshM, $completion) {
     var tmp = new $applyCOROUTINE$_0(this, path, terrain, options, samples, protected_0, refreshM, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
     return tmp.o7();
   };
-  protoOf(TunnelStep).g58 = function (path, mnt, lat, lon, options, protected_0, refreshM) {
+  protoOf(TunnelStep).v58 = function (path, mnt, lat, lon, options, protected_0, refreshM) {
     var found = TunnelDetector_instance.d2h(new TunnelProfile(mnt, toDoubleArray(lat), toDoubleArray(lon)), options);
     // Inline function 'kotlin.collections.partition' call
     var first = ArrayList_init_$Create$_0();
@@ -2354,9 +2427,9 @@
       destination.k(tmp$ret$6);
     }
     var written = destination;
-    return new TunnelResult(this.h58(path, spans, mnt, options.g2g_1, protected_0, refreshM), TunnelStatus_APPLIED_getInstance(), spans, written, dropped);
+    return new TunnelResult(this.w58(path, spans, mnt, options.g2g_1, protected_0, refreshM), TunnelStatus_APPLIED_getInstance(), spans, written, dropped);
   };
-  protoOf(TunnelStep).h58 = function (path, spans, mnt, stepM, protected_0, refreshM) {
+  protoOf(TunnelStep).w58 = function (path, spans, mnt, stepM, protected_0, refreshM) {
     var out = path.y2e();
     var _iterator__ex2g4s = spans.l();
     while (_iterator__ex2g4s.m()) {
@@ -2404,13 +2477,13 @@
   function computeWithWind($this, path, i, aeroCoef, wind) {
     var speed = path.x2d(i);
     var bearing = path.b2d(i);
-    path.e2e(i, wind.i58_1);
-    path.f2e(i, wind.j58_1);
-    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.j58_1;
+    path.e2e(i, wind.x58_1);
+    path.f2e(i, wind.y58_1);
+    var windDirectionAsBearing = 3.141592653589793 / 2.0 - wind.y58_1;
     path.i2d(i, windDirectionAsBearing);
     var alpha = windDirectionAsBearing - bearing;
     path.k2d(i, alpha);
-    var v = wind.i58_1;
+    var v = wind.x58_1;
     // Inline function 'kotlin.math.cos' call
     var l1 = speed + v * Math.cos(alpha);
     var l2 = l1 * l1;
@@ -2425,14 +2498,14 @@
     return tmp_1 * Math.sqrt(l3) * l1 * speed;
   }
   function AeroPowerProvider() {
-    this.k58_1 = 1.2;
+    this.z58_1 = 1.2;
   }
-  protoOf(AeroPowerProvider).l58 = function (course, path, pointIndex) {
-    var aeroCoef = course.a4z_1.m58(course, path, pointIndex);
+  protoOf(AeroPowerProvider).a59 = function (course, path, pointIndex) {
+    var aeroCoef = course.a4z_1.b59(course, path, pointIndex);
     path.h2d(pointIndex, aeroCoef);
-    var wind = course.b4z_1.n58(course.y4y_1, path, pointIndex);
+    var wind = course.b4z_1.c59(course.y4y_1, path, pointIndex);
     var tmp;
-    if (wind.i58_1 === 0.0) {
+    if (wind.x58_1 === 0.0) {
       var v = path.x2d(pointIndex);
       tmp = -aeroCoef * v * v * v;
     } else {
@@ -2448,8 +2521,8 @@
   }
   function AeroProviderConstant() {
   }
-  protoOf(AeroProviderConstant).m58 = function (course, path, pointIndex) {
-    var rho = course.z4y_1.o58(course.y4y_1, path, pointIndex);
+  protoOf(AeroProviderConstant).b59 = function (course, path, pointIndex) {
+    var rho = course.z4y_1.d59(course.y4y_1, path, pointIndex);
     return course.e4z().k4z_1 * course.e4z().l4z_1 * rho / 2.0;
   };
   var AeroProviderConstant_instance;
@@ -2459,8 +2532,8 @@
   function CyclistPowerProvider() {
   }
   function Companion_7() {
-    this.q58_1 = 0.05;
-    this.r58_1 = 3.0;
+    this.f59_1 = 0.05;
+    this.g59_1 = 3.0;
   }
   var Companion_instance_10;
   function Companion_getInstance_14() {
@@ -2468,10 +2541,10 @@
   }
   function CyclistPowerProviderBase(useHarmonics, random) {
     random = random === VOID ? Default_getInstance() : random;
-    this.s58_1 = useHarmonics;
+    this.h59_1 = useHarmonics;
     var tmp = this;
     var tmp_0;
-    if (this.s58_1) {
+    if (this.h59_1) {
       // Inline function 'kotlin.collections.List' call
       // Inline function 'kotlin.collections.MutableList' call
       var list = ArrayList_init_$Create$(20);
@@ -2489,25 +2562,25 @@
     } else {
       tmp_0 = emptyList();
     }
-    tmp.t58_1 = tmp_0;
+    tmp.i59_1 = tmp_0;
   }
-  protoOf(CyclistPowerProviderBase).l58 = function (course, path, pointIndex) {
-    var power = this.u58(course, path, pointIndex);
+  protoOf(CyclistPowerProviderBase).a59 = function (course, path, pointIndex) {
+    var power = this.j59(course, path, pointIndex);
     path.p2d(pointIndex, power);
-    if (this.s58_1) {
+    if (this.h59_1) {
       var x = path.n23(pointIndex) / 10000.0;
-      var _iterator__ex2g4s = this.t58_1.l();
+      var _iterator__ex2g4s = this.i59_1.l();
       while (_iterator__ex2g4s.m()) {
         var h = _iterator__ex2g4s.n();
         var tmp = power;
-        var tmp_0 = h.x58_1 * power;
+        var tmp_0 = h.m59_1 * power;
         // Inline function 'kotlin.math.cos' call
-        var x_0 = h.v58_1 * x - h.w58_1;
+        var x_0 = h.k59_1 * x - h.l59_1;
         power = tmp + tmp_0 * Math.cos(x_0);
       }
     }
     path.q2d(pointIndex, power);
-    var powerNeeded = -PowerComputer_instance.z58(course, path, pointIndex, false);
+    var powerNeeded = -PowerComputer_instance.o59(course, path, pointIndex, false);
     path.r2d(pointIndex, powerNeeded);
     return power;
   };
@@ -2539,12 +2612,12 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = item.c59_1;
+      var tmp$ret$2 = item.r59_1;
       destination.k(tmp$ret$2);
     }
     return destination;
   };
-  protoOf(Companion_8).d59 = function (id) {
+  protoOf(Companion_8).s59 = function (id) {
     var tmp0 = get_entries_1();
     var tmp$ret$0;
     $l$block: {
@@ -2552,7 +2625,7 @@
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (equals_0(element.c59_1, id, true)) {
+        if (equals_0(element.r59_1, id, true)) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -2578,22 +2651,22 @@
   var $ENTRIES_0;
   function PowerModel(name, ordinal, id) {
     Enum.call(this, name, ordinal);
-    this.c59_1 = id;
+    this.r59_1 = id;
   }
   protoOf(PowerModel).toString = function () {
-    return this.c59_1;
+    return this.r59_1;
   };
   function baseProvider($this) {
     var tmp;
-    switch ($this.e59_1.v1_1) {
+    switch ($this.t59_1.v1_1) {
       case 0:
-        tmp = new PowerProviderConstant($this.f59_1, $this.i59_1);
+        tmp = new PowerProviderConstant($this.u59_1, $this.x59_1);
         break;
       case 1:
-        tmp = new PowerProviderDurability($this.f59_1, $this.g59_1, VOID, VOID, $this.i59_1);
+        tmp = new PowerProviderDurability($this.u59_1, $this.v59_1, VOID, VOID, $this.x59_1);
         break;
       case 2:
-        tmp = new PowerProviderCriticalPower($this.f59_1, $this.g59_1, $this.h59_1, VOID, $this.i59_1);
+        tmp = new PowerProviderCriticalPower($this.u59_1, $this.v59_1, $this.w59_1, VOID, $this.x59_1);
         break;
       case 3:
         tmp = PowerProviderFromData_instance;
@@ -2612,33 +2685,33 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     pacing = pacing === VOID ? false : pacing;
     maxSlewWPerS = maxSlewWPerS === VOID ? 0.0 : maxSlewWPerS;
-    this.e59_1 = model;
-    this.f59_1 = powerW;
-    this.g59_1 = criticalPowerW;
-    this.h59_1 = wPrimeJ;
-    this.i59_1 = useHarmonics;
-    this.j59_1 = pacing;
-    this.k59_1 = maxSlewWPerS;
-  }
-  protoOf(CyclistPowerSpec).l59 = function () {
+    this.t59_1 = model;
+    this.u59_1 = powerW;
+    this.v59_1 = criticalPowerW;
+    this.w59_1 = wPrimeJ;
+    this.x59_1 = useHarmonics;
+    this.y59_1 = pacing;
+    this.z59_1 = maxSlewWPerS;
+  }
+  protoOf(CyclistPowerSpec).a5a = function () {
     var provider = baseProvider(this);
-    if (this.j59_1)
+    if (this.y59_1)
       provider = new PowerProviderTerrainPacing(provider);
-    if (this.k59_1 > 0.0)
-      provider = new PowerProviderSlewLimited(provider, this.k59_1);
+    if (this.z59_1 > 0.0)
+      provider = new PowerProviderSlewLimited(provider, this.z59_1);
     return provider;
   };
   protoOf(CyclistPowerSpec).toString = function () {
-    return 'CyclistPowerSpec(model=' + this.e59_1.toString() + ', powerW=' + this.f59_1 + ', criticalPowerW=' + this.g59_1 + ', wPrimeJ=' + this.h59_1 + ', useHarmonics=' + this.i59_1 + ', pacing=' + this.j59_1 + ', maxSlewWPerS=' + this.k59_1 + ')';
+    return 'CyclistPowerSpec(model=' + this.t59_1.toString() + ', powerW=' + this.u59_1 + ', criticalPowerW=' + this.v59_1 + ', wPrimeJ=' + this.w59_1 + ', useHarmonics=' + this.x59_1 + ', pacing=' + this.y59_1 + ', maxSlewWPerS=' + this.z59_1 + ')';
   };
   protoOf(CyclistPowerSpec).hashCode = function () {
-    var result = this.e59_1.hashCode();
-    result = imul(result, 31) + getNumberHashCode(this.f59_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g59_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h59_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.i59_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.j59_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.k59_1) | 0;
+    var result = this.t59_1.hashCode();
+    result = imul(result, 31) + getNumberHashCode(this.u59_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.v59_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.w59_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.x59_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.y59_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z59_1) | 0;
     return result;
   };
   protoOf(CyclistPowerSpec).equals = function (other) {
@@ -2646,19 +2719,19 @@
       return true;
     if (!(other instanceof CyclistPowerSpec))
       return false;
-    if (!this.e59_1.equals(other.e59_1))
+    if (!this.t59_1.equals(other.t59_1))
       return false;
-    if (!equals(this.f59_1, other.f59_1))
+    if (!equals(this.u59_1, other.u59_1))
       return false;
-    if (!equals(this.g59_1, other.g59_1))
+    if (!equals(this.v59_1, other.v59_1))
       return false;
-    if (!equals(this.h59_1, other.h59_1))
+    if (!equals(this.w59_1, other.w59_1))
       return false;
-    if (!(this.i59_1 === other.i59_1))
+    if (!(this.x59_1 === other.x59_1))
       return false;
-    if (!(this.j59_1 === other.j59_1))
+    if (!(this.y59_1 === other.y59_1))
       return false;
-    if (!equals(this.k59_1, other.k59_1))
+    if (!equals(this.z59_1, other.z59_1))
       return false;
     return true;
   };
@@ -2680,7 +2753,7 @@
   }
   function GravPowerProvider() {
   }
-  protoOf(GravPowerProvider).l58 = function (course, path, pointIndex) {
+  protoOf(GravPowerProvider).a59 = function (course, path, pointIndex) {
     var m = course.e4z().i4z_1;
     var grade = path.d2d(pointIndex);
     var speed = path.x2d(pointIndex);
@@ -2697,17 +2770,17 @@
     return GravPowerProvider_instance;
   }
   function Harmonic(freqRadS, phaseRad, amp) {
-    this.v58_1 = freqRadS;
-    this.w58_1 = phaseRad;
-    this.x58_1 = amp;
+    this.k59_1 = freqRadS;
+    this.l59_1 = phaseRad;
+    this.m59_1 = amp;
   }
   protoOf(Harmonic).toString = function () {
-    return 'Harmonic(freqRadS=' + this.v58_1 + ', phaseRad=' + this.w58_1 + ', amp=' + this.x58_1 + ')';
+    return 'Harmonic(freqRadS=' + this.k59_1 + ', phaseRad=' + this.l59_1 + ', amp=' + this.m59_1 + ')';
   };
   protoOf(Harmonic).hashCode = function () {
-    var result = getNumberHashCode(this.v58_1);
-    result = imul(result, 31) + getNumberHashCode(this.w58_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x58_1) | 0;
+    var result = getNumberHashCode(this.k59_1);
+    result = imul(result, 31) + getNumberHashCode(this.l59_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.m59_1) | 0;
     return result;
   };
   protoOf(Harmonic).equals = function (other) {
@@ -2715,11 +2788,11 @@
       return true;
     if (!(other instanceof Harmonic))
       return false;
-    if (!equals(this.v58_1, other.v58_1))
+    if (!equals(this.k59_1, other.k59_1))
       return false;
-    if (!equals(this.w58_1, other.w58_1))
+    if (!equals(this.l59_1, other.l59_1))
       return false;
-    if (!equals(this.x58_1, other.x58_1))
+    if (!equals(this.m59_1, other.m59_1))
       return false;
     return true;
   };
@@ -2769,7 +2842,7 @@
       do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        totalBearingChange = totalBearingChange + $this.m59(path.b2d(j + 1 | 0) - path.b2d(j));
+        totalBearingChange = totalBearingChange + $this.b5a(path.b2d(j + 1 | 0) - path.b2d(j));
       }
        while (inductionVariable < maxi);
     var totalDistance = path.p2b(maxi) - path.p2b(mini);
@@ -2831,14 +2904,14 @@
     return vf * vf + 2.0 * aX * d - v * v;
   }
   function MaxSpeedComputer() {
-    this.b54_1 = 200.0;
-    this.c54_1 = 5.0;
-    this.d54_1 = 2.0;
-    this.e54_1 = 0.001;
-    this.f54_1 = 10;
-    this.g54_1 = 24;
-  }
-  protoOf(MaxSpeedComputer).h54 = function (course) {
+    this.q54_1 = 200.0;
+    this.r54_1 = 5.0;
+    this.s54_1 = 2.0;
+    this.t54_1 = 0.001;
+    this.u54_1 = 10;
+    this.v54_1 = 24;
+  }
+  protoOf(MaxSpeedComputer).w54 = function (course) {
     var path = course.s4y_1;
     var n = path.l23_1;
     var inductionVariable = n - 1 | 0;
@@ -2856,7 +2929,7 @@
        while (0 <= inductionVariable);
     path.f25();
   };
-  protoOf(MaxSpeedComputer).m59 = function (angleIn) {
+  protoOf(MaxSpeedComputer).b5a = function (angleIn) {
     var a = angleIn;
     while (a > 3.141592653589793)
       a = a - 2.0 * 3.141592653589793;
@@ -2870,16 +2943,16 @@
   }
   function MuscularPowerProvider() {
   }
-  protoOf(MuscularPowerProvider).l58 = function (course, path, pointIndex) {
-    var intent = course.c4z_1.l58(course, path, pointIndex);
-    var muscular = this.n59(course, path, pointIndex) ? intent : 0.0;
+  protoOf(MuscularPowerProvider).a59 = function (course, path, pointIndex) {
+    var intent = course.c4z_1.a59(course, path, pointIndex);
+    var muscular = this.c5a(course, path, pointIndex) ? intent : 0.0;
     path.s2d(pointIndex, muscular);
-    course.c4z_1.p58(pointIndex, muscular);
+    course.c4z_1.e59(pointIndex, muscular);
     var wheel = muscular * course.f4z().o4y_1;
     path.t2d(pointIndex, wheel);
     return wheel;
   };
-  protoOf(MuscularPowerProvider).n59 = function (course, path, pointIndex) {
+  protoOf(MuscularPowerProvider).c5a = function (course, path, pointIndex) {
     var radius = path.f2d(pointIndex);
     if (!isFinite(radius) || radius <= 0.0)
       return true;
@@ -2901,7 +2974,7 @@
     var tol = Math.max(a, 1.0E-12);
     while (dt2 - dt1 >= tol) {
       var dtMid = (dt1 + dt2) / 2.0;
-      var dxMid = $this.o59(pSum, equivalentMass, currentSpeed, dtMid);
+      var dxMid = $this.d5a(pSum, equivalentMass, currentSpeed, dtMid);
       if (dxMid < dx)
         dt1 = dtMid;
       else
@@ -2910,20 +2983,20 @@
     return (dt1 + dt2) / 2.0;
   }
   function PowerComputer() {
-    this.y58_1 = 1.0E-12;
+    this.n59_1 = 1.0E-12;
   }
-  protoOf(PowerComputer).z58 = function (course, path, pointIndex, withCyclist) {
+  protoOf(PowerComputer).o59 = function (course, path, pointIndex, withCyclist) {
     var pSum = 0.0;
-    pSum = pSum + WheelBearingsPowerProvider_instance.l58(course, path, pointIndex);
-    pSum = pSum + RollingResistancePowerProvider_instance.l58(course, path, pointIndex);
-    pSum = pSum + AeroPowerProvider_instance.l58(course, path, pointIndex);
-    pSum = pSum + GravPowerProvider_instance.l58(course, path, pointIndex);
+    pSum = pSum + WheelBearingsPowerProvider_instance.a59(course, path, pointIndex);
+    pSum = pSum + RollingResistancePowerProvider_instance.a59(course, path, pointIndex);
+    pSum = pSum + AeroPowerProvider_instance.a59(course, path, pointIndex);
+    pSum = pSum + GravPowerProvider_instance.a59(course, path, pointIndex);
     if (withCyclist) {
-      pSum = pSum + MuscularPowerProvider_instance.l58(course, path, pointIndex);
+      pSum = pSum + MuscularPowerProvider_instance.a59(course, path, pointIndex);
     }
     return pSum;
   };
-  protoOf(PowerComputer).o59 = function (pSum, equivalentMass, currentSpeed, dt) {
+  protoOf(PowerComputer).d5a = function (pSum, equivalentMass, currentSpeed, dt) {
     // Inline function 'kotlin.math.max' call
     var b = dt * pSum / (0.5 * equivalentMass) + currentSpeed * currentSpeed;
     // Inline function 'kotlin.math.sqrt' call
@@ -2934,17 +3007,17 @@
     var newSpeed = Math.max(tmp0, b_0);
     return (currentSpeed + newSpeed) * dt / 2.0;
   };
-  protoOf(PowerComputer).p59 = function (equivalentMass, s1, s2, dt) {
+  protoOf(PowerComputer).e5a = function (equivalentMass, s1, s2, dt) {
     return 0.5 * equivalentMass * (s2 * s2 - s1 * s1) / dt;
   };
-  protoOf(PowerComputer).q59 = function (pSum, equivalentMass, currentSpeed, dx) {
+  protoOf(PowerComputer).f5a = function (pSum, equivalentMass, currentSpeed, dx) {
     var dt = 0.1;
-    while (this.o59(pSum, equivalentMass, currentSpeed, dt) <= dx) {
+    while (this.d5a(pSum, equivalentMass, currentSpeed, dt) <= dx) {
       dt = dt + 0.1;
     }
     return getDtInner(this, pSum, equivalentMass, currentSpeed, dx, dt - 0.1, dt);
   };
-  protoOf(PowerComputer).r59 = function (course, path, equivalentMass, i) {
+  protoOf(PowerComputer).g5a = function (course, path, equivalentMass, i) {
     if (i === 0) {
       path.w2d(i, 0.0);
       path.h2e(i, 0.0);
@@ -2958,10 +3031,10 @@
       path.w2d(i, 0.0);
       return Unit_instance;
     }
-    var resistive = this.z58(course, path, i - 1 | 0, false);
+    var resistive = this.o59(course, path, i - 1 | 0, false);
     var s1 = path.x2d(i - 1 | 0);
     var s2 = path.x2d(i);
-    var totPower = this.p59(equivalentMass, s1, s2, dtSeconds);
+    var totPower = this.e5a(equivalentMass, s1, s2, dtSeconds);
     path.u2d(i, totPower);
     var powerWheel = totPower - resistive;
     path.v2d(i, powerWheel);
@@ -2972,13 +3045,13 @@
     var computed = Math.max(0.0, powerWheel) / course.f4z().o4y_1;
     path.w2d(i, computed);
   };
-  protoOf(PowerComputer).s59 = function (course) {
+  protoOf(PowerComputer).h5a = function (course) {
     var m = course.t4y_1.i4z_1;
     var totalInertia = course.u4y_1.l4y_1 + course.u4y_1.m4y_1;
     return m + totalInertia / (course.u4y_1.n4y_1 * course.u4y_1.n4y_1);
   };
-  protoOf(PowerComputer).t59 = function (course) {
-    return this.s59(course.y4y_1);
+  protoOf(PowerComputer).i5a = function (course) {
+    return this.h5a(course.y4y_1);
   };
   var PowerComputer_instance;
   function PowerComputer_getInstance() {
@@ -2988,13 +3061,13 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.w59_1 = power;
+    this.l5a_1 = power;
   }
-  protoOf(PowerProviderConstant).u58 = function (course, path, pointIndex) {
-    return this.w59_1;
+  protoOf(PowerProviderConstant).j59 = function (course, path, pointIndex) {
+    return this.l5a_1;
   };
   function Companion_9() {
-    this.x59_1 = 0.5;
+    this.m5a_1 = 0.5;
   }
   var Companion_instance_12;
   function Companion_getInstance_16() {
@@ -3007,82 +3080,82 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.a5a_1 = powerW;
-    this.b5a_1 = criticalPowerW;
-    this.c5a_1 = wPrimeJ;
-    this.d5a_1 = taperStartFraction;
+    this.p5a_1 = powerW;
+    this.q5a_1 = criticalPowerW;
+    this.r5a_1 = wPrimeJ;
+    this.s5a_1 = taperStartFraction;
     // Inline function 'kotlin.require' call
-    if (!(this.a5a_1 > 0.0)) {
-      var message = 'powerW must be > 0, got ' + this.a5a_1;
+    if (!(this.p5a_1 > 0.0)) {
+      var message = 'powerW must be > 0, got ' + this.p5a_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.b5a_1 > 0.0)) {
-      var message_0 = 'criticalPowerW must be > 0, got ' + this.b5a_1;
+    if (!(this.q5a_1 > 0.0)) {
+      var message_0 = 'criticalPowerW must be > 0, got ' + this.q5a_1;
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.c5a_1 > 0.0)) {
-      var message_1 = 'wPrimeJ must be > 0, got ' + this.c5a_1;
+    if (!(this.r5a_1 > 0.0)) {
+      var message_1 = 'wPrimeJ must be > 0, got ' + this.r5a_1;
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
-    var containsArg = this.d5a_1;
+    var containsArg = this.s5a_1;
     // Inline function 'kotlin.require' call
     if (!(0.0 <= containsArg ? containsArg <= 1.0 : false)) {
-      var message_2 = 'taperStartFraction must be in [0, 1], got ' + this.d5a_1;
+      var message_2 = 'taperStartFraction must be in [0, 1], got ' + this.s5a_1;
       throw IllegalArgumentException_init_$Create$(toString(message_2));
     }
-    this.e5a_1 = -1;
-    this.f5a_1 = 0.0;
-    this.g5a_1 = 0.0;
-    this.h5a_1 = this.c5a_1;
+    this.t5a_1 = -1;
+    this.u5a_1 = 0.0;
+    this.v5a_1 = 0.0;
+    this.w5a_1 = this.r5a_1;
   }
-  protoOf(PowerProviderCriticalPower).i5a = function () {
-    return this.h5a_1 / this.c5a_1;
+  protoOf(PowerProviderCriticalPower).x5a = function () {
+    return this.w5a_1 / this.r5a_1;
   };
-  protoOf(PowerProviderCriticalPower).u58 = function (course, path, pointIndex) {
-    if (pointIndex < this.e5a_1) {
-      this.j5a();
+  protoOf(PowerProviderCriticalPower).j59 = function (course, path, pointIndex) {
+    if (pointIndex < this.t5a_1) {
+      this.y5a();
     }
-    if (pointIndex > this.e5a_1) {
+    if (pointIndex > this.t5a_1) {
       var elapsedS = path.x2c(pointIndex);
-      var dtS = elapsedS - this.f5a_1;
+      var dtS = elapsedS - this.u5a_1;
       if (dtS > 0.0 && isFinite(dtS)) {
-        this.h5a_1 = WPrimeBalanceComputer_instance.k5a(this.h5a_1, this.g5a_1, this.b5a_1, this.c5a_1, dtS);
+        this.w5a_1 = WPrimeBalanceComputer_instance.z5a(this.w5a_1, this.v5a_1, this.q5a_1, this.r5a_1, dtS);
       }
       if (isFinite(elapsedS))
-        this.f5a_1 = elapsedS;
-      this.e5a_1 = pointIndex;
+        this.u5a_1 = elapsedS;
+      this.t5a_1 = pointIndex;
     }
-    var rationed = this.l5a(this.a5a_1);
-    this.g5a_1 = rationed;
+    var rationed = this.a5b(this.p5a_1);
+    this.v5a_1 = rationed;
     return rationed;
   };
-  protoOf(PowerProviderCriticalPower).p58 = function (pointIndex, powerW) {
-    if (pointIndex === this.e5a_1 && isFinite(powerW))
-      this.g5a_1 = powerW;
+  protoOf(PowerProviderCriticalPower).e59 = function (pointIndex, powerW) {
+    if (pointIndex === this.t5a_1 && isFinite(powerW))
+      this.v5a_1 = powerW;
   };
-  protoOf(PowerProviderCriticalPower).l5a = function (target) {
-    if (target <= this.b5a_1)
+  protoOf(PowerProviderCriticalPower).a5b = function (target) {
+    if (target <= this.q5a_1)
       return target;
     var tmp;
-    if (this.d5a_1 <= 0.0) {
+    if (this.s5a_1 <= 0.0) {
       tmp = 1.0;
     } else {
-      tmp = coerceIn(this.i5a() / this.d5a_1, 0.0, 1.0);
+      tmp = coerceIn(this.x5a() / this.s5a_1, 0.0, 1.0);
     }
     var shape = tmp;
-    return this.b5a_1 + (target - this.b5a_1) * shape;
+    return this.q5a_1 + (target - this.q5a_1) * shape;
   };
-  protoOf(PowerProviderCriticalPower).j5a = function () {
-    this.e5a_1 = -1;
-    this.f5a_1 = 0.0;
-    this.g5a_1 = 0.0;
-    this.h5a_1 = this.c5a_1;
+  protoOf(PowerProviderCriticalPower).y5a = function () {
+    this.t5a_1 = -1;
+    this.u5a_1 = 0.0;
+    this.v5a_1 = 0.0;
+    this.w5a_1 = this.r5a_1;
   };
   function Companion_10() {
-    this.m5a_1 = 0.006666666666666667;
-    this.n5a_1 = 0.2;
+    this.b5b_1 = 0.006666666666666667;
+    this.c5b_1 = 0.2;
   }
   var Companion_instance_13;
   function Companion_getInstance_17() {
@@ -3095,75 +3168,75 @@
     useHarmonics = useHarmonics === VOID ? false : useHarmonics;
     random = random === VOID ? Default_getInstance() : random;
     CyclistPowerProviderBase.call(this, useHarmonics, random);
-    this.q5a_1 = powerW;
-    this.r5a_1 = criticalPowerW;
-    this.s5a_1 = declinePerKjPerKg;
-    this.t5a_1 = maxDecline;
+    this.f5b_1 = powerW;
+    this.g5b_1 = criticalPowerW;
+    this.h5b_1 = declinePerKjPerKg;
+    this.i5b_1 = maxDecline;
     // Inline function 'kotlin.require' call
-    if (!(this.q5a_1 > 0.0)) {
-      var message = 'powerW must be > 0, got ' + this.q5a_1;
+    if (!(this.f5b_1 > 0.0)) {
+      var message = 'powerW must be > 0, got ' + this.f5b_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.r5a_1 > 0.0)) {
-      var message_0 = 'criticalPowerW must be > 0, got ' + this.r5a_1;
+    if (!(this.g5b_1 > 0.0)) {
+      var message_0 = 'criticalPowerW must be > 0, got ' + this.g5b_1;
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.s5a_1 >= 0.0)) {
-      var message_1 = 'declinePerKjPerKg must be >= 0, got ' + this.s5a_1;
+    if (!(this.h5b_1 >= 0.0)) {
+      var message_1 = 'declinePerKjPerKg must be >= 0, got ' + this.h5b_1;
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
-    var containsArg = this.t5a_1;
+    var containsArg = this.i5b_1;
     // Inline function 'kotlin.require' call
     if (!(0.0 <= containsArg ? containsArg <= 1.0 : false)) {
-      var message_2 = 'maxDecline must be in [0, 1], got ' + this.t5a_1;
+      var message_2 = 'maxDecline must be in [0, 1], got ' + this.i5b_1;
       throw IllegalArgumentException_init_$Create$(toString(message_2));
     }
-    this.u5a_1 = -1;
-    this.v5a_1 = 0.0;
-    this.w5a_1 = 0.0;
-    this.x5a_1 = 0.0;
-    this.y5a_1 = 80.0;
+    this.j5b_1 = -1;
+    this.k5b_1 = 0.0;
+    this.l5b_1 = 0.0;
+    this.m5b_1 = 0.0;
+    this.n5b_1 = 80.0;
   }
-  protoOf(PowerProviderDurability).z5a = function () {
-    var tmp0 = this.t5a_1;
+  protoOf(PowerProviderDurability).o5b = function () {
+    var tmp0 = this.i5b_1;
     // Inline function 'kotlin.math.min' call
-    var b = this.s5a_1 * this.x5a_1 / 1000.0 / this.y5a_1;
+    var b = this.h5b_1 * this.m5b_1 / 1000.0 / this.n5b_1;
     return Math.min(tmp0, b);
   };
-  protoOf(PowerProviderDurability).u58 = function (course, path, pointIndex) {
-    this.y5a_1 = course.e4z().i4z_1;
-    if (pointIndex < this.u5a_1) {
-      this.j5a();
+  protoOf(PowerProviderDurability).j59 = function (course, path, pointIndex) {
+    this.n5b_1 = course.e4z().i4z_1;
+    if (pointIndex < this.j5b_1) {
+      this.y5a();
     }
-    if (pointIndex > this.u5a_1) {
+    if (pointIndex > this.j5b_1) {
       var elapsedS = path.x2c(pointIndex);
-      var dtS = elapsedS - this.v5a_1;
+      var dtS = elapsedS - this.k5b_1;
       if (dtS > 0.0 && isFinite(dtS)) {
         var tmp = this;
-        var tmp_0 = this.x5a_1;
+        var tmp_0 = this.m5b_1;
         // Inline function 'kotlin.math.max' call
-        var b = this.w5a_1 - this.r5a_1;
-        tmp.x5a_1 = tmp_0 + Math.max(0.0, b) * dtS;
+        var b = this.l5b_1 - this.g5b_1;
+        tmp.m5b_1 = tmp_0 + Math.max(0.0, b) * dtS;
       }
       if (isFinite(elapsedS))
-        this.v5a_1 = elapsedS;
-      this.u5a_1 = pointIndex;
+        this.k5b_1 = elapsedS;
+      this.j5b_1 = pointIndex;
     }
-    var faded = this.q5a_1 * (1.0 - this.z5a());
-    this.w5a_1 = faded;
+    var faded = this.f5b_1 * (1.0 - this.o5b());
+    this.l5b_1 = faded;
     return faded;
   };
-  protoOf(PowerProviderDurability).j5a = function () {
-    this.u5a_1 = -1;
-    this.v5a_1 = 0.0;
-    this.w5a_1 = 0.0;
-    this.x5a_1 = 0.0;
+  protoOf(PowerProviderDurability).y5a = function () {
+    this.j5b_1 = -1;
+    this.k5b_1 = 0.0;
+    this.l5b_1 = 0.0;
+    this.m5b_1 = 0.0;
   };
   function PowerProviderFromData() {
   }
-  protoOf(PowerProviderFromData).l58 = function (course, path, pointIndex) {
+  protoOf(PowerProviderFromData).a59 = function (course, path, pointIndex) {
     return path.u23(pointIndex);
   };
   var PowerProviderFromData_instance;
@@ -3172,71 +3245,71 @@
   }
   function PowerProviderSlewLimited(delegate, maxSlewWPerS) {
     maxSlewWPerS = maxSlewWPerS === VOID ? 50.0 : maxSlewWPerS;
-    this.a5b_1 = delegate;
-    this.b5b_1 = maxSlewWPerS;
+    this.p5b_1 = delegate;
+    this.q5b_1 = maxSlewWPerS;
     // Inline function 'kotlin.require' call
-    if (!(this.b5b_1 > 0.0)) {
-      var message = 'maxSlewWPerS must be > 0, got ' + this.b5b_1;
+    if (!(this.q5b_1 > 0.0)) {
+      var message = 'maxSlewWPerS must be > 0, got ' + this.q5b_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    this.c5b_1 = -1;
-    this.d5b_1 = 0.0;
-    this.e5b_1 = 0.0;
-    this.f5b_1 = 0.0;
+    this.r5b_1 = -1;
+    this.s5b_1 = 0.0;
+    this.t5b_1 = 0.0;
+    this.u5b_1 = 0.0;
   }
-  protoOf(PowerProviderSlewLimited).l58 = function (course, path, pointIndex) {
-    var target = this.a5b_1.l58(course, path, pointIndex);
-    if (pointIndex < this.c5b_1) {
-      this.j5a();
+  protoOf(PowerProviderSlewLimited).a59 = function (course, path, pointIndex) {
+    var target = this.p5b_1.a59(course, path, pointIndex);
+    if (pointIndex < this.r5b_1) {
+      this.y5a();
     }
-    if (pointIndex === this.c5b_1) {
-      this.a5b_1.p58(pointIndex, this.f5b_1);
-      return this.f5b_1;
+    if (pointIndex === this.r5b_1) {
+      this.p5b_1.e59(pointIndex, this.u5b_1);
+      return this.u5b_1;
     }
     var elapsedS = path.x2c(pointIndex);
-    var dtS = elapsedS - this.d5b_1;
+    var dtS = elapsedS - this.s5b_1;
     var tmp;
     if (dtS > 0.0 && isFinite(dtS)) {
-      var budget = this.b5b_1 * dtS;
-      var delta = target - this.e5b_1;
+      var budget = this.q5b_1 * dtS;
+      var delta = target - this.t5b_1;
       var tmp_0;
       // Inline function 'kotlin.math.abs' call
       if (Math.abs(delta) <= budget) {
         tmp_0 = target;
       } else {
-        tmp_0 = this.e5b_1 + (delta > 0 ? budget : -budget);
+        tmp_0 = this.t5b_1 + (delta > 0 ? budget : -budget);
       }
       tmp = tmp_0;
     } else {
-      tmp = this.e5b_1;
+      tmp = this.t5b_1;
     }
     var limited = tmp;
     if (isFinite(elapsedS))
-      this.d5b_1 = elapsedS;
-    this.c5b_1 = pointIndex;
-    this.e5b_1 = limited;
-    this.f5b_1 = limited;
-    this.a5b_1.p58(pointIndex, limited);
+      this.s5b_1 = elapsedS;
+    this.r5b_1 = pointIndex;
+    this.t5b_1 = limited;
+    this.u5b_1 = limited;
+    this.p5b_1.e59(pointIndex, limited);
     return limited;
   };
-  protoOf(PowerProviderSlewLimited).p58 = function (pointIndex, powerW) {
-    if (pointIndex === this.c5b_1 && isFinite(powerW))
-      this.e5b_1 = powerW;
-    this.a5b_1.p58(pointIndex, powerW);
+  protoOf(PowerProviderSlewLimited).e59 = function (pointIndex, powerW) {
+    if (pointIndex === this.r5b_1 && isFinite(powerW))
+      this.t5b_1 = powerW;
+    this.p5b_1.e59(pointIndex, powerW);
   };
-  protoOf(PowerProviderSlewLimited).j5a = function () {
-    this.c5b_1 = -1;
-    this.d5b_1 = 0.0;
-    this.e5b_1 = 0.0;
-    this.f5b_1 = 0.0;
+  protoOf(PowerProviderSlewLimited).y5a = function () {
+    this.r5b_1 = -1;
+    this.s5b_1 = 0.0;
+    this.t5b_1 = 0.0;
+    this.u5b_1 = 0.0;
   };
   function Companion_11() {
-    this.g5b_1 = 3.0;
-    this.h5b_1 = 0.02;
-    this.i5b_1 = 0.5;
-    this.j5b_1 = 1.3;
-    this.k5b_1 = 300.0;
-    this.l5b_1 = 600.0;
+    this.v5b_1 = 3.0;
+    this.w5b_1 = 0.02;
+    this.x5b_1 = 0.5;
+    this.y5b_1 = 1.3;
+    this.z5b_1 = 300.0;
+    this.a5c_1 = 600.0;
   }
   var Companion_instance_14;
   function Companion_getInstance_18() {
@@ -3249,88 +3322,88 @@
     maxMultiplier = maxMultiplier === VOID ? 1.3 : maxMultiplier;
     rampDistanceM = rampDistanceM === VOID ? 300.0 : rampDistanceM;
     energyBudgetSeconds = energyBudgetSeconds === VOID ? 600.0 : energyBudgetSeconds;
-    this.m5b_1 = delegate;
-    this.n5b_1 = gradientGain;
-    this.o5b_1 = headwindGainPerMS;
-    this.p5b_1 = minMultiplier;
-    this.q5b_1 = maxMultiplier;
-    this.r5b_1 = rampDistanceM;
-    this.s5b_1 = energyBudgetSeconds;
+    this.b5c_1 = delegate;
+    this.c5c_1 = gradientGain;
+    this.d5c_1 = headwindGainPerMS;
+    this.e5c_1 = minMultiplier;
+    this.f5c_1 = maxMultiplier;
+    this.g5c_1 = rampDistanceM;
+    this.h5c_1 = energyBudgetSeconds;
     // Inline function 'kotlin.require' call
-    if (!(this.n5b_1 >= 0.0)) {
-      var message = 'gradientGain must be >= 0, got ' + this.n5b_1;
+    if (!(this.c5c_1 >= 0.0)) {
+      var message = 'gradientGain must be >= 0, got ' + this.c5c_1;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.o5b_1 >= 0.0)) {
-      var message_0 = 'headwindGainPerMS must be >= 0, got ' + this.o5b_1;
+    if (!(this.d5c_1 >= 0.0)) {
+      var message_0 = 'headwindGainPerMS must be >= 0, got ' + this.d5c_1;
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.p5b_1 > 0.0)) {
-      var message_1 = 'minMultiplier must be > 0, got ' + this.p5b_1;
+    if (!(this.e5c_1 > 0.0)) {
+      var message_1 = 'minMultiplier must be > 0, got ' + this.e5c_1;
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.q5b_1 >= this.p5b_1)) {
-      var message_2 = 'maxMultiplier (' + this.q5b_1 + ') must be >= minMultiplier (' + this.p5b_1 + ')';
+    if (!(this.f5c_1 >= this.e5c_1)) {
+      var message_2 = 'maxMultiplier (' + this.f5c_1 + ') must be >= minMultiplier (' + this.e5c_1 + ')';
       throw IllegalArgumentException_init_$Create$(toString(message_2));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.r5b_1 > 0.0)) {
-      var message_3 = 'rampDistanceM must be > 0, got ' + this.r5b_1;
+    if (!(this.g5c_1 > 0.0)) {
+      var message_3 = 'rampDistanceM must be > 0, got ' + this.g5c_1;
       throw IllegalArgumentException_init_$Create$(toString(message_3));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.s5b_1 > 0.0)) {
-      var message_4 = 'energyBudgetSeconds must be > 0, got ' + this.s5b_1;
+    if (!(this.h5c_1 > 0.0)) {
+      var message_4 = 'energyBudgetSeconds must be > 0, got ' + this.h5c_1;
       throw IllegalArgumentException_init_$Create$(toString(message_4));
     }
-    this.t5b_1 = -1;
-    this.u5b_1 = 0.0;
-    this.v5b_1 = 0.0;
-    this.w5b_1 = 0.0;
-    this.x5b_1 = 0.0;
-    this.y5b_1 = 1.0;
-    this.z5b_1 = 0.0;
-  }
-  protoOf(PowerProviderTerrainPacing).l58 = function (course, path, pointIndex) {
-    var target = this.m5b_1.l58(course, path, pointIndex);
-    if (pointIndex < this.t5b_1) {
-      this.j5a();
-    }
-    if (pointIndex > this.t5b_1) {
+    this.i5c_1 = -1;
+    this.j5c_1 = 0.0;
+    this.k5c_1 = 0.0;
+    this.l5c_1 = 0.0;
+    this.m5c_1 = 0.0;
+    this.n5c_1 = 1.0;
+    this.o5c_1 = 0.0;
+  }
+  protoOf(PowerProviderTerrainPacing).a59 = function (course, path, pointIndex) {
+    var target = this.b5c_1.a59(course, path, pointIndex);
+    if (pointIndex < this.i5c_1) {
+      this.y5a();
+    }
+    if (pointIndex > this.i5c_1) {
       var distanceM = path.p2b(pointIndex);
-      var dx = distanceM - this.u5b_1;
-      this.y5b_1 = this.b5c(this.y5b_1, this.a5c(path, pointIndex), dx);
+      var dx = distanceM - this.j5c_1;
+      this.n5c_1 = this.q5c(this.n5c_1, this.p5c(path, pointIndex), dx);
       if (isFinite(distanceM))
-        this.u5b_1 = distanceM;
+        this.j5c_1 = distanceM;
       var elapsedS = path.x2c(pointIndex);
-      var dtS = elapsedS - this.v5b_1;
+      var dtS = elapsedS - this.k5c_1;
       if (dtS > 0.0 && isFinite(dtS)) {
-        this.z5b_1 = this.z5b_1 + (this.w5b_1 - this.x5b_1) * dtS;
+        this.o5c_1 = this.o5c_1 + (this.l5c_1 - this.m5c_1) * dtS;
       }
       if (isFinite(elapsedS))
-        this.v5b_1 = elapsedS;
-      this.t5b_1 = pointIndex;
+        this.k5c_1 = elapsedS;
+      this.i5c_1 = pointIndex;
     }
-    var ratio = coerceIn(this.y5b_1 * this.c5c(target), this.p5b_1, this.q5b_1);
+    var ratio = coerceIn(this.n5c_1 * this.r5c(target), this.e5c_1, this.f5c_1);
     var delivered = target * ratio;
-    this.x5b_1 = target;
-    this.w5b_1 = delivered;
-    this.m5b_1.p58(pointIndex, delivered);
+    this.m5c_1 = target;
+    this.l5c_1 = delivered;
+    this.b5c_1.e59(pointIndex, delivered);
     return delivered;
   };
-  protoOf(PowerProviderTerrainPacing).p58 = function (pointIndex, powerW) {
-    return this.m5b_1.p58(pointIndex, powerW);
+  protoOf(PowerProviderTerrainPacing).e59 = function (pointIndex, powerW) {
+    return this.b5c_1.e59(pointIndex, powerW);
   };
-  protoOf(PowerProviderTerrainPacing).c5c = function (target) {
+  protoOf(PowerProviderTerrainPacing).r5c = function (target) {
     if (target <= 0.0)
       return 1.0;
-    var budgetJ = target * this.s5b_1;
-    return coerceIn(1.0 - this.z5b_1 / budgetJ, this.p5b_1, this.q5b_1);
+    var budgetJ = target * this.h5c_1;
+    return coerceIn(1.0 - this.o5c_1 / budgetJ, this.e5c_1, this.f5c_1);
   };
-  protoOf(PowerProviderTerrainPacing).a5c = function (path, pointIndex) {
+  protoOf(PowerProviderTerrainPacing).p5c = function (path, pointIndex) {
     // Inline function 'kotlin.let' call
     var it = path.d2d(pointIndex);
     var grade = isFinite(it) ? it : 0.0;
@@ -3342,31 +3415,31 @@
     var alpha = isFinite(it_1) ? it_1 : 0.0;
     // Inline function 'kotlin.math.cos' call
     var headwind = windSpeed * Math.cos(alpha);
-    var raw = 1.0 + this.n5b_1 * grade + this.o5b_1 * headwind;
-    return coerceIn(raw, this.p5b_1, this.q5b_1);
+    var raw = 1.0 + this.c5c_1 * grade + this.d5c_1 * headwind;
+    return coerceIn(raw, this.e5c_1, this.f5c_1);
   };
-  protoOf(PowerProviderTerrainPacing).b5c = function (current, raw, dx) {
+  protoOf(PowerProviderTerrainPacing).q5c = function (current, raw, dx) {
     if (raw <= current)
       return raw;
     if (!isFinite(dx) || dx <= 0.0)
       return current;
     // Inline function 'kotlin.math.exp' call
-    var x = -dx / this.r5b_1;
+    var x = -dx / this.g5c_1;
     var blend = 1.0 - Math.exp(x);
     return current + (raw - current) * blend;
   };
-  protoOf(PowerProviderTerrainPacing).j5a = function () {
-    this.t5b_1 = -1;
-    this.u5b_1 = 0.0;
-    this.v5b_1 = 0.0;
-    this.w5b_1 = 0.0;
-    this.x5b_1 = 0.0;
-    this.y5b_1 = 1.0;
-    this.z5b_1 = 0.0;
+  protoOf(PowerProviderTerrainPacing).y5a = function () {
+    this.i5c_1 = -1;
+    this.j5c_1 = 0.0;
+    this.k5c_1 = 0.0;
+    this.l5c_1 = 0.0;
+    this.m5c_1 = 0.0;
+    this.n5c_1 = 1.0;
+    this.o5c_1 = 0.0;
   };
   function RhoProviderDefault() {
   }
-  protoOf(RhoProviderDefault).o58 = function (course, path, pointIndex) {
+  protoOf(RhoProviderDefault).d59 = function (course, path, pointIndex) {
     return 1.225;
   };
   var RhoProviderDefault_instance;
@@ -3374,13 +3447,13 @@
     return RhoProviderDefault_instance;
   }
   function RhoProviderEstimate() {
-    this.d5c_1 = 101325.0;
-    this.e5c_1 = 288.15;
-    this.f5c_1 = 9.80665;
-    this.g5c_1 = 0.0065;
-    this.h5c_1 = 287.05;
+    this.s5c_1 = 101325.0;
+    this.t5c_1 = 288.15;
+    this.u5c_1 = 9.80665;
+    this.v5c_1 = 0.0065;
+    this.w5c_1 = 287.05;
   }
-  protoOf(RhoProviderEstimate).o58 = function (course, path, pointIndex) {
+  protoOf(RhoProviderEstimate).d59 = function (course, path, pointIndex) {
     var providedTemp = path.o26(pointIndex, PointField_TEMPERATURE_getInstance());
     var temperatureC = isNaN_0(providedTemp) ? 15.0 : providedTemp;
     var providedElevation = path.q23(pointIndex);
@@ -3398,7 +3471,7 @@
   }
   function RollingResistancePowerProvider() {
   }
-  protoOf(RollingResistancePowerProvider).l58 = function (course, path, pointIndex) {
+  protoOf(RollingResistancePowerProvider).a59 = function (course, path, pointIndex) {
     var m = course.e4z().i4z_1;
     var crr = course.f4z().k4y_1;
     var grade = path.d2d(pointIndex);
@@ -3424,7 +3497,7 @@
   }
   function VirtualizeService() {
   }
-  protoOf(VirtualizeService).i54 = function (course) {
+  protoOf(VirtualizeService).x54 = function (course) {
     var input = course.d4z();
     var n = input.l23_1;
     if (n === 0)
@@ -3435,7 +3508,7 @@
       singleton.f25();
       return singleton;
     }
-    var mEq = PowerComputer_instance.t59(course);
+    var mEq = PowerComputer_instance.i5a(course);
     var out = new Path(n);
     copyAllFields(this, input, 0, out, 0);
     var speed = 0.5555555555555556;
@@ -3459,8 +3532,8 @@
         i = i + 1 | 0;
         continue $l$loop;
       }
-      var pSum = PowerComputer_instance.z58(course, out, i - 1 | 0, true);
-      var dt = PowerComputer_instance.q59(pSum, mEq, speed, dx);
+      var pSum = PowerComputer_instance.o59(course, out, i - 1 | 0, true);
+      var dt = PowerComputer_instance.f5a(pSum, mEq, speed, dx);
       var speedNew = 2.0 * dx / dt - speed;
       copyAllFields(this, input, i, out, i);
       var speedMax = input.z2d(i);
@@ -3485,7 +3558,7 @@
       do {
         var j = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        PowerComputer_instance.r59(course, out, mEq, j);
+        PowerComputer_instance.g5a(course, out, mEq, j);
       }
        while (!(j === last));
     out.f25();
@@ -3497,7 +3570,7 @@
   }
   function WheelBearingsPowerProvider() {
   }
-  protoOf(WheelBearingsPowerProvider).l58 = function (course, path, pointIndex) {
+  protoOf(WheelBearingsPowerProvider).a59 = function (course, path, pointIndex) {
     var speed = path.x2d(pointIndex);
     var p = -speed * (91.0 + 8.7 * speed) / 1000.0;
     path.o2d(pointIndex, p);
@@ -3509,7 +3582,7 @@
   }
   function Companion_12() {
     Companion_instance_15 = this;
-    this.i5c_1 = new Wind(0.0, 0.0);
+    this.x5c_1 = new Wind(0.0, 0.0);
   }
   var Companion_instance_15;
   function Companion_getInstance_19() {
@@ -3519,15 +3592,15 @@
   }
   function Wind(speedMS, directionRad) {
     Companion_getInstance_19();
-    this.i58_1 = speedMS;
-    this.j58_1 = directionRad;
+    this.x58_1 = speedMS;
+    this.y58_1 = directionRad;
   }
   protoOf(Wind).toString = function () {
-    return 'Wind(speedMS=' + this.i58_1 + ', directionRad=' + this.j58_1 + ')';
+    return 'Wind(speedMS=' + this.x58_1 + ', directionRad=' + this.y58_1 + ')';
   };
   protoOf(Wind).hashCode = function () {
-    var result = getNumberHashCode(this.i58_1);
-    result = imul(result, 31) + getNumberHashCode(this.j58_1) | 0;
+    var result = getNumberHashCode(this.x58_1);
+    result = imul(result, 31) + getNumberHashCode(this.y58_1) | 0;
     return result;
   };
   protoOf(Wind).equals = function (other) {
@@ -3535,34 +3608,34 @@
       return true;
     if (!(other instanceof Wind))
       return false;
-    if (!equals(this.i58_1, other.i58_1))
+    if (!equals(this.x58_1, other.x58_1))
       return false;
-    if (!equals(this.j58_1, other.j58_1))
+    if (!equals(this.y58_1, other.y58_1))
       return false;
     return true;
   };
   function WindProviderNone() {
   }
-  protoOf(WindProviderNone).n58 = function (course, path, pointIndex) {
-    return Companion_getInstance_19().i5c_1;
+  protoOf(WindProviderNone).c59 = function (course, path, pointIndex) {
+    return Companion_getInstance_19().x5c_1;
   };
   var WindProviderNone_instance;
   function WindProviderNone_getInstance() {
     return WindProviderNone_instance;
   }
   function WindProviderConstant(wind) {
-    this.j5c_1 = wind;
+    this.y5c_1 = wind;
   }
-  protoOf(WindProviderConstant).n58 = function (course, path, pointIndex) {
-    return this.j5c_1;
+  protoOf(WindProviderConstant).c59 = function (course, path, pointIndex) {
+    return this.y5c_1;
   };
   function WPrimeBalanceComputer() {
   }
-  protoOf(WPrimeBalanceComputer).j54 = function (path, options) {
+  protoOf(WPrimeBalanceComputer).y54 = function (path, options) {
     if (path.l23_1 === 0)
       return Unit_instance;
-    var cp = options.x50_1;
-    var wPrime = options.y50_1;
+    var cp = options.j52_1;
+    var wPrime = options.k52_1;
     var balance = wPrime;
     path.g2e(0, balance);
     var inductionVariable = 1;
@@ -3574,13 +3647,13 @@
         var dtSeconds = (path.n23(i) - path.n23(i - 1 | 0)) / 1000.0;
         var power = path.v23(i);
         if (isFinite(dtSeconds) && dtSeconds > 0.0 && isFinite(power)) {
-          balance = this.k5a(balance, power, cp, wPrime, dtSeconds);
+          balance = this.z5a(balance, power, cp, wPrime, dtSeconds);
         }
         path.g2e(i, balance);
       }
        while (inductionVariable < last);
   };
-  protoOf(WPrimeBalanceComputer).k5a = function (balance, power, cp, wPrime, dtSeconds) {
+  protoOf(WPrimeBalanceComputer).z5a = function (balance, power, cp, wPrime, dtSeconds) {
     var tmp;
     if (power >= cp) {
       tmp = balance - (power - cp) * dtSeconds;
@@ -3602,7 +3675,7 @@
   }
   function BandedLdl() {
   }
-  protoOf(BandedLdl).k5c = function (a0, a1, a2) {
+  protoOf(BandedLdl).z5c = function (a0, a1, a2) {
     var n = a0.length;
     if (n === 0)
       return true;
@@ -3658,7 +3731,7 @@
        while (inductionVariable_0 < n);
     return true;
   };
-  protoOf(BandedLdl).l5c = function (d, l1, l2, b) {
+  protoOf(BandedLdl).a5d = function (d, l1, l2, b) {
     var n = d.length;
     if (n === 0)
       return Unit_instance;
@@ -3697,7 +3770,7 @@
       }
        while (0 <= inductionVariable_1);
   };
-  protoOf(BandedLdl).m5c = function (a0, a1, a2, x, y) {
+  protoOf(BandedLdl).b5d = function (a0, a1, a2, x, y) {
     var n = a0.length;
     var inductionVariable = 0;
     if (inductionVariable < n)
@@ -3722,29 +3795,29 @@
     return BandedLdl_instance;
   }
   function CornerSpan(fromIndex, untilIndex, apexIndex, kind, turnRad, direction, radiusQ20M, radiusMinM, lengthM) {
-    this.n5c_1 = fromIndex;
-    this.o5c_1 = untilIndex;
-    this.p5c_1 = apexIndex;
-    this.q5c_1 = kind;
-    this.r5c_1 = turnRad;
-    this.s5c_1 = direction;
-    this.t5c_1 = radiusQ20M;
-    this.u5c_1 = radiusMinM;
-    this.v5c_1 = lengthM;
+    this.c5d_1 = fromIndex;
+    this.d5d_1 = untilIndex;
+    this.e5d_1 = apexIndex;
+    this.f5d_1 = kind;
+    this.g5d_1 = turnRad;
+    this.h5d_1 = direction;
+    this.i5d_1 = radiusQ20M;
+    this.j5d_1 = radiusMinM;
+    this.k5d_1 = lengthM;
   }
   protoOf(CornerSpan).toString = function () {
-    return 'CornerSpan(fromIndex=' + this.n5c_1 + ', untilIndex=' + this.o5c_1 + ', apexIndex=' + this.p5c_1 + ', kind=' + this.q5c_1.toString() + ', turnRad=' + this.r5c_1 + ', direction=' + this.s5c_1 + ', radiusQ20M=' + this.t5c_1 + ', radiusMinM=' + this.u5c_1 + ', lengthM=' + this.v5c_1 + ')';
+    return 'CornerSpan(fromIndex=' + this.c5d_1 + ', untilIndex=' + this.d5d_1 + ', apexIndex=' + this.e5d_1 + ', kind=' + this.f5d_1.toString() + ', turnRad=' + this.g5d_1 + ', direction=' + this.h5d_1 + ', radiusQ20M=' + this.i5d_1 + ', radiusMinM=' + this.j5d_1 + ', lengthM=' + this.k5d_1 + ')';
   };
   protoOf(CornerSpan).hashCode = function () {
-    var result = this.n5c_1;
-    result = imul(result, 31) + this.o5c_1 | 0;
-    result = imul(result, 31) + this.p5c_1 | 0;
-    result = imul(result, 31) + this.q5c_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r5c_1) | 0;
-    result = imul(result, 31) + this.s5c_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.t5c_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u5c_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v5c_1) | 0;
+    var result = this.c5d_1;
+    result = imul(result, 31) + this.d5d_1 | 0;
+    result = imul(result, 31) + this.e5d_1 | 0;
+    result = imul(result, 31) + this.f5d_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.g5d_1) | 0;
+    result = imul(result, 31) + this.h5d_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i5d_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j5d_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k5d_1) | 0;
     return result;
   };
   protoOf(CornerSpan).equals = function (other) {
@@ -3752,23 +3825,23 @@
       return true;
     if (!(other instanceof CornerSpan))
       return false;
-    if (!(this.n5c_1 === other.n5c_1))
+    if (!(this.c5d_1 === other.c5d_1))
       return false;
-    if (!(this.o5c_1 === other.o5c_1))
+    if (!(this.d5d_1 === other.d5d_1))
       return false;
-    if (!(this.p5c_1 === other.p5c_1))
+    if (!(this.e5d_1 === other.e5d_1))
       return false;
-    if (!this.q5c_1.equals(other.q5c_1))
+    if (!this.f5d_1.equals(other.f5d_1))
       return false;
-    if (!equals(this.r5c_1, other.r5c_1))
+    if (!equals(this.g5d_1, other.g5d_1))
       return false;
-    if (!(this.s5c_1 === other.s5c_1))
+    if (!(this.h5d_1 === other.h5d_1))
       return false;
-    if (!equals(this.t5c_1, other.t5c_1))
+    if (!equals(this.i5d_1, other.i5d_1))
       return false;
-    if (!equals(this.u5c_1, other.u5c_1))
+    if (!equals(this.j5d_1, other.j5d_1))
       return false;
-    if (!equals(this.v5c_1, other.v5c_1))
+    if (!equals(this.k5d_1, other.k5d_1))
       return false;
     return true;
   };
@@ -3780,7 +3853,7 @@
     var tmp_0 = new Float64Array(count);
     while (tmp < count) {
       var tmp_1 = tmp;
-      tmp_0[tmp_1] = CurvatureEstimator_instance.z5c(kappa[from + tmp_1 | 0]);
+      tmp_0[tmp_1] = CurvatureEstimator_instance.o5d(kappa[from + tmp_1 | 0]);
       tmp = tmp + 1 | 0;
     }
     var radii = tmp_0;
@@ -3790,13 +3863,13 @@
   }
   function CornerDetector() {
   }
-  protoOf(CornerDetector).a5d = function (frame, options, widthM) {
+  protoOf(CornerDetector).p5d = function (frame, options, widthM) {
     var n = frame.o();
     if (n < 3)
       return emptyList();
-    var enter = 1.0 / options.b53_1;
-    var exit = 1.0 / options.c53_1;
-    var kappa = frame.f5d_1;
+    var enter = 1.0 / options.q53_1;
+    var exit = 1.0 / options.r53_1;
+    var kappa = frame.u5d_1;
     // Inline function 'kotlin.collections.mutableListOf' call
     var raw = ArrayList_init_$Create$_0();
     var start = -1;
@@ -3852,12 +3925,12 @@
         // Inline function 'kotlin.comparisons.minOf' call
         var b = n - 1 | 0;
         var tmp$ret$5 = Math.min(tmp0, b);
-        var tmp_0 = frame.d5d_1[tmp$ret$5];
+        var tmp_0 = frame.s5d_1[tmp$ret$5];
         var tmp0_0 = last[1];
         // Inline function 'kotlin.comparisons.minOf' call
         var b_0 = n - 1 | 0;
         var tmp$ret$6 = Math.min(tmp0_0, b_0);
-        var gap = tmp_0 - frame.d5d_1[tmp$ret$6];
+        var gap = tmp_0 - frame.s5d_1[tmp$ret$6];
         var tmp0_1 = span[0];
         // Inline function 'kotlin.comparisons.minOf' call
         var b_1 = widthM.length - 1 | 0;
@@ -3871,8 +3944,8 @@
       }
       merged.k(span);
     }
-    var minTurn = options.e53_1 * 3.141592653589793 / 180.0;
-    var hairpinTurn = options.f53_1 * 3.141592653589793 / 180.0;
+    var minTurn = options.t53_1 * 3.141592653589793 / 180.0;
+    var hairpinTurn = options.u53_1 * 3.141592653589793 / 180.0;
     // Inline function 'kotlin.collections.mutableListOf' call
     var out = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = merged.l();
@@ -3884,10 +3957,10 @@
       var until = Math.min(a_0, n);
       if ((until - from | 0) < 2)
         continue $l$loop_2;
-      var lengthM = frame.d5d_1[until - 1 | 0] - frame.d5d_1[from];
-      if (lengthM < options.d53_1)
+      var lengthM = frame.s5d_1[until - 1 | 0] - frame.s5d_1[from];
+      if (lengthM < options.s53_1)
         continue $l$loop_2;
-      var turn = frame.e5d_1[until - 1 | 0] - frame.e5d_1[from];
+      var turn = frame.t5d_1[until - 1 | 0] - frame.t5d_1[from];
       // Inline function 'kotlin.math.abs' call
       if (Math.abs(turn) < minTurn)
         continue $l$loop_2;
@@ -3906,7 +3979,7 @@
             peak = a_1;
             apex = i_0;
           }
-          var r = CurvatureEstimator_instance.z5c(kappa[i_0]);
+          var r = CurvatureEstimator_instance.o5d(kappa[i_0]);
           if (r < minRadius)
             minRadius = r;
         }
@@ -3917,7 +3990,7 @@
       if (Math.abs(turn) >= hairpinTurn) {
         tmp_1 = CornerKind_HAIRPIN_getInstance();
       } else {
-        if (q20 >= options.g53_1) {
+        if (q20 >= options.v53_1) {
           tmp_1 = CornerKind_GENTLE_getInstance();
         } else {
           tmp_1 = CornerKind_CORNER_getInstance();
@@ -3933,9 +4006,9 @@
     return CornerDetector_instance;
   }
   function CorridorBounds(lo, hi, halfWidthM) {
-    this.j5d_1 = lo;
-    this.k5d_1 = hi;
-    this.l5d_1 = halfWidthM;
+    this.y5d_1 = lo;
+    this.z5d_1 = hi;
+    this.a5e_1 = halfWidthM;
   }
   function applyRegularityClamp($this, frame, options, lo, hi) {
     var inductionVariable = 0;
@@ -3945,11 +4018,11 @@
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.math.abs' call
-        var x = frame.f5d_1[i];
+        var x = frame.u5d_1[i];
         // Inline function 'kotlin.math.max' call
         var a = Math.abs(x);
         var tmp$ret$1 = Math.max(a, 1.0E-9);
-        var limit = options.h53_1 / tmp$ret$1;
+        var limit = options.w53_1 / tmp$ret$1;
         var tmp0 = lo[i];
         // Inline function 'kotlin.math.max' call
         var b = -limit;
@@ -3969,7 +4042,7 @@
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.collections.getOrPut' call
-        var key = cellKey($this, bucketOf($this, frame.b5d_1[i]), bucketOf($this, frame.c5d_1[i]));
+        var key = cellKey($this, bucketOf($this, frame.q5d_1[i]), bucketOf($this, frame.r5d_1[i]));
         var value = buckets.q1(key);
         var tmp;
         if (value == null) {
@@ -3988,8 +4061,8 @@
       $l$loop_1: do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        var bx = bucketOf($this, frame.b5d_1[i_0]);
-        var by = bucketOf($this, frame.c5d_1[i_0]);
+        var bx = bucketOf($this, frame.q5d_1[i_0]);
+        var by = bucketOf($this, frame.r5d_1[i_0]);
         var nearest = 1.7976931348623157E308;
         var inductionVariable_1 = -1;
         if (inductionVariable_1 <= 1)
@@ -4017,17 +4090,17 @@
                 $l$loop_0: while (_iterator__ex2g4s.m()) {
                   var j = _iterator__ex2g4s.n();
                   // Inline function 'kotlin.math.abs' call
-                  var x = frame.d5d_1[j] - frame.d5d_1[i_0];
+                  var x = frame.s5d_1[j] - frame.s5d_1[i_0];
                   var alongPath = Math.abs(x);
-                  var ddx = frame.b5d_1[j] - frame.b5d_1[i_0];
-                  var ddy = frame.c5d_1[j] - frame.c5d_1[i_0];
+                  var ddx = frame.q5d_1[j] - frame.q5d_1[i_0];
+                  var ddy = frame.r5d_1[j] - frame.r5d_1[i_0];
                   // Inline function 'kotlin.math.sqrt' call
                   var x_0 = ddx * ddx + ddy * ddy;
                   var d = Math.sqrt(x_0);
                   // Inline function 'kotlin.math.abs' call
-                  var x_1 = LocalFrame_instance.n57(frame.e5d_1[j] - frame.e5d_1[i_0]);
+                  var x_1 = LocalFrame_instance.c58(frame.t5d_1[j] - frame.t5d_1[i_0]);
                   var headingGap = Math.abs(x_1);
-                  var sameRoad = alongPath <= options.i53_1 && headingGap < 1.5707963267948966;
+                  var sameRoad = alongPath <= options.x53_1 && headingGap < 1.5707963267948966;
                   if (sameRoad)
                     continue $l$loop_0;
                   if (d < nearest)
@@ -4075,7 +4148,7 @@
         hi[i] = 0.0;
       }
     }
-    var straightKappa = 1.0 / options.k53_1;
+    var straightKappa = 1.0 / options.z53_1;
     var runStart = -1;
     var inductionVariable_0 = 0;
     if (inductionVariable_0 < n)
@@ -4083,7 +4156,7 @@
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
         // Inline function 'kotlin.math.abs' call
-        var x = frame.f5d_1[i_0];
+        var x = frame.u5d_1[i_0];
         var straight = Math.abs(x) < straightKappa;
         if (straight) {
           if (runStart < 0)
@@ -4099,7 +4172,7 @@
   function pinRunMidpoint($this, frame, options, from, until, lo, hi) {
     if (from < 0 || (until - from | 0) < 2)
       return Unit_instance;
-    if (frame.d5d_1[until - 1 | 0] - frame.d5d_1[from] < options.j53_1)
+    if (frame.s5d_1[until - 1 | 0] - frame.s5d_1[from] < options.y53_1)
       return Unit_instance;
     var mid = (from + until | 0) / 2 | 0;
     // Inline function 'kotlin.intArrayOf' call
@@ -4116,12 +4189,12 @@
     }
   }
   function Corridor() {
-    this.m5d_1 = 6.0;
-    this.n5d_1 = 12.0;
-    this.o5d_1 = 0.5;
-    this.p5d_1 = 1.5707963267948966;
+    this.b5e_1 = 6.0;
+    this.c5e_1 = 12.0;
+    this.d5e_1 = 0.5;
+    this.e5e_1 = 1.5707963267948966;
   }
-  protoOf(Corridor).q5d = function (path, frame, options) {
+  protoOf(Corridor).f5e = function (path, frame, options) {
     var raw = new Float64Array(frame.o());
     var inductionVariable = 0;
     var last = raw.length - 1 | 0;
@@ -4130,12 +4203,12 @@
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         var w = path.k2e(i);
-        raw[i] = isNaN_0(w) || w <= 0.0 ? options.y52_1 : w;
+        raw[i] = isNaN_0(w) || w <= 0.0 ? options.n53_1 : w;
       }
        while (inductionVariable <= last);
-    return LocalFrame_instance.r5d(raw, frame.d5d_1, options.l53_1);
+    return LocalFrame_instance.g5e(raw, frame.s5d_1, options.a54_1);
   };
-  protoOf(Corridor).s5d = function (frame, widthM, options) {
+  protoOf(Corridor).h5e = function (frame, widthM, options) {
     var n = frame.o();
     var lo = new Float64Array(n);
     var hi = new Float64Array(n);
@@ -4145,9 +4218,9 @@
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var h = coerceIn(widthM[i] / 2.0 - options.z52_1, 0.0, 6.0);
+        var h = coerceIn(widthM[i] / 2.0 - options.o53_1, 0.0, 6.0);
         half[i] = h;
-        switch (options.a53_1.v1_1) {
+        switch (options.p53_1.v1_1) {
           case 0:
             lo[i] = -h;
             hi[i] = 0.0;
@@ -4208,7 +4281,7 @@
         var fit = tmp;
         var _unary__edvuaz = count;
         count = _unary__edvuaz + 1 | 0;
-        values[_unary__edvuaz] = fit.u5d_1;
+        values[_unary__edvuaz] = fit.j5e_1;
       }
        while (inductionVariable < n);
     if (count === 0)
@@ -4218,13 +4291,13 @@
     return trimmed[count / 2 | 0];
   }
   function Fit(slope, residualSigma) {
-    this.t5d_1 = slope;
-    this.u5d_1 = residualSigma;
+    this.i5e_1 = slope;
+    this.j5e_1 = residualSigma;
   }
   function fitSlope($this, frame, i, halfWidthM) {
     var n = frame.o();
-    var s = frame.d5d_1;
-    var theta = frame.e5d_1;
+    var s = frame.s5d_1;
+    var theta = frame.t5d_1;
     var si = s[i];
     var ti = theta[i];
     var lo = i;
@@ -4280,13 +4353,13 @@
     return !isFinite(slope) || !isFinite(sigma) ? null : new Fit(slope, sigma);
   }
   function CurvatureEstimator() {
-    this.w5c_1 = 2.0;
-    this.x5c_1 = 400;
-    this.y5c_1 = 1.0E-6;
+    this.l5d_1 = 2.0;
+    this.m5d_1 = 400;
+    this.n5d_1 = 1.0E-6;
   }
-  protoOf(CurvatureEstimator).v5d = function (frame) {
+  protoOf(CurvatureEstimator).k5e = function (frame) {
     var n = frame.o();
-    var theta = frame.e5d_1;
+    var theta = frame.t5d_1;
     if (n === 0)
       return Unit_instance;
     var previous = NaN;
@@ -4297,8 +4370,8 @@
         inductionVariable = inductionVariable + 1 | 0;
         var a = i > 0 ? i - 1 | 0 : 0;
         var b = i < (n - 1 | 0) ? i + 1 | 0 : n - 1 | 0;
-        var dx = frame.b5d_1[b] - frame.b5d_1[a];
-        var dy = frame.c5d_1[b] - frame.c5d_1[a];
+        var dx = frame.q5d_1[b] - frame.q5d_1[a];
+        var dy = frame.r5d_1[b] - frame.r5d_1[a];
         if (dx === 0.0 && dy === 0.0) {
           theta[i] = previous;
           continue $l$loop;
@@ -4316,7 +4389,7 @@
             }
              while (inductionVariable_0 < i);
         } else {
-          theta[i] = previous + LocalFrame_instance.n57(raw - previous);
+          theta[i] = previous + LocalFrame_instance.c58(raw - previous);
         }
         previous = theta[i];
       }
@@ -4325,9 +4398,9 @@
       fill(theta, 0.0);
     }
   };
-  protoOf(CurvatureEstimator).w5d = function (frame, windowsM, sigmaThetaRad, curvatureSmoothM) {
+  protoOf(CurvatureEstimator).l5e = function (frame, windowsM, sigmaThetaRad, curvatureSmoothM) {
     var n = frame.o();
-    var kappa = frame.f5d_1;
+    var kappa = frame.u5d_1;
     if (n === 0)
       return Unit_instance;
     // Inline function 'kotlin.collections.isNotEmpty' call
@@ -4355,9 +4428,9 @@
             var w = inductionVariable_0;
             inductionVariable_0 = inductionVariable_0 + 1 | 0;
             var fit = fitSlope(this, frame, i, windowsM[w]);
-            var tmp1_elvis_lhs = fit == null ? null : fit.t5d_1;
+            var tmp1_elvis_lhs = fit == null ? null : fit.i5e_1;
             slopes[w] = tmp1_elvis_lhs == null ? NaN : tmp1_elvis_lhs;
-            var tmp3_elvis_lhs = fit == null ? null : fit.u5d_1;
+            var tmp3_elvis_lhs = fit == null ? null : fit.j5e_1;
             sigmas[w] = tmp3_elvis_lhs == null ? NaN : tmp3_elvis_lhs;
           }
            while (inductionVariable_0 < scales);
@@ -4381,7 +4454,7 @@
         raw[i] = !isNaN_0(chosen) ? chosen : widest;
       }
        while (inductionVariable < n);
-    var smoothed = LocalFrame_instance.r5d(raw, frame.d5d_1, curvatureSmoothM);
+    var smoothed = LocalFrame_instance.g5e(raw, frame.s5d_1, curvatureSmoothM);
     // Inline function 'kotlin.collections.copyInto' call
     var endIndex = smoothed.length;
     // Inline function 'kotlin.js.unsafeCast' call
@@ -4391,7 +4464,7 @@
     // Inline function 'kotlin.js.asDynamic' call
     arrayCopy(tmp, kappa, 0, 0, endIndex);
   };
-  protoOf(CurvatureEstimator).z5c = function (kappa) {
+  protoOf(CurvatureEstimator).o5d = function (kappa) {
     var tmp;
     // Inline function 'kotlin.math.abs' call
     if (Math.abs(kappa) < 1.0E-12) {
@@ -4407,10 +4480,10 @@
     return CurvatureEstimator_instance;
   }
   function LocalFrame() {
-    this.l57_1 = 1.4835298641951802;
-    this.m57_1 = 8;
+    this.a58_1 = 1.4835298641951802;
+    this.b58_1 = 8;
   }
-  protoOf(LocalFrame).x5d = function (path, smoothWindowM) {
+  protoOf(LocalFrame).m5e = function (path, smoothWindowM) {
     var n = path.l23_1;
     if (n < 8)
       return null;
@@ -4439,24 +4512,24 @@
         var dist = path.p2b(i);
         if (!isFinite(lat) || !isFinite(lon) || !isFinite(dist))
           return null;
-        var dLon = this.n57(lon - lon0);
+        var dLon = this.c58(lon - lon0);
         rawX[i] = 6371000.0 * k * dLon;
         rawY[i] = 6371000.0 * (lat - lat0);
         s[i] = dist;
       }
        while (inductionVariable < n);
-    var x = this.r5d(rawX, s, smoothWindowM);
-    var y = this.r5d(rawY, s, smoothWindowM);
-    this.y5d(x, y, s);
+    var x = this.g5e(rawX, s, smoothWindowM);
+    var y = this.g5e(rawY, s, smoothWindowM);
+    this.n5e(x, y, s);
     return new PlanarFrame(x, y, s, new Float64Array(n), new Float64Array(n), lat0, lon0, k);
   };
-  protoOf(LocalFrame).z5d = function (frame, x, y) {
-    var lat = frame.g5d_1 + y / 6371000.0;
-    var lon = this.n57(frame.h5d_1 + x / (6371000.0 * frame.i5d_1));
+  protoOf(LocalFrame).o5e = function (frame, x, y) {
+    var lat = frame.v5d_1 + y / 6371000.0;
+    var lon = this.c58(frame.w5d_1 + x / (6371000.0 * frame.x5d_1));
     // Inline function 'kotlin.doubleArrayOf' call
     return new Float64Array([lat, lon]);
   };
-  protoOf(LocalFrame).y5d = function (x, y, s) {
+  protoOf(LocalFrame).n5e = function (x, y, s) {
     s[0] = 0.0;
     var inductionVariable = 1;
     var last = x.length;
@@ -4473,11 +4546,11 @@
       }
        while (inductionVariable < last);
   };
-  protoOf(LocalFrame).n57 = function (a) {
+  protoOf(LocalFrame).c58 = function (a) {
     var r = a - 2.0 * 3.141592653589793 * round(a / (2.0 * 3.141592653589793));
     return r <= -3.141592653589793 ? r + 2.0 * 3.141592653589793 : r;
   };
-  protoOf(LocalFrame).r5d = function (v, s, windowM) {
+  protoOf(LocalFrame).g5e = function (v, s, windowM) {
     var n = v.length;
     if (windowM <= 0.0 || n < 3) {
       // Inline function 'kotlin.collections.copyOf' call
@@ -4529,7 +4602,7 @@
   }
   function Companion_13() {
   }
-  protoOf(Companion_13).a5e = function (frame, center, rho, steeringLengthM, centeringLengthM, fixed) {
+  protoOf(Companion_13).p5e = function (frame, center, rho, steeringLengthM, centeringLengthM, fixed) {
     var n = frame.o();
     var h0 = new Float64Array(n);
     var h1 = new Float64Array(n);
@@ -4537,7 +4610,7 @@
     var linear = new Float64Array(n);
     var lambdaR = 1.0 / (steeringLengthM * steeringLengthM);
     var lambdaC = 1.0 / (centeringLengthM * centeringLengthM * centeringLengthM * centeringLengthM);
-    var meanSpacing = n > 1 ? (frame.d5d_1[n - 1 | 0] - frame.d5d_1[0]) / (n - 1 | 0) : 0.0;
+    var meanSpacing = n > 1 ? (frame.s5d_1[n - 1 | 0] - frame.s5d_1[0]) / (n - 1 | 0) : 0.0;
     var tie = meanSpacing > 0.0 ? lambdaR / meanSpacing : lambdaR;
     var a = new Float64Array(3);
     var b = new Float64Array(3);
@@ -4546,8 +4619,8 @@
       $l$loop_0: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var hMinus = i >= 1 ? frame.d5d_1[i] - frame.d5d_1[i - 1 | 0] : 0.0;
-        var hPlus = (i + 1 | 0) < n ? frame.d5d_1[i + 1 | 0] - frame.d5d_1[i] : 0.0;
+        var hMinus = i >= 1 ? frame.s5d_1[i] - frame.s5d_1[i - 1 | 0] : 0.0;
+        var hPlus = (i + 1 | 0) < n ? frame.s5d_1[i + 1 | 0] - frame.s5d_1[i] : 0.0;
         var weight = 0.5 * (hMinus + hPlus);
         h0[i] = h0[i] + 2.0 * weight * lambdaC;
         linear[i] = linear[i] - 2.0 * weight * lambdaC * center[i];
@@ -4564,14 +4637,14 @@
         if (denom <= 0.0)
           continue $l$loop_0;
         a[0] = 2.0 * hPlus / denom;
-        a[1] = -2.0 * (hPlus + hMinus) / denom + frame.f5d_1[i] * frame.f5d_1[i];
+        a[1] = -2.0 * (hPlus + hMinus) / denom + frame.u5d_1[i] * frame.u5d_1[i];
         a[2] = 2.0 * hMinus / denom;
         b[0] = -hPlus * hPlus / denom;
         b[1] = (hPlus * hPlus - hMinus * hMinus) / denom;
         b[2] = hMinus * hMinus / denom;
         var wRho = weight * rho[i];
         var wR = weight * lambdaR;
-        var kappaI = frame.f5d_1[i];
+        var kappaI = frame.u5d_1[i];
         var inductionVariable_0 = 0;
         if (inductionVariable_0 <= 2)
           do {
@@ -4610,15 +4683,15 @@
     return Companion_instance_16;
   }
   function OffsetEnergy(h0, h1, h2, linear) {
-    this.b5e_1 = h0;
-    this.c5e_1 = h1;
-    this.d5e_1 = h2;
-    this.e5e_1 = linear;
+    this.q5e_1 = h0;
+    this.r5e_1 = h1;
+    this.s5e_1 = h2;
+    this.t5e_1 = linear;
   }
   protoOf(OffsetEnergy).o = function () {
-    return this.b5e_1.length;
+    return this.q5e_1.length;
   };
-  protoOf(OffsetEnergy).f5e = function (from, to, gradient, delta, scratch) {
+  protoOf(OffsetEnergy).u5e = function (from, to, gradient, delta, scratch) {
     var inductionVariable = 0;
     var last = delta.length - 1 | 0;
     if (inductionVariable <= last)
@@ -4628,7 +4701,7 @@
         delta[i] = to[i] - from[i];
       }
        while (inductionVariable <= last);
-    BandedLdl_instance.m5c(this.b5e_1, this.c5e_1, this.d5e_1, delta, scratch);
+    BandedLdl_instance.b5d(this.q5e_1, this.r5e_1, this.s5e_1, delta, scratch);
     var acc = 0.0;
     var inductionVariable_0 = 0;
     var last_0 = delta.length - 1 | 0;
@@ -4641,27 +4714,27 @@
        while (inductionVariable_0 <= last_0);
     return acc;
   };
-  protoOf(OffsetEnergy).g5e = function (n, out) {
-    BandedLdl_instance.m5c(this.b5e_1, this.c5e_1, this.d5e_1, n, out);
+  protoOf(OffsetEnergy).v5e = function (n, out) {
+    BandedLdl_instance.b5d(this.q5e_1, this.r5e_1, this.s5e_1, n, out);
     var inductionVariable = 0;
     var last = out.length - 1 | 0;
     if (inductionVariable <= last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        out[i] = out[i] + this.e5e_1[i];
+        out[i] = out[i] + this.t5e_1[i];
       }
        while (inductionVariable <= last);
   };
   function QpResult(offset, iterations, gradientInfNorm, converged, activeConstraints) {
-    this.h5e_1 = offset;
-    this.i5e_1 = iterations;
-    this.j5e_1 = gradientInfNorm;
-    this.k5e_1 = converged;
-    this.l5e_1 = activeConstraints;
+    this.w5e_1 = offset;
+    this.x5e_1 = iterations;
+    this.y5e_1 = gradientInfNorm;
+    this.z5e_1 = converged;
+    this.a5f_1 = activeConstraints;
   }
   function isFree($this, x, lo, hi, g, epsilon) {
-    if ($this.o5e(lo, hi, epsilon))
+    if ($this.d5f(lo, hi, epsilon))
       return false;
     if (x <= lo + epsilon && g > 0.0)
       return false;
@@ -4676,28 +4749,28 @@
         var p = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         var i = freeIndex[p];
-        f0[p] = energy.b5e_1[i];
+        f0[p] = energy.q5e_1[i];
         f1[p] = 0.0;
         f2[p] = 0.0;
         if ((p + 1 | 0) < freeCount) {
           var tmp0_subject = freeIndex[p + 1 | 0] - i | 0;
           if (tmp0_subject === 1) {
-            f1[p] = energy.c5e_1[i];
+            f1[p] = energy.r5e_1[i];
           } else if (tmp0_subject === 2) {
-            f1[p] = energy.d5e_1[i];
+            f1[p] = energy.s5e_1[i];
           }
         }
         if ((p + 2 | 0) < freeCount && (freeIndex[p + 2 | 0] - i | 0) === 2) {
-          f2[p] = energy.d5e_1[i];
+          f2[p] = energy.s5e_1[i];
         }
       }
        while (inductionVariable < freeCount);
   }
   function OffsetQp() {
-    this.m5e_1 = 1.0E-4;
-    this.n5e_1 = 20;
+    this.b5f_1 = 1.0E-4;
+    this.c5f_1 = 20;
   }
-  protoOf(OffsetQp).p5e = function (energy, lo, hi, seed, maxIterations, gradientTolerance, boundEpsilonM) {
+  protoOf(OffsetQp).e5f = function (energy, lo, hi, seed, maxIterations, gradientTolerance, boundEpsilonM) {
     var n = energy.o();
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4711,7 +4784,7 @@
     var scratch = new Float64Array(n);
     var direction = new Float64Array(n);
     var candidate = new Float64Array(n);
-    energy.g5e(x, g);
+    energy.v5e(x, g);
     var referenceGradient = 0.0;
     var inductionVariable = 0;
     if (inductionVariable < n)
@@ -4747,7 +4820,7 @@
     var held = booleanArray(n);
     var delta = new Float64Array(n);
     $l$loop_5: while (iterations < maxIterations) {
-      energy.g5e(x, g);
+      energy.v5e(x, g);
       var freeCount = 0;
       var residual = 0.0;
       var inductionVariable_0 = 0;
@@ -4802,7 +4875,7 @@
         var fa0 = copyOf(f0, solveCount);
         var fa1 = copyOf(f1, solveCount);
         var fa2 = copyOf(f2, solveCount);
-        if (!BandedLdl_instance.k5c(fa0, fa1, fa2)) {
+        if (!BandedLdl_instance.z5c(fa0, fa1, fa2)) {
           break $l$loop_4;
         }
         var inductionVariable_3 = 0;
@@ -4814,7 +4887,7 @@
             rhs[p_0] = -g[solveIndex[p_0]];
           }
            while (inductionVariable_3 < last_0);
-        BandedLdl_instance.l5c(fa0, fa1, fa2, rhs);
+        BandedLdl_instance.a5d(fa0, fa1, fa2, rhs);
         var inductionVariable_4 = 0;
         if (inductionVariable_4 < n)
           do {
@@ -4860,7 +4933,7 @@
                 candidate[i_4] = coerceIn(x[i_4] + step * direction[i_4], lo[i_4], hi[i_4]);
               }
                while (inductionVariable_8 < n);
-            if (energy.f5e(x, candidate, g, delta, scratch) <= 1.0E-4 * step * directionalDerivative) {
+            if (energy.u5e(x, candidate, g, delta, scratch) <= 1.0E-4 * step * directionalDerivative) {
               accepted = true;
               break $l$loop_2;
             }
@@ -4913,7 +4986,7 @@
        while (inductionVariable_10 < n);
     return new QpResult(x, iterations, relativeResidual, converged, active);
   };
-  protoOf(OffsetQp).o5e = function (lo, hi, epsilon) {
+  protoOf(OffsetQp).d5f = function (lo, hi, epsilon) {
     return hi - lo <= 2.0 * epsilon;
   };
   var OffsetQp_instance;
@@ -4922,7 +4995,7 @@
   }
   function Companion_14() {
     Companion_instance_17 = this;
-    this.q5e_1 = new CurvatureOptions();
+    this.f5f_1 = new CurvatureOptions();
   }
   var Companion_instance_17;
   function Companion_getInstance_21() {
@@ -4937,23 +5010,23 @@
     curvatureWindowsM = curvatureWindowsM === VOID ? listOf_0([3.0, 6.0, 12.0, 25.0]) : curvatureWindowsM;
     headingNoiseRad = headingNoiseRad === VOID ? 0.05 : headingNoiseRad;
     curvatureSmoothWindowM = curvatureSmoothWindowM === VOID ? 3.0 : curvatureSmoothWindowM;
-    this.v53_1 = enabled;
-    this.w53_1 = geometrySmoothWindowM;
-    this.x53_1 = curvatureWindowsM;
-    this.y53_1 = headingNoiseRad;
-    this.z53_1 = curvatureSmoothWindowM;
+    this.k54_1 = enabled;
+    this.l54_1 = geometrySmoothWindowM;
+    this.m54_1 = curvatureWindowsM;
+    this.n54_1 = headingNoiseRad;
+    this.o54_1 = curvatureSmoothWindowM;
     // Inline function 'kotlin.require' call
-    if (!(this.w53_1 >= 0.0)) {
+    if (!(this.l54_1 >= 0.0)) {
       var message = 'geometrySmoothWindowM must be >= 0';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.collections.isNotEmpty' call
     // Inline function 'kotlin.require' call
-    if (!!this.x53_1.q()) {
+    if (!!this.m54_1.q()) {
       var message_0 = 'at least one curvature window is required';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
-    var tmp0 = this.x53_1;
+    var tmp0 = this.m54_1;
     var tmp$ret$5;
     $l$block_0: {
       // Inline function 'kotlin.collections.all' call
@@ -4982,7 +5055,7 @@
       var message_1 = 'curvature windows must be positive';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
-    var tmp0_0 = zipWithNext(this.x53_1);
+    var tmp0_0 = zipWithNext(this.m54_1);
     var tmp$ret$9;
     $l$block_2: {
       // Inline function 'kotlin.collections.all' call
@@ -5010,40 +5083,40 @@
     }
     // Inline function 'kotlin.require' call
     if (!tmp$ret$9) {
-      var message_2 = 'curvature windows must be strictly ascending: ' + toString(this.x53_1);
+      var message_2 = 'curvature windows must be strictly ascending: ' + toString(this.m54_1);
       throw IllegalArgumentException_init_$Create$(toString(message_2));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.y53_1 > 0.0)) {
+    if (!(this.n54_1 > 0.0)) {
       var message_3 = 'headingNoiseRad must be positive';
       throw IllegalArgumentException_init_$Create$(toString(message_3));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.z53_1 >= 0.0)) {
+    if (!(this.o54_1 >= 0.0)) {
       var message_4 = 'curvatureSmoothWindowM must be >= 0';
       throw IllegalArgumentException_init_$Create$(toString(message_4));
     }
   }
-  protoOf(CurvatureOptions).r5e = function (enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM) {
+  protoOf(CurvatureOptions).g5f = function (enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM) {
     return new CurvatureOptions(enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM);
   };
-  protoOf(CurvatureOptions).s5e = function (enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM, $super) {
-    enabled = enabled === VOID ? this.v53_1 : enabled;
-    geometrySmoothWindowM = geometrySmoothWindowM === VOID ? this.w53_1 : geometrySmoothWindowM;
-    curvatureWindowsM = curvatureWindowsM === VOID ? this.x53_1 : curvatureWindowsM;
-    headingNoiseRad = headingNoiseRad === VOID ? this.y53_1 : headingNoiseRad;
-    curvatureSmoothWindowM = curvatureSmoothWindowM === VOID ? this.z53_1 : curvatureSmoothWindowM;
-    return $super === VOID ? this.r5e(enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM) : $super.r5e.call(this, enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM);
+  protoOf(CurvatureOptions).h5f = function (enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM, $super) {
+    enabled = enabled === VOID ? this.k54_1 : enabled;
+    geometrySmoothWindowM = geometrySmoothWindowM === VOID ? this.l54_1 : geometrySmoothWindowM;
+    curvatureWindowsM = curvatureWindowsM === VOID ? this.m54_1 : curvatureWindowsM;
+    headingNoiseRad = headingNoiseRad === VOID ? this.n54_1 : headingNoiseRad;
+    curvatureSmoothWindowM = curvatureSmoothWindowM === VOID ? this.o54_1 : curvatureSmoothWindowM;
+    return $super === VOID ? this.g5f(enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM) : $super.g5f.call(this, enabled, geometrySmoothWindowM, curvatureWindowsM, headingNoiseRad, curvatureSmoothWindowM);
   };
   protoOf(CurvatureOptions).toString = function () {
-    return 'CurvatureOptions(enabled=' + this.v53_1 + ', geometrySmoothWindowM=' + this.w53_1 + ', curvatureWindowsM=' + toString(this.x53_1) + ', headingNoiseRad=' + this.y53_1 + ', curvatureSmoothWindowM=' + this.z53_1 + ')';
+    return 'CurvatureOptions(enabled=' + this.k54_1 + ', geometrySmoothWindowM=' + this.l54_1 + ', curvatureWindowsM=' + toString(this.m54_1) + ', headingNoiseRad=' + this.n54_1 + ', curvatureSmoothWindowM=' + this.o54_1 + ')';
   };
   protoOf(CurvatureOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.v53_1);
-    result = imul(result, 31) + getNumberHashCode(this.w53_1) | 0;
-    result = imul(result, 31) + hashCode(this.x53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z53_1) | 0;
+    var result = getBooleanHashCode(this.k54_1);
+    result = imul(result, 31) + getNumberHashCode(this.l54_1) | 0;
+    result = imul(result, 31) + hashCode(this.m54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.o54_1) | 0;
     return result;
   };
   protoOf(CurvatureOptions).equals = function (other) {
@@ -5051,24 +5124,24 @@
       return true;
     if (!(other instanceof CurvatureOptions))
       return false;
-    if (!(this.v53_1 === other.v53_1))
+    if (!(this.k54_1 === other.k54_1))
       return false;
-    if (!equals(this.w53_1, other.w53_1))
+    if (!equals(this.l54_1, other.l54_1))
       return false;
-    if (!equals(this.x53_1, other.x53_1))
+    if (!equals(this.m54_1, other.m54_1))
       return false;
-    if (!equals(this.y53_1, other.y53_1))
+    if (!equals(this.n54_1, other.n54_1))
       return false;
-    if (!equals(this.z53_1, other.z53_1))
+    if (!equals(this.o54_1, other.o54_1))
       return false;
     return true;
   };
   function PathCurvature() {
   }
-  protoOf(PathCurvature).u53 = function (path, options) {
-    if (!options.v53_1)
+  protoOf(PathCurvature).j54 = function (path, options) {
+    if (!options.k54_1)
       return false;
-    var tmp0_elvis_lhs = LocalFrame_instance.x5d(path, options.w53_1);
+    var tmp0_elvis_lhs = LocalFrame_instance.m5e(path, options.l54_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       return false;
@@ -5076,15 +5149,15 @@
       tmp = tmp0_elvis_lhs;
     }
     var frame = tmp;
-    CurvatureEstimator_instance.v5d(frame);
-    CurvatureEstimator_instance.w5d(frame, toDoubleArray(options.x53_1), options.y53_1, options.z53_1);
+    CurvatureEstimator_instance.k5e(frame);
+    CurvatureEstimator_instance.l5e(frame, toDoubleArray(options.m54_1), options.n54_1, options.o54_1);
     var inductionVariable = 0;
     var last = path.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        path.j2e(i, frame.f5d_1[i]);
+        path.j2e(i, frame.u5d_1[i]);
       }
        while (inductionVariable < last);
     return true;
@@ -5094,41 +5167,41 @@
     return PathCurvature_instance;
   }
   function PlanarFrame(x, y, s, theta, kappa, lat0, lon0, k) {
-    this.b5d_1 = x;
-    this.c5d_1 = y;
-    this.d5d_1 = s;
-    this.e5d_1 = theta;
-    this.f5d_1 = kappa;
-    this.g5d_1 = lat0;
-    this.h5d_1 = lon0;
-    this.i5d_1 = k;
+    this.q5d_1 = x;
+    this.r5d_1 = y;
+    this.s5d_1 = s;
+    this.t5d_1 = theta;
+    this.u5d_1 = kappa;
+    this.v5d_1 = lat0;
+    this.w5d_1 = lon0;
+    this.x5d_1 = k;
   }
   protoOf(PlanarFrame).o = function () {
-    return this.b5d_1.length;
+    return this.q5d_1.length;
   };
   function RacingLineReport(size, corners, centerlineCurvature, corridorLo, corridorHi, roadHalfWidthM, lateralOffsetM, trajectoryCurvature, newtonIterations, relativeGradient, converged, activeConstraints) {
-    this.t5e_1 = size;
-    this.u5e_1 = corners;
-    this.v5e_1 = centerlineCurvature;
-    this.w5e_1 = corridorLo;
-    this.x5e_1 = corridorHi;
-    this.y5e_1 = roadHalfWidthM;
-    this.z5e_1 = lateralOffsetM;
-    this.a5f_1 = trajectoryCurvature;
-    this.b5f_1 = newtonIterations;
-    this.c5f_1 = relativeGradient;
-    this.d5f_1 = converged;
-    this.e5f_1 = activeConstraints;
-  }
-  protoOf(RacingLineReport).f5f = function () {
+    this.i5f_1 = size;
+    this.j5f_1 = corners;
+    this.k5f_1 = centerlineCurvature;
+    this.l5f_1 = corridorLo;
+    this.m5f_1 = corridorHi;
+    this.n5f_1 = roadHalfWidthM;
+    this.o5f_1 = lateralOffsetM;
+    this.p5f_1 = trajectoryCurvature;
+    this.q5f_1 = newtonIterations;
+    this.r5f_1 = relativeGradient;
+    this.s5f_1 = converged;
+    this.t5f_1 = activeConstraints;
+  }
+  protoOf(RacingLineReport).u5f = function () {
     var m = 0.0;
     var inductionVariable = 0;
-    var last = this.t5e_1;
+    var last = this.i5f_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var w = this.x5e_1[i] - this.w5e_1[i];
+        var w = this.m5f_1[i] - this.l5f_1[i];
         if (w > m)
           m = w;
       }
@@ -5136,7 +5209,7 @@
     return m;
   };
   function project($this, path, options) {
-    var tmp0_elvis_lhs = LocalFrame_instance.x5d(path, options.s53_1.w53_1);
+    var tmp0_elvis_lhs = LocalFrame_instance.m5e(path, options.h54_1.l54_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       return null;
@@ -5144,35 +5217,35 @@
       tmp = tmp0_elvis_lhs;
     }
     var frame = tmp;
-    CurvatureEstimator_instance.v5d(frame);
-    CurvatureEstimator_instance.w5d(frame, toDoubleArray(options.s53_1.x53_1), options.s53_1.y53_1, options.s53_1.z53_1);
+    CurvatureEstimator_instance.k5e(frame);
+    CurvatureEstimator_instance.l5e(frame, toDoubleArray(options.h54_1.m54_1), options.h54_1.n54_1, options.h54_1.o54_1);
     var inductionVariable = 0;
     var last = frame.o();
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        if (isNaN_0(frame.f5d_1[i])) {
-          frame.f5d_1[i] = 0.0;
+        if (isNaN_0(frame.u5d_1[i])) {
+          frame.u5d_1[i] = 0.0;
         }
       }
        while (inductionVariable < last);
     return frame;
   }
   function analyzeFrame($this, path, frame, options) {
-    var width = Corridor_instance.q5d(path, frame, options);
-    var corners = CornerDetector_instance.a5d(frame, options, width);
-    var bounds = Corridor_instance.s5d(frame, width, options);
+    var width = Corridor_instance.f5e(path, frame, options);
+    var corners = CornerDetector_instance.p5d(frame, options, width);
+    var bounds = Corridor_instance.h5e(frame, width, options);
     var tmp = 0;
     var tmp_0 = frame.o();
     var tmp_1 = new Float64Array(tmp_0);
     while (tmp < tmp_0) {
       var tmp_2 = tmp;
-      tmp_1[tmp_2] = coerceIn(0.0, bounds.j5d_1[tmp_2], bounds.k5d_1[tmp_2]);
+      tmp_1[tmp_2] = coerceIn(0.0, bounds.y5d_1[tmp_2], bounds.z5d_1[tmp_2]);
       tmp = tmp + 1 | 0;
     }
     var center = tmp_1;
-    var objectiveKappa = 1.0 / options.m53_1;
+    var objectiveKappa = 1.0 / options.b54_1;
     var tmp_3 = 0;
     var tmp_4 = frame.o();
     var tmp_5 = new Float64Array(tmp_4);
@@ -5180,7 +5253,7 @@
       var tmp_6 = tmp_3;
       var tmp_7;
       // Inline function 'kotlin.math.abs' call
-      var x = frame.f5d_1[tmp_6];
+      var x = frame.u5d_1[tmp_6];
       if (Math.abs(x) > objectiveKappa) {
         tmp_7 = 1.0;
       } else {
@@ -5196,18 +5269,18 @@
     var tmp_11 = booleanArray(tmp_10);
     while (tmp_9 < tmp_10) {
       var tmp_12 = tmp_9;
-      tmp_11[tmp_12] = OffsetQp_instance.o5e(bounds.j5d_1[tmp_12], bounds.k5d_1[tmp_12], options.r53_1);
+      tmp_11[tmp_12] = OffsetQp_instance.d5f(bounds.y5d_1[tmp_12], bounds.z5d_1[tmp_12], options.g54_1);
       tmp_9 = tmp_9 + 1 | 0;
     }
-    var energy = tmp_8.a5e(frame, center, rho, options.n53_1, options.o53_1, tmp_11);
+    var energy = tmp_8.p5e(frame, center, rho, options.c54_1, options.d54_1, tmp_11);
     var seed = center;
-    var solved = OffsetQp_instance.p5e(energy, bounds.j5d_1, bounds.k5d_1, seed, options.p53_1, options.q53_1, options.r53_1);
-    var trajectoryCurvature = measureOffsetCurvature($this, frame, solved.h5e_1, options);
+    var solved = OffsetQp_instance.e5f(energy, bounds.y5d_1, bounds.z5d_1, seed, options.e54_1, options.f54_1, options.g54_1);
+    var trajectoryCurvature = measureOffsetCurvature($this, frame, solved.w5e_1, options);
     var tmp_13 = frame.o();
     // Inline function 'kotlin.collections.copyOf' call
     // Inline function 'kotlin.js.asDynamic' call
-    var tmp$ret$4 = frame.f5d_1.slice();
-    return new RacingLineReport(tmp_13, corners, tmp$ret$4, bounds.j5d_1, bounds.k5d_1, bounds.l5d_1, solved.h5e_1, trajectoryCurvature, solved.i5e_1, solved.j5e_1, solved.k5e_1, solved.l5e_1);
+    var tmp$ret$4 = frame.u5d_1.slice();
+    return new RacingLineReport(tmp_13, corners, tmp$ret$4, bounds.y5d_1, bounds.z5d_1, bounds.a5e_1, solved.w5e_1, trajectoryCurvature, solved.x5e_1, solved.y5e_1, solved.z5e_1, solved.a5f_1);
   }
   function measureOffsetCurvature($this, frame, offset, options) {
     var size = frame.o();
@@ -5218,28 +5291,28 @@
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp = frame.b5d_1[i];
+        var tmp = frame.q5d_1[i];
         var tmp_0 = offset[i];
         // Inline function 'kotlin.math.sin' call
-        var x_0 = frame.e5d_1[i];
+        var x_0 = frame.t5d_1[i];
         x[i] = tmp - tmp_0 * Math.sin(x_0);
-        var tmp_1 = frame.c5d_1[i];
+        var tmp_1 = frame.r5d_1[i];
         var tmp_2 = offset[i];
         // Inline function 'kotlin.math.cos' call
-        var x_1 = frame.e5d_1[i];
+        var x_1 = frame.t5d_1[i];
         y[i] = tmp_1 + tmp_2 * Math.cos(x_1);
       }
        while (inductionVariable < size);
     var s = new Float64Array(size);
-    LocalFrame_instance.y5d(x, y, s);
-    var line = new PlanarFrame(x, y, s, new Float64Array(size), new Float64Array(size), frame.g5d_1, frame.h5d_1, frame.i5d_1);
-    CurvatureEstimator_instance.v5d(line);
-    CurvatureEstimator_instance.w5d(line, toDoubleArray(options.s53_1.x53_1), options.s53_1.y53_1, options.s53_1.z53_1);
-    return line.f5d_1;
+    LocalFrame_instance.n5e(x, y, s);
+    var line = new PlanarFrame(x, y, s, new Float64Array(size), new Float64Array(size), frame.v5d_1, frame.w5d_1, frame.x5d_1);
+    CurvatureEstimator_instance.k5e(line);
+    CurvatureEstimator_instance.l5e(line, toDoubleArray(options.h54_1.m54_1), options.h54_1.n54_1, options.h54_1.o54_1);
+    return line.u5d_1;
   }
   function RacingLine() {
   }
-  protoOf(RacingLine).g5f = function (path, options) {
+  protoOf(RacingLine).v5f = function (path, options) {
     var tmp0_elvis_lhs = project(this, path, options);
     var tmp;
     if (tmp0_elvis_lhs == null) {
@@ -5250,7 +5323,7 @@
     var frame = tmp;
     return analyzeFrame(this, path, frame, options);
   };
-  protoOf(RacingLine).a54 = function (source, options) {
+  protoOf(RacingLine).p54 = function (source, options) {
     var tmp0_elvis_lhs = project(this, source, options);
     var tmp;
     if (tmp0_elvis_lhs == null) {
@@ -5280,27 +5353,27 @@
       do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        var n = report.z5e_1[i_0];
+        var n = report.o5f_1[i_0];
         // Inline function 'kotlin.math.sin' call
-        var x = frame.e5d_1[i_0];
+        var x = frame.t5d_1[i_0];
         var nx = -Math.sin(x);
         // Inline function 'kotlin.math.cos' call
-        var x_0 = frame.e5d_1[i_0];
+        var x_0 = frame.t5d_1[i_0];
         var ny = Math.cos(x_0);
-        var x_1 = frame.b5d_1[i_0] + n * nx;
-        var y = frame.c5d_1[i_0] + n * ny;
+        var x_1 = frame.q5d_1[i_0] + n * nx;
+        var y = frame.r5d_1[i_0] + n * ny;
         out.m2e(i_0, source.o23(i_0));
         out.n2e(i_0, source.p23(i_0));
-        var latLon = LocalFrame_instance.z5d(frame, x_1, y);
+        var latLon = LocalFrame_instance.o5e(frame, x_1, y);
         out.i24(i_0, latLon[0]);
         out.j24(i_0, latLon[1]);
         out.l2e(i_0, n);
-        out.j2e(i_0, report.a5f_1[i_0]);
+        out.j2e(i_0, report.p5f_1[i_0]);
         out.s24(i_0, source.k2e(i_0));
       }
        while (inductionVariable_0 < last_0);
     out.f25();
-    PathCurvature_instance.u53(out, options.s53_1.s5e(true));
+    PathCurvature_instance.j54(out, options.h54_1.h5f(true));
     return out;
   };
   var RacingLine_instance;
@@ -5406,7 +5479,7 @@
   }
   function Companion_16() {
     Companion_instance_19 = this;
-    this.j5f_1 = new RacingLineOptions();
+    this.y5f_1 = new RacingLineOptions();
   }
   var Companion_instance_19;
   function Companion_getInstance_23() {
@@ -5437,124 +5510,124 @@
     maxNewtonIterations = maxNewtonIterations === VOID ? 200 : maxNewtonIterations;
     gradientTolerance = gradientTolerance === VOID ? 1.0E-8 : gradientTolerance;
     boundEpsilonM = boundEpsilonM === VOID ? 1.0E-6 : boundEpsilonM;
-    curvature = curvature === VOID ? Companion_getInstance_21().q5e_1 : curvature;
+    curvature = curvature === VOID ? Companion_getInstance_21().f5f_1 : curvature;
     simplifyToleranceCapM = simplifyToleranceCapM === VOID ? 2.0 : simplifyToleranceCapM;
-    this.x52_1 = enabled;
-    this.y52_1 = defaultRoadWidthM;
-    this.z52_1 = edgeMarginM;
-    this.a53_1 = corridor;
-    this.b53_1 = cornerEnterRadiusM;
-    this.c53_1 = cornerExitRadiusM;
-    this.d53_1 = minCornerLengthM;
-    this.e53_1 = minCornerTurnDeg;
-    this.f53_1 = hairpinTurnDeg;
-    this.g53_1 = gentleRadiusM;
-    this.h53_1 = regularityFactor;
-    this.i53_1 = selfProximityGapM;
-    this.j53_1 = straightRunM;
-    this.k53_1 = straightRadiusM;
-    this.l53_1 = widthSmoothWindowM;
-    this.m53_1 = objectiveRadiusM;
-    this.n53_1 = steeringLengthM;
-    this.o53_1 = centeringLengthM;
-    this.p53_1 = maxNewtonIterations;
-    this.q53_1 = gradientTolerance;
-    this.r53_1 = boundEpsilonM;
-    this.s53_1 = curvature;
-    this.t53_1 = simplifyToleranceCapM;
+    this.m53_1 = enabled;
+    this.n53_1 = defaultRoadWidthM;
+    this.o53_1 = edgeMarginM;
+    this.p53_1 = corridor;
+    this.q53_1 = cornerEnterRadiusM;
+    this.r53_1 = cornerExitRadiusM;
+    this.s53_1 = minCornerLengthM;
+    this.t53_1 = minCornerTurnDeg;
+    this.u53_1 = hairpinTurnDeg;
+    this.v53_1 = gentleRadiusM;
+    this.w53_1 = regularityFactor;
+    this.x53_1 = selfProximityGapM;
+    this.y53_1 = straightRunM;
+    this.z53_1 = straightRadiusM;
+    this.a54_1 = widthSmoothWindowM;
+    this.b54_1 = objectiveRadiusM;
+    this.c54_1 = steeringLengthM;
+    this.d54_1 = centeringLengthM;
+    this.e54_1 = maxNewtonIterations;
+    this.f54_1 = gradientTolerance;
+    this.g54_1 = boundEpsilonM;
+    this.h54_1 = curvature;
+    this.i54_1 = simplifyToleranceCapM;
     // Inline function 'kotlin.require' call
-    if (!(this.y52_1 > 0.0)) {
+    if (!(this.n53_1 > 0.0)) {
       var message = 'defaultRoadWidthM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.z52_1 >= 0.0)) {
+    if (!(this.o53_1 >= 0.0)) {
       var message_0 = 'edgeMarginM must be >= 0';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.b53_1 > 0.0 && this.c53_1 > 0.0)) {
+    if (!(this.q53_1 > 0.0 && this.r53_1 > 0.0)) {
       var message_1 = 'corner radii must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.c53_1 >= this.b53_1)) {
-      var message_2 = 'cornerExitRadiusM (' + this.c53_1 + ') must be >= cornerEnterRadiusM ' + ('(' + this.b53_1 + '): a corner has to be harder to open than to keep open, or ') + 'the hysteresis runs backwards and corners flicker';
+    if (!(this.r53_1 >= this.q53_1)) {
+      var message_2 = 'cornerExitRadiusM (' + this.r53_1 + ') must be >= cornerEnterRadiusM ' + ('(' + this.q53_1 + '): a corner has to be harder to open than to keep open, or ') + 'the hysteresis runs backwards and corners flicker';
       throw IllegalArgumentException_init_$Create$(toString(message_2));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.h53_1 > 0.0 && this.h53_1 < 1.0)) {
+    if (!(this.w53_1 > 0.0 && this.w53_1 < 1.0)) {
       var message_3 = 'regularityFactor must be in (0, 1) \u2014 at 1.0 the offset map folds';
       throw IllegalArgumentException_init_$Create$(toString(message_3));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.i53_1 > 0.0)) {
+    if (!(this.x53_1 > 0.0)) {
       var message_4 = 'selfProximityGapM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_4));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.l53_1 >= 0.0)) {
+    if (!(this.a54_1 >= 0.0)) {
       var message_5 = 'widthSmoothWindowM must be >= 0';
       throw IllegalArgumentException_init_$Create$(toString(message_5));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.m53_1 > 0.0)) {
+    if (!(this.b54_1 > 0.0)) {
       var message_6 = 'objectiveRadiusM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_6));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.n53_1 > 0.0)) {
+    if (!(this.c54_1 > 0.0)) {
       var message_7 = 'steeringLengthM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_7));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.o53_1 > 0.0)) {
+    if (!(this.d54_1 > 0.0)) {
       var message_8 = 'centeringLengthM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_8));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.p53_1 > 0)) {
+    if (!(this.e54_1 > 0)) {
       var message_9 = 'maxNewtonIterations must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_9));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.q53_1 > 0.0)) {
+    if (!(this.f54_1 > 0.0)) {
       var message_10 = 'gradientTolerance must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_10));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.r53_1 > 0.0)) {
+    if (!(this.g54_1 > 0.0)) {
       var message_11 = 'boundEpsilonM must be > 0';
       throw IllegalArgumentException_init_$Create$(toString(message_11));
     }
   }
   protoOf(RacingLineOptions).toString = function () {
-    return 'RacingLineOptions(enabled=' + this.x52_1 + ', defaultRoadWidthM=' + this.y52_1 + ', edgeMarginM=' + this.z52_1 + ', corridor=' + this.a53_1.toString() + ', cornerEnterRadiusM=' + this.b53_1 + ', cornerExitRadiusM=' + this.c53_1 + ', minCornerLengthM=' + this.d53_1 + ', minCornerTurnDeg=' + this.e53_1 + ', hairpinTurnDeg=' + this.f53_1 + ', gentleRadiusM=' + this.g53_1 + ', regularityFactor=' + this.h53_1 + ', selfProximityGapM=' + this.i53_1 + ', straightRunM=' + this.j53_1 + ', straightRadiusM=' + this.k53_1 + ', widthSmoothWindowM=' + this.l53_1 + ', objectiveRadiusM=' + this.m53_1 + ', steeringLengthM=' + this.n53_1 + ', centeringLengthM=' + this.o53_1 + ', maxNewtonIterations=' + this.p53_1 + ', gradientTolerance=' + this.q53_1 + ', boundEpsilonM=' + this.r53_1 + ', curvature=' + this.s53_1.toString() + ', simplifyToleranceCapM=' + this.t53_1 + ')';
+    return 'RacingLineOptions(enabled=' + this.m53_1 + ', defaultRoadWidthM=' + this.n53_1 + ', edgeMarginM=' + this.o53_1 + ', corridor=' + this.p53_1.toString() + ', cornerEnterRadiusM=' + this.q53_1 + ', cornerExitRadiusM=' + this.r53_1 + ', minCornerLengthM=' + this.s53_1 + ', minCornerTurnDeg=' + this.t53_1 + ', hairpinTurnDeg=' + this.u53_1 + ', gentleRadiusM=' + this.v53_1 + ', regularityFactor=' + this.w53_1 + ', selfProximityGapM=' + this.x53_1 + ', straightRunM=' + this.y53_1 + ', straightRadiusM=' + this.z53_1 + ', widthSmoothWindowM=' + this.a54_1 + ', objectiveRadiusM=' + this.b54_1 + ', steeringLengthM=' + this.c54_1 + ', centeringLengthM=' + this.d54_1 + ', maxNewtonIterations=' + this.e54_1 + ', gradientTolerance=' + this.f54_1 + ', boundEpsilonM=' + this.g54_1 + ', curvature=' + this.h54_1.toString() + ', simplifyToleranceCapM=' + this.i54_1 + ')';
   };
   protoOf(RacingLineOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.x52_1);
-    result = imul(result, 31) + getNumberHashCode(this.y52_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z52_1) | 0;
-    result = imul(result, 31) + this.a53_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.b53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.c53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.j53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.k53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.l53_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.m53_1) | 0;
+    var result = getBooleanHashCode(this.m53_1);
     result = imul(result, 31) + getNumberHashCode(this.n53_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.o53_1) | 0;
-    result = imul(result, 31) + this.p53_1 | 0;
+    result = imul(result, 31) + this.p53_1.hashCode() | 0;
     result = imul(result, 31) + getNumberHashCode(this.q53_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.r53_1) | 0;
-    result = imul(result, 31) + this.s53_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s53_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.t53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.v53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.w53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.x53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.y53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z53_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.a54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.b54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.c54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.d54_1) | 0;
+    result = imul(result, 31) + this.e54_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.f54_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.g54_1) | 0;
+    result = imul(result, 31) + this.h54_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i54_1) | 0;
     return result;
   };
   protoOf(RacingLineOptions).equals = function (other) {
@@ -5562,51 +5635,51 @@
       return true;
     if (!(other instanceof RacingLineOptions))
       return false;
-    if (!(this.x52_1 === other.x52_1))
+    if (!(this.m53_1 === other.m53_1))
       return false;
-    if (!equals(this.y52_1, other.y52_1))
+    if (!equals(this.n53_1, other.n53_1))
       return false;
-    if (!equals(this.z52_1, other.z52_1))
+    if (!equals(this.o53_1, other.o53_1))
       return false;
-    if (!this.a53_1.equals(other.a53_1))
+    if (!this.p53_1.equals(other.p53_1))
       return false;
-    if (!equals(this.b53_1, other.b53_1))
+    if (!equals(this.q53_1, other.q53_1))
       return false;
-    if (!equals(this.c53_1, other.c53_1))
+    if (!equals(this.r53_1, other.r53_1))
       return false;
-    if (!equals(this.d53_1, other.d53_1))
+    if (!equals(this.s53_1, other.s53_1))
       return false;
-    if (!equals(this.e53_1, other.e53_1))
+    if (!equals(this.t53_1, other.t53_1))
       return false;
-    if (!equals(this.f53_1, other.f53_1))
+    if (!equals(this.u53_1, other.u53_1))
       return false;
-    if (!equals(this.g53_1, other.g53_1))
+    if (!equals(this.v53_1, other.v53_1))
       return false;
-    if (!equals(this.h53_1, other.h53_1))
+    if (!equals(this.w53_1, other.w53_1))
       return false;
-    if (!equals(this.i53_1, other.i53_1))
+    if (!equals(this.x53_1, other.x53_1))
       return false;
-    if (!equals(this.j53_1, other.j53_1))
+    if (!equals(this.y53_1, other.y53_1))
       return false;
-    if (!equals(this.k53_1, other.k53_1))
+    if (!equals(this.z53_1, other.z53_1))
       return false;
-    if (!equals(this.l53_1, other.l53_1))
+    if (!equals(this.a54_1, other.a54_1))
       return false;
-    if (!equals(this.m53_1, other.m53_1))
+    if (!equals(this.b54_1, other.b54_1))
       return false;
-    if (!equals(this.n53_1, other.n53_1))
+    if (!equals(this.c54_1, other.c54_1))
       return false;
-    if (!equals(this.o53_1, other.o53_1))
+    if (!equals(this.d54_1, other.d54_1))
       return false;
-    if (!(this.p53_1 === other.p53_1))
+    if (!(this.e54_1 === other.e54_1))
       return false;
-    if (!equals(this.q53_1, other.q53_1))
+    if (!equals(this.f54_1, other.f54_1))
       return false;
-    if (!equals(this.r53_1, other.r53_1))
+    if (!equals(this.g54_1, other.g54_1))
       return false;
-    if (!this.s53_1.equals(other.s53_1))
+    if (!this.h54_1.equals(other.h54_1))
       return false;
-    if (!equals(this.t53_1, other.t53_1))
+    if (!equals(this.i54_1, other.i54_1))
       return false;
     return true;
   };
@@ -5816,7 +5889,7 @@
   function enhance(path, options) {
     _init_properties_EngineJsApi_kt__9bputf();
     var opts = toEnhanceOptions(options);
-    var provider = opts.d51_1 ? elevationProviderFor(options) : null;
+    var provider = opts.n52_1 ? elevationProviderFor(options) : null;
     var tmp = GlobalScope_instance;
     return promise(tmp, VOID, VOID, enhance$slambda_0(path, provider, opts, null));
   }
@@ -5824,7 +5897,7 @@
     _init_properties_EngineJsApi_kt__9bputf();
     var opts = toEnhanceOptions(options);
     var course = new CoursePhysics(new Course(path, toCyclist(cyclist), toBike(bike)), RhoProviderEstimate_instance, AeroProviderConstant_instance, toWindProvider(wind), toCyclistPowerProvider(power));
-    var provider = opts.d51_1 ? elevationProviderFor(options) : null;
+    var provider = opts.n52_1 ? elevationProviderFor(options) : null;
     var tmp = GlobalScope_instance;
     return promise(tmp, VOID, VOID, enhanceWithCourse$slambda_0(course, opts, provider, null));
   }
@@ -5939,7 +6012,7 @@
   function detectClimbs(path) {
     _init_properties_EngineJsApi_kt__9bputf();
     // Inline function 'kotlin.collections.map' call
-    var this_0 = ClimbDetector_instance.p56(path);
+    var this_0 = ClimbDetector_instance.e57(path);
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.l();
@@ -5956,7 +6029,7 @@
     _init_properties_EngineJsApi_kt__9bputf();
     var tmp = ClimbDetector_instance;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = tmp.o56(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster, maxAnalysisPoints == null ? (new ClimbOptions()).w55_1 : maxAnalysisPoints));
+    var this_0 = tmp.d57(path, new ClimbOptions(minMinClimbElevationM, maxMinClimbElevationM, minClimbElevationRatio, minGradePercent, maxDiffRealGrade, booster, maxAnalysisPoints == null ? (new ClimbOptions()).l56_1 : maxAnalysisPoints));
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.l();
@@ -5971,8 +6044,8 @@
   function analyzeRacingLine(path, options) {
     options = options === VOID ? null : options;
     _init_properties_EngineJsApi_kt__9bputf();
-    var racingLine = toEnhanceOptions(options).k51_1;
-    var tmp0_elvis_lhs = RacingLine_instance.g5f(path, racingLine);
+    var racingLine = toEnhanceOptions(options).u52_1;
+    var tmp0_elvis_lhs = RacingLine_instance.v5f(path, racingLine);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       return null;
@@ -5981,9 +6054,9 @@
     }
     var report = tmp;
     var o = {};
-    o.size = report.t5e_1;
+    o.size = report.i5f_1;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = report.u5e_1;
+    var this_0 = report.j5f_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.l();
@@ -5994,17 +6067,17 @@
     }
     // Inline function 'kotlin.collections.toTypedArray' call
     o.corners = copyToArray(destination);
-    o.centerlineCurvature = report.v5e_1;
-    o.trajectoryCurvature = report.a5f_1;
-    o.corridorLo = report.w5e_1;
-    o.corridorHi = report.x5e_1;
-    o.roadHalfWidthM = report.y5e_1;
-    o.lateralOffsetM = report.z5e_1;
-    o.maxCorridorWidthM = report.f5f();
-    o.newtonIterations = report.b5f_1;
-    o.relativeGradient = report.c5f_1;
-    o.converged = report.d5f_1;
-    o.activeConstraints = report.e5f_1;
+    o.centerlineCurvature = report.k5f_1;
+    o.trajectoryCurvature = report.p5f_1;
+    o.corridorLo = report.l5f_1;
+    o.corridorHi = report.m5f_1;
+    o.roadHalfWidthM = report.n5f_1;
+    o.lateralOffsetM = report.o5f_1;
+    o.maxCorridorWidthM = report.u5f();
+    o.newtonIterations = report.q5f_1;
+    o.relativeGradient = report.r5f_1;
+    o.converged = report.s5f_1;
+    o.activeConstraints = report.t5f_1;
     // Inline function 'kotlin.js.unsafeCast' call
     return o;
   }
@@ -6085,32 +6158,32 @@
       return d;
     requireOnlyKeys(_this__u8e3s4, 'EnhanceOptionsDto', get_ENHANCE_OPTIONS_KEYS());
     var tmp0_elvis_lhs = _this__u8e3s4.fixElevation;
-    var tmp = tmp0_elvis_lhs == null ? d.d51_1 : tmp0_elvis_lhs;
+    var tmp = tmp0_elvis_lhs == null ? d.n52_1 : tmp0_elvis_lhs;
     var tmp1_elvis_lhs = _this__u8e3s4.computeMaxSpeeds;
-    var tmp_0 = tmp1_elvis_lhs == null ? d.e51_1 : tmp1_elvis_lhs;
+    var tmp_0 = tmp1_elvis_lhs == null ? d.o52_1 : tmp1_elvis_lhs;
     var tmp2_elvis_lhs = _this__u8e3s4.virtualizeTrack;
-    var tmp_1 = tmp2_elvis_lhs == null ? d.f51_1 : tmp2_elvis_lhs;
+    var tmp_1 = tmp2_elvis_lhs == null ? d.p52_1 : tmp2_elvis_lhs;
     var tmp3_elvis_lhs = _this__u8e3s4.computeOnePointPerSecond;
-    var tmp_2 = tmp3_elvis_lhs == null ? d.g51_1 : tmp3_elvis_lhs;
+    var tmp_2 = tmp3_elvis_lhs == null ? d.q52_1 : tmp3_elvis_lhs;
     var tmp4_elvis_lhs = _this__u8e3s4.simplifyEnabled;
-    var tmp_3 = tmp4_elvis_lhs == null ? d.h51_1.t50_1 : tmp4_elvis_lhs;
+    var tmp_3 = tmp4_elvis_lhs == null ? d.r52_1.f52_1 : tmp4_elvis_lhs;
     var tmp5_elvis_lhs = _this__u8e3s4.simplifyToleranceM;
-    var tmp_4 = tmp5_elvis_lhs == null ? d.h51_1.u50_1 : tmp5_elvis_lhs;
+    var tmp_4 = tmp5_elvis_lhs == null ? d.r52_1.g52_1 : tmp5_elvis_lhs;
     var tmp6_elvis_lhs = _this__u8e3s4.simplifyZExaggeration;
-    var tmp_5 = new SimplifyPathOptions(tmp_3, tmp_4, tmp6_elvis_lhs == null ? d.h51_1.v50_1 : tmp6_elvis_lhs);
+    var tmp_5 = new SimplifyPathOptions(tmp_3, tmp_4, tmp6_elvis_lhs == null ? d.r52_1.h52_1 : tmp6_elvis_lhs);
     var tmp7_elvis_lhs = _this__u8e3s4.wPrimeBalanceEnabled;
-    var tmp_6 = tmp7_elvis_lhs == null ? d.i51_1.w50_1 : tmp7_elvis_lhs;
+    var tmp_6 = tmp7_elvis_lhs == null ? d.s52_1.i52_1 : tmp7_elvis_lhs;
     var tmp8_elvis_lhs = _this__u8e3s4.wPrimeBalanceCriticalPower;
-    var tmp_7 = tmp8_elvis_lhs == null ? d.i51_1.x50_1 : tmp8_elvis_lhs;
+    var tmp_7 = tmp8_elvis_lhs == null ? d.s52_1.j52_1 : tmp8_elvis_lhs;
     var tmp9_elvis_lhs = _this__u8e3s4.wPrimeBalanceWPrime;
-    var tmp_8 = new WPrimeBalanceOptions(tmp_6, tmp_7, tmp9_elvis_lhs == null ? d.i51_1.y50_1 : tmp9_elvis_lhs);
+    var tmp_8 = new WPrimeBalanceOptions(tmp_6, tmp_7, tmp9_elvis_lhs == null ? d.s52_1.k52_1 : tmp9_elvis_lhs);
     var tmp10_elvis_lhs = _this__u8e3s4.curvatureEnabled;
-    var tmp_9 = new CurvatureOptions(tmp10_elvis_lhs == null ? d.j51_1.v53_1 : tmp10_elvis_lhs);
+    var tmp_9 = new CurvatureOptions(tmp10_elvis_lhs == null ? d.t52_1.k54_1 : tmp10_elvis_lhs);
     var tmp11_elvis_lhs = _this__u8e3s4.racingLineEnabled;
-    var tmp13_enabled = tmp11_elvis_lhs == null ? d.k51_1.x52_1 : tmp11_elvis_lhs;
+    var tmp13_enabled = tmp11_elvis_lhs == null ? d.u52_1.m53_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 ? d.k51_1.y52_1 : tmp12_elvis_lhs;
+    var tmp15_defaultRoadWidthM = tmp12_elvis_lhs == null ? d.u52_1.n53_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;
@@ -6123,8 +6196,8 @@
     }
     var named = tmp_11;
     var tmp1_elvis_lhs_0 = _this__u8e3s4.elevationGainEnabled;
-    var tmp_12 = tmp1_elvis_lhs_0 == null ? d.l51_1.a2b_1 : tmp1_elvis_lhs_0;
-    var tmp_13 = named == null ? d.l51_1.b2b_1 : named;
+    var tmp_12 = tmp1_elvis_lhs_0 == null ? d.v52_1.a2b_1 : tmp1_elvis_lhs_0;
+    var tmp_13 = named == null ? d.v52_1.b2b_1 : named;
     var tmp3_elvis_lhs_0 = _this__u8e3s4.elevationGainThresholdM;
     var tmp_14;
     if (tmp3_elvis_lhs_0 == null) {
@@ -6133,13 +6206,13 @@
       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.l51_1.c2b_1 : tmp5_elvis_lhs_0);
+    var tmp_15 = new ElevationGainOptions(tmp_12, tmp_13, tmp5_elvis_lhs_0 == null ? d.v52_1.c2b_1 : tmp5_elvis_lhs_0);
     var tmp16_elvis_lhs = _this__u8e3s4.elevationSmoothWindowM;
-    var tmp_16 = tmp16_elvis_lhs == null ? d.m51_1 : tmp16_elvis_lhs;
+    var tmp_16 = tmp16_elvis_lhs == null ? d.w52_1 : tmp16_elvis_lhs;
     var tmp17_elvis_lhs = _this__u8e3s4.bridgeDecksEnabled;
-    var tmp_17 = tmp17_elvis_lhs == null ? d.n51_1.a51_1 : tmp17_elvis_lhs;
+    var tmp_17 = tmp17_elvis_lhs == null ? d.x52_1.m50_1 : tmp17_elvis_lhs;
     var tmp18_elvis_lhs = _this__u8e3s4.tunnelsEnabled;
-    return new EnhanceOptions(tmp, tmp_0, tmp_1, tmp_2, tmp_5, tmp_8, tmp_9, tmp_10, tmp_15, tmp_16, new ElevationCorrectionOptions(tmp_17, tmp18_elvis_lhs == null ? d.n51_1.b51_1 : tmp18_elvis_lhs));
+    return new EnhanceOptions(tmp, tmp_0, tmp_1, tmp_2, tmp_5, tmp_8, tmp_9, tmp_10, tmp_15, tmp_16, new ElevationCorrectionOptions(tmp_17, tmp18_elvis_lhs == null ? d.x52_1.n50_1 : tmp18_elvis_lhs));
   }
   function elevationProviderFor(options) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -6150,7 +6223,7 @@
   }
   function parseCorridor(name) {
     _init_properties_EngineJsApi_kt__9bputf();
-    return name == null ? Companion_getInstance_23().j5f_1.a53_1 : Companion_instance_18.q17(name);
+    return name == null ? Companion_getInstance_23().y5f_1.p53_1 : Companion_instance_18.q17(name);
   }
   function defaultJsOptions() {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -6199,7 +6272,7 @@
   }
   function toCyclistPowerProvider(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
-    return toPowerSpec(_this__u8e3s4).l59();
+    return toPowerSpec(_this__u8e3s4).a5a();
   }
   function toPowerSpec(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -6207,7 +6280,7 @@
       return new CyclistPowerSpec();
     requireOnlyKeys(_this__u8e3s4, 'PowerProviderDto', get_POWER_PROVIDER_KEYS());
     var defaults = new CyclistPowerSpec();
-    var tmp0_elvis_lhs = Companion_instance_11.d59(_this__u8e3s4.type);
+    var tmp0_elvis_lhs = Companion_instance_11.s59(_this__u8e3s4.type);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -6218,17 +6291,17 @@
     }
     var tmp_0 = tmp;
     var tmp1_elvis_lhs = _this__u8e3s4.power;
-    var tmp_1 = tmp1_elvis_lhs == null ? defaults.f59_1 : tmp1_elvis_lhs;
+    var tmp_1 = tmp1_elvis_lhs == null ? defaults.u59_1 : tmp1_elvis_lhs;
     var tmp2_elvis_lhs = _this__u8e3s4.criticalPower;
-    var tmp_2 = tmp2_elvis_lhs == null ? defaults.g59_1 : tmp2_elvis_lhs;
+    var tmp_2 = tmp2_elvis_lhs == null ? defaults.v59_1 : tmp2_elvis_lhs;
     var tmp3_elvis_lhs = _this__u8e3s4.wPrime;
-    var tmp_3 = tmp3_elvis_lhs == null ? defaults.h59_1 : tmp3_elvis_lhs;
+    var tmp_3 = tmp3_elvis_lhs == null ? defaults.w59_1 : tmp3_elvis_lhs;
     var tmp4_elvis_lhs = _this__u8e3s4.useHarmonics;
-    var tmp_4 = tmp4_elvis_lhs == null ? defaults.i59_1 : tmp4_elvis_lhs;
+    var tmp_4 = tmp4_elvis_lhs == null ? defaults.x59_1 : tmp4_elvis_lhs;
     var tmp5_elvis_lhs = _this__u8e3s4.pacing;
-    var tmp_5 = tmp5_elvis_lhs == null ? defaults.j59_1 : tmp5_elvis_lhs;
+    var tmp_5 = tmp5_elvis_lhs == null ? defaults.y59_1 : tmp5_elvis_lhs;
     var tmp6_elvis_lhs = _this__u8e3s4.maxSlewWPerS;
-    return new CyclistPowerSpec(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp6_elvis_lhs == null ? defaults.k59_1 : tmp6_elvis_lhs);
+    return new CyclistPowerSpec(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp6_elvis_lhs == null ? defaults.z59_1 : tmp6_elvis_lhs);
   }
   function requireOnlyKeys(_this__u8e3s4, dtoName, allowed) {
     _init_properties_EngineJsApi_kt__9bputf();
@@ -6257,33 +6330,33 @@
   function toDto(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
     var o = {};
-    o.startDistanceM = _this__u8e3s4.k55_1;
-    o.endDistanceM = _this__u8e3s4.l55_1;
-    o.startElevationM = _this__u8e3s4.m55_1;
-    o.endElevationM = _this__u8e3s4.n55_1;
-    o.lengthM = _this__u8e3s4.g55();
-    o.elevationGainM = _this__u8e3s4.h55();
-    o.grade = _this__u8e3s4.o55();
+    o.startDistanceM = _this__u8e3s4.z55_1;
+    o.endDistanceM = _this__u8e3s4.a56_1;
+    o.startElevationM = _this__u8e3s4.b56_1;
+    o.endElevationM = _this__u8e3s4.c56_1;
+    o.lengthM = _this__u8e3s4.v55();
+    o.elevationGainM = _this__u8e3s4.w55();
+    o.grade = _this__u8e3s4.d56();
     // Inline function 'kotlin.js.unsafeCast' call
     return o;
   }
   function toDto_0(_this__u8e3s4) {
     _init_properties_EngineJsApi_kt__9bputf();
     var o = {};
-    o.startIndex = _this__u8e3s4.w54_1;
-    o.endIndex = _this__u8e3s4.x54_1;
-    o.startDistanceM = _this__u8e3s4.y54_1;
-    o.endDistanceM = _this__u8e3s4.z54_1;
-    o.startElevationM = _this__u8e3s4.a55_1;
-    o.endElevationM = _this__u8e3s4.b55_1;
-    o.lengthM = _this__u8e3s4.g55();
-    o.elevationGainM = _this__u8e3s4.h55();
-    o.averageGrade = _this__u8e3s4.i55();
-    o.climbingGrade = _this__u8e3s4.j55();
-    o.positiveElevationM = _this__u8e3s4.c55_1;
-    o.negativeElevationM = _this__u8e3s4.d55_1;
+    o.startIndex = _this__u8e3s4.l55_1;
+    o.endIndex = _this__u8e3s4.m55_1;
+    o.startDistanceM = _this__u8e3s4.n55_1;
+    o.endDistanceM = _this__u8e3s4.o55_1;
+    o.startElevationM = _this__u8e3s4.p55_1;
+    o.endElevationM = _this__u8e3s4.q55_1;
+    o.lengthM = _this__u8e3s4.v55();
+    o.elevationGainM = _this__u8e3s4.w55();
+    o.averageGrade = _this__u8e3s4.x55();
+    o.climbingGrade = _this__u8e3s4.y55();
+    o.positiveElevationM = _this__u8e3s4.r55_1;
+    o.negativeElevationM = _this__u8e3s4.s55_1;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.f55_1;
+    var this_0 = _this__u8e3s4.u55_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.l();
@@ -6300,32 +6373,32 @@
   function cornerObj(c) {
     _init_properties_EngineJsApi_kt__9bputf();
     var o = {};
-    o.fromIndex = c.n5c_1;
-    o.untilIndex = c.o5c_1;
-    o.apexIndex = c.p5c_1;
-    o.kind = c.q5c_1.u1_1;
-    o.turnRad = c.r5c_1;
-    o.direction = c.s5c_1;
-    o.radiusQ20M = c.t5c_1;
-    o.radiusMinM = c.u5c_1;
-    o.lengthM = c.v5c_1;
+    o.fromIndex = c.c5d_1;
+    o.untilIndex = c.d5d_1;
+    o.apexIndex = c.e5d_1;
+    o.kind = c.f5d_1.u1_1;
+    o.turnRad = c.g5d_1;
+    o.direction = c.h5d_1;
+    o.radiusQ20M = c.i5d_1;
+    o.radiusMinM = c.j5d_1;
+    o.lengthM = c.k5d_1;
     // Inline function 'kotlin.js.unsafeCast' call
     return o;
   }
   function enhance$slambda($path, $provider, $opts, resultContinuation) {
-    this.s5f_1 = $path;
-    this.t5f_1 = $provider;
-    this.u5f_1 = $opts;
+    this.h5g_1 = $path;
+    this.i5g_1 = $provider;
+    this.j5g_1 = $opts;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(enhance$slambda).w5f = function ($this$promise, $completion) {
+  protoOf(enhance$slambda).l5g = function ($this$promise, $completion) {
     var tmp = this.m18($this$promise, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
     return tmp.o7();
   };
   protoOf(enhance$slambda).w7 = function (p1, $completion) {
-    return this.w5f((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.l5g((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(enhance$slambda).o7 = function () {
     var suspendResult = this.i7_1;
@@ -6336,7 +6409,7 @@
           case 0:
             this.h7_1 = 2;
             this.g7_1 = 1;
-            suspendResult = Enhancer_instance.o54(this.s5f_1, this.t5f_1, this.u5f_1, this);
+            suspendResult = Enhancer_instance.d55(this.h5g_1, this.i5g_1, this.j5g_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -6359,30 +6432,30 @@
      while (true);
   };
   protoOf(enhance$slambda).m18 = function ($this$promise, completion) {
-    var i = new enhance$slambda(this.s5f_1, this.t5f_1, this.u5f_1, completion);
-    i.v5f_1 = $this$promise;
+    var i = new enhance$slambda(this.h5g_1, this.i5g_1, this.j5g_1, completion);
+    i.k5g_1 = $this$promise;
     return i;
   };
   function enhance$slambda_0($path, $provider, $opts, resultContinuation) {
     var i = new enhance$slambda($path, $provider, $opts, resultContinuation);
     return constructCallableReference(function ($this$promise, $completion) {
-      return i.w5f($this$promise, $completion);
+      return i.l5g($this$promise, $completion);
     }, 1);
   }
   function enhanceWithCourse$slambda($course, $opts, $provider, resultContinuation) {
-    this.f5g_1 = $course;
-    this.g5g_1 = $opts;
-    this.h5g_1 = $provider;
+    this.u5g_1 = $course;
+    this.v5g_1 = $opts;
+    this.w5g_1 = $provider;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(enhanceWithCourse$slambda).w5f = function ($this$promise, $completion) {
+  protoOf(enhanceWithCourse$slambda).l5g = function ($this$promise, $completion) {
     var tmp = this.m18($this$promise, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
     return tmp.o7();
   };
   protoOf(enhanceWithCourse$slambda).w7 = function (p1, $completion) {
-    return this.w5f((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
+    return this.l5g((!(p1 == null) ? isInterface(p1, CoroutineScope) : false) ? p1 : THROW_CCE(), $completion);
   };
   protoOf(enhanceWithCourse$slambda).o7 = function () {
     var suspendResult = this.i7_1;
@@ -6393,7 +6466,7 @@
           case 0:
             this.h7_1 = 2;
             this.g7_1 = 1;
-            suspendResult = Enhancer_instance.p54(this.f5g_1, this.g5g_1, this.h5g_1, this);
+            suspendResult = Enhancer_instance.e55(this.u5g_1, this.v5g_1, this.w5g_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -6416,14 +6489,14 @@
      while (true);
   };
   protoOf(enhanceWithCourse$slambda).m18 = function ($this$promise, completion) {
-    var i = new enhanceWithCourse$slambda(this.f5g_1, this.g5g_1, this.h5g_1, completion);
-    i.i5g_1 = $this$promise;
+    var i = new enhanceWithCourse$slambda(this.u5g_1, this.v5g_1, this.w5g_1, completion);
+    i.x5g_1 = $this$promise;
     return i;
   };
   function enhanceWithCourse$slambda_0($course, $opts, $provider, resultContinuation) {
     var i = new enhanceWithCourse$slambda($course, $opts, $provider, resultContinuation);
     return constructCallableReference(function ($this$promise, $completion) {
-      return i.w5f($this$promise, $completion);
+      return i.l5g($this$promise, $completion);
     }, 1);
   }
   var properties_initialized_EngineJsApi_kt_2x4hj5;
@@ -6439,10 +6512,11 @@
     }
   }
   //region block: post-declaration
-  protoOf(CyclistPowerProviderBase).p58 = onDelivered;
-  protoOf(PowerProviderFromData).p58 = onDelivered;
+  protoOf(CyclistPowerProviderBase).e59 = onDelivered;
+  protoOf(PowerProviderFromData).e59 = onDelivered;
   //endregion
   //region block: init
+  ElevationCorrection_instance = new ElevationCorrection();
   Enhancer_instance = new Enhancer();
   Companion_instance_9 = new Companion_6();
   ClimbDetector_instance = new ClimbDetector();