@glandais/vcyclist-engine 6.3.0 → 6.5.0

package/vcyclist-gpx.js

@@ -215,24 +215,27 @@
   initMetadataForClass(DeckProfiles, 'DeckProfiles');
   initMetadataForClass(sam$kotlin_Comparator$0_0, 'sam$kotlin_Comparator$0', VOID, VOID, [Comparator, FunctionAdapter]);
   initMetadataForObject(DeckProfileBuilder, 'DeckProfileBuilder');
+  initMetadataForClass(ElevationCorrections, 'ElevationCorrections');
   initMetadataForCompanion(Companion_3);
+  initMetadataForClass(ElevationCorrectionStatus, 'ElevationCorrectionStatus', VOID, Enum);
+  initMetadataForCompanion(Companion_4);
   initMetadataForClass(ElevationGainResult, 'ElevationGainResult');
   initMetadataForClass(Banked, 'Banked');
   initMetadataForObject(ElevationGain, 'ElevationGain');
-  initMetadataForCompanion(Companion_4);
-  initMetadataForClass(ElevationGainPreset, 'ElevationGainPreset', VOID, Enum);
   initMetadataForCompanion(Companion_5);
+  initMetadataForClass(ElevationGainPreset, 'ElevationGainPreset', VOID, Enum);
+  initMetadataForCompanion(Companion_6);
   initMetadataForClass(ElevationGainOptions, 'ElevationGainOptions', ElevationGainOptions);
   initMetadataForCoroutine($fixElevationCOROUTINE$, CoroutineImpl);
   initMetadataForObject(ElevationStep, 'ElevationStep', VOID, VOID, VOID, [2]);
   initMetadataForObject(FieldInterpolation, 'FieldInterpolation');
   initMetadataForClass(GeneratedPath, 'GeneratedPath');
-  initMetadataForCompanion(Companion_6);
-  initMetadataForClass(BoundsRad, 'BoundsRad');
   initMetadataForCompanion(Companion_7);
+  initMetadataForClass(BoundsRad, 'BoundsRad');
+  initMetadataForCompanion(Companion_8);
   initMetadataForClass(Path, 'Path', VOID, GeneratedPath);
   initMetadataForObject(PathSimplifier, 'PathSimplifier');
-  initMetadataForCompanion(Companion_8);
+  initMetadataForCompanion(Companion_9);
   initMetadataForClass(PointField, 'PointField', VOID, Enum);
   initMetadataForClass(PointFieldCategory, 'PointFieldCategory', VOID, Enum);
   initMetadataForClass(Copy, 'Copy');
@@ -245,7 +248,7 @@
   initMetadataForClass(Stations, 'Stations');
   initMetadataForObject(TunnelDetector, 'TunnelDetector');
   initMetadataForClass(TunnelProfile, 'TunnelProfile');
-  initMetadataForCompanion(Companion_9);
+  initMetadataForCompanion(Companion_10);
   initMetadataForClass(TunnelDetectorOptions, 'TunnelDetectorOptions', TunnelDetectorOptions);
   //endregion
   var static_init_called;
@@ -1817,7 +1820,7 @@
       var width = tmp9_elvis_lhs == null ? OsmHighway_getInstance().r24(p.z22_1) : tmp9_elvis_lhs;
       path.s24(i, !(width == null) && get_PLAUSIBLE_ROAD_WIDTH_M().u(width) ? width : NaN);
     }
-    path.e25();
+    path.f25();
     return path;
   }
   var properties_initialized_GpxToPath_kt_83hcm9;
@@ -2124,17 +2127,17 @@
     w.a1m(namespace, localName, prefix);
   }
   function GpxWriter() {
-    this.f25_1 = 'http://www.topografix.com/GPX/1/1';
-    this.g25_1 = 'http://www.w3.org/2001/XMLSchema-instance';
-    this.h25_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
-    this.i25_1 = 'https://github.com/glandais/vcyclist/xmlschemas/v1';
-    this.j25_1 = 'vc';
-    this.k25_1 = 'xsi';
-    this.l25_1 = 'gpxtpx';
-    this.m25_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
-    this.n25_1 = '@glandais/vcyclist';
-  }
-  protoOf(GpxWriter).o25 = function (document, writeExtensions) {
+    this.g25_1 = 'http://www.topografix.com/GPX/1/1';
+    this.h25_1 = 'http://www.w3.org/2001/XMLSchema-instance';
+    this.i25_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
+    this.j25_1 = 'https://github.com/glandais/vcyclist/xmlschemas/v1';
+    this.k25_1 = 'vc';
+    this.l25_1 = 'xsi';
+    this.m25_1 = 'gpxtpx';
+    this.n25_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
+    this.o25_1 = '@glandais/vcyclist';
+  }
+  protoOf(GpxWriter).p25 = function (document, writeExtensions) {
     var out = StringBuilder_init_$Create$();
     out.u6('<?xml version="1.0" encoding="UTF-8"?>\n');
     var writer = newGenericWriter(get_xmlStreaming(), out, false, XmlDeclMode_None_getInstance());
@@ -2252,11 +2255,11 @@
     while (i < refs.o()) {
       var high = refs.p(i);
       var low = getOrNull(refs, i + 1 | 0);
-      if (!(low == null) && high.q25_1 === low.p25_1 && isHighSurrogate_0($this, high.r25_1) && isLowSurrogate_0($this, low.r25_1)) {
-        sb.y9(xml, copiedUpTo, high.p25_1);
-        var codePoint = (65536 + imul(high.r25_1 - 55296 | 0, 1024) | 0) + (low.r25_1 - 56320 | 0) | 0;
+      if (!(low == null) && high.r25_1 === low.q25_1 && isHighSurrogate_0($this, high.s25_1) && isLowSurrogate_0($this, low.s25_1)) {
+        sb.y9(xml, copiedUpTo, high.q25_1);
+        var codePoint = (65536 + imul(high.s25_1 - 55296 | 0, 1024) | 0) + (low.s25_1 - 56320 | 0) | 0;
         sb.u6('&#').aa(codePoint).v6(_Char___init__impl__6a9atx(59));
-        copiedUpTo = low.q25_1;
+        copiedUpTo = low.r25_1;
         count = count + 1 | 0;
         i = i + 2 | 0;
       } else {
@@ -2269,17 +2272,17 @@
     return new Pair(sb.toString(), count);
   }
   function NumericRef(start, end, value) {
-    this.p25_1 = start;
-    this.q25_1 = end;
-    this.r25_1 = value;
+    this.q25_1 = start;
+    this.r25_1 = end;
+    this.s25_1 = value;
   }
   protoOf(NumericRef).toString = function () {
-    return 'NumericRef(start=' + this.p25_1 + ', end=' + this.q25_1 + ', value=' + this.r25_1 + ')';
+    return 'NumericRef(start=' + this.q25_1 + ', end=' + this.r25_1 + ', value=' + this.s25_1 + ')';
   };
   protoOf(NumericRef).hashCode = function () {
-    var result = this.p25_1;
-    result = imul(result, 31) + this.q25_1 | 0;
+    var result = this.q25_1;
     result = imul(result, 31) + this.r25_1 | 0;
+    result = imul(result, 31) + this.s25_1 | 0;
     return result;
   };
   protoOf(NumericRef).equals = function (other) {
@@ -2287,12 +2290,12 @@
       return true;
     if (!(other instanceof NumericRef))
       return false;
-    if (!(this.p25_1 === other.p25_1))
-      return false;
     if (!(this.q25_1 === other.q25_1))
       return false;
     if (!(this.r25_1 === other.r25_1))
       return false;
+    if (!(this.s25_1 === other.s25_1))
+      return false;
     return true;
   };
   function findNumericReferences($this, xml) {
@@ -2410,9 +2413,9 @@
     this.f24_1 = 20;
   }
   protoOf(GpxXmlRepair).g24 = function (xml) {
-    return this.u25(xml).s25_1;
+    return this.v25(xml).t25_1;
   };
-  protoOf(GpxXmlRepair).u25 = function (xml) {
+  protoOf(GpxXmlRepair).v25 = function (xml) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var repairs = ArrayList_init_$Create$();
     var current = xml;
@@ -2471,15 +2474,15 @@
     return GpxXmlRepair_instance;
   }
   function RepairResult(xml, repairs) {
-    this.s25_1 = xml;
-    this.t25_1 = repairs;
+    this.t25_1 = xml;
+    this.u25_1 = repairs;
   }
   protoOf(RepairResult).toString = function () {
-    return 'RepairResult(xml=' + this.s25_1 + ', repairs=' + toString_0(this.t25_1) + ')';
+    return 'RepairResult(xml=' + this.t25_1 + ', repairs=' + toString_0(this.u25_1) + ')';
   };
   protoOf(RepairResult).hashCode = function () {
-    var result = getStringHashCode(this.s25_1);
-    result = imul(result, 31) + hashCode(this.t25_1) | 0;
+    var result = getStringHashCode(this.t25_1);
+    result = imul(result, 31) + hashCode(this.u25_1) | 0;
     return result;
   };
   protoOf(RepairResult).equals = function (other) {
@@ -2487,9 +2490,9 @@
       return true;
     if (!(other instanceof RepairResult))
       return false;
-    if (!(this.s25_1 === other.s25_1))
+    if (!(this.t25_1 === other.t25_1))
       return false;
-    if (!equals(this.t25_1, other.t25_1))
+    if (!equals(this.u25_1, other.u25_1))
       return false;
     return true;
   };
@@ -2543,9 +2546,9 @@
     var negative = value < 0.0;
     // Inline function 'kotlin.math.abs' call
     var absValue = Math.abs(value);
-    var scale = toNumber($this.w25_1[decimals]);
+    var scale = toNumber($this.x25_1[decimals]);
     var scaledLong = numberToLong(round(absValue * scale));
-    var whole = $this.w25_1[decimals];
+    var whole = $this.x25_1[decimals];
     var intPart = divide(scaledLong, whole);
     var sign = negative && !equalsLong(scaledLong, new Long(0, 0)) ? '-' : '';
     var tmp;
@@ -2559,7 +2562,7 @@
   }
   function CsvNumberFormat() {
     CsvNumberFormat_instance = this;
-    this.v25_1 = 12;
+    this.w25_1 = 12;
     var tmp = this;
     // Inline function 'kotlin.also' call
     var this_0 = longArray(13);
@@ -2574,9 +2577,9 @@
         p = multiply(p, new Long(10, 0));
       }
        while (inductionVariable <= last);
-    tmp.w25_1 = this_0;
+    tmp.x25_1 = this_0;
   }
-  protoOf(CsvNumberFormat).x25 = function (value, decimals) {
+  protoOf(CsvNumberFormat).y25 = function (value, decimals) {
     if (isNaN_0(value))
       return '';
     if (isInfinite(value))
@@ -2606,21 +2609,21 @@
     unitsInHeader = unitsInHeader === VOID ? true : unitsInHeader;
     decimals = decimals === VOID ? null : decimals;
     lineSeparator = lineSeparator === VOID ? '\n' : lineSeparator;
-    this.y25_1 = fields;
-    this.z25_1 = separator;
-    this.a26_1 = unitsInHeader;
-    this.b26_1 = decimals;
-    this.c26_1 = lineSeparator;
+    this.z25_1 = fields;
+    this.a26_1 = separator;
+    this.b26_1 = unitsInHeader;
+    this.c26_1 = decimals;
+    this.d26_1 = lineSeparator;
   }
   protoOf(CsvOptions).toString = function () {
-    return 'CsvOptions(fields=' + toString(this.y25_1) + ', separator=' + toString_1(this.z25_1) + ', unitsInHeader=' + this.a26_1 + ', decimals=' + this.b26_1 + ', lineSeparator=' + this.c26_1 + ')';
+    return 'CsvOptions(fields=' + toString(this.z25_1) + ', separator=' + toString_1(this.a26_1) + ', unitsInHeader=' + this.b26_1 + ', decimals=' + this.c26_1 + ', lineSeparator=' + this.d26_1 + ')';
   };
   protoOf(CsvOptions).hashCode = function () {
-    var result = this.y25_1 == null ? 0 : hashCode(this.y25_1);
-    result = imul(result, 31) + Char__hashCode_impl_otmys(this.z25_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.a26_1) | 0;
-    result = imul(result, 31) + (this.b26_1 == null ? 0 : this.b26_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.c26_1) | 0;
+    var result = this.z25_1 == null ? 0 : hashCode(this.z25_1);
+    result = imul(result, 31) + Char__hashCode_impl_otmys(this.a26_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.b26_1) | 0;
+    result = imul(result, 31) + (this.c26_1 == null ? 0 : this.c26_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.d26_1) | 0;
     return result;
   };
   protoOf(CsvOptions).equals = function (other) {
@@ -2628,20 +2631,20 @@
       return true;
     if (!(other instanceof CsvOptions))
       return false;
-    if (!equals(this.y25_1, other.y25_1))
-      return false;
-    if (!(this.z25_1 === other.z25_1))
+    if (!equals(this.z25_1, other.z25_1))
       return false;
     if (!(this.a26_1 === other.a26_1))
       return false;
-    if (!(this.b26_1 == other.b26_1))
+    if (!(this.b26_1 === other.b26_1))
+      return false;
+    if (!(this.c26_1 == other.c26_1))
       return false;
-    if (!(this.c26_1 === other.c26_1))
+    if (!(this.d26_1 === other.d26_1))
       return false;
     return true;
   };
   function headerFor($this, field, unitsInHeader) {
-    return unitsInHeader ? field.f26_1 + ' (' + field.g26_1 + ')' : field.f26_1;
+    return unitsInHeader ? field.g26_1 + ' (' + field.h26_1 + ')' : field.g26_1;
   }
   function appendRow($this, sb, cells, options) {
     var iterator = cells.l();
@@ -2651,9 +2654,9 @@
       index = index + 1 | 0;
       var cell = iterator.n();
       if (i > 0) {
-        sb.v6(options.z25_1);
+        sb.v6(options.a26_1);
       }
-      sb.u6(escapeCsvCell($this, cell, options.z25_1));
+      sb.u6(escapeCsvCell($this, cell, options.a26_1));
     }
   }
   function escapeCsvCell($this, cell, separator) {
@@ -2682,9 +2685,9 @@
   }
   function CsvWriter() {
   }
-  protoOf(CsvWriter).m26 = function (path, options) {
-    var tmp0_elvis_lhs = options.y25_1;
-    var fields = tmp0_elvis_lhs == null ? get_entries_2() : tmp0_elvis_lhs;
+  protoOf(CsvWriter).n26 = function (path, options) {
+    var tmp0_elvis_lhs = options.z25_1;
+    var fields = tmp0_elvis_lhs == null ? get_entries_3() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
@@ -2692,7 +2695,7 @@
     var _iterator__ex2g4s = fields.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.a26_1);
+      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.b26_1);
       destination.k(tmp$ret$2);
     }
     appendRow(this, sb, destination, options);
@@ -2702,14 +2705,14 @@
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        sb.u6(options.c26_1);
+        sb.u6(options.d26_1);
         // Inline function 'kotlin.collections.map' call
         // Inline function 'kotlin.collections.mapTo' call
         var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(fields, 10));
         var _iterator__ex2g4s_0 = fields.l();
         while (_iterator__ex2g4s_0.m()) {
           var item_0 = _iterator__ex2g4s_0.n();
-          var tmp$ret$5 = CsvNumberFormat_getInstance().x25(path.n26(i, item_0), options.b26_1);
+          var tmp$ret$5 = CsvNumberFormat_getInstance().y25(path.o26(i, item_0), options.c26_1);
           destination_0.k(tmp$ret$5);
         }
         appendRow(this, sb, destination_0, options);
@@ -2726,19 +2729,19 @@
     pretty = pretty === VOID ? false : pretty;
     decimals = decimals === VOID ? null : decimals;
     includeMeta = includeMeta === VOID ? true : includeMeta;
-    this.o26_1 = fields;
-    this.p26_1 = pretty;
-    this.q26_1 = decimals;
-    this.r26_1 = includeMeta;
+    this.p26_1 = fields;
+    this.q26_1 = pretty;
+    this.r26_1 = decimals;
+    this.s26_1 = includeMeta;
   }
   protoOf(JsonOptions).toString = function () {
-    return 'JsonOptions(fields=' + toString(this.o26_1) + ', pretty=' + this.p26_1 + ', decimals=' + this.q26_1 + ', includeMeta=' + this.r26_1 + ')';
+    return 'JsonOptions(fields=' + toString(this.p26_1) + ', pretty=' + this.q26_1 + ', decimals=' + this.r26_1 + ', includeMeta=' + this.s26_1 + ')';
   };
   protoOf(JsonOptions).hashCode = function () {
-    var result = this.o26_1 == null ? 0 : hashCode(this.o26_1);
-    result = imul(result, 31) + getBooleanHashCode(this.p26_1) | 0;
-    result = imul(result, 31) + (this.q26_1 == null ? 0 : this.q26_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.r26_1) | 0;
+    var result = this.p26_1 == null ? 0 : hashCode(this.p26_1);
+    result = imul(result, 31) + getBooleanHashCode(this.q26_1) | 0;
+    result = imul(result, 31) + (this.r26_1 == null ? 0 : this.r26_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.s26_1) | 0;
     return result;
   };
   protoOf(JsonOptions).equals = function (other) {
@@ -2746,13 +2749,13 @@
       return true;
     if (!(other instanceof JsonOptions))
       return false;
-    if (!equals(this.o26_1, other.o26_1))
+    if (!equals(this.p26_1, other.p26_1))
       return false;
-    if (!(this.p26_1 === other.p26_1))
+    if (!(this.q26_1 === other.q26_1))
       return false;
-    if (!(this.q26_1 == other.q26_1))
+    if (!(this.r26_1 == other.r26_1))
       return false;
-    if (!(this.r26_1 === other.r26_1))
+    if (!(this.s26_1 === other.s26_1))
       return false;
     return true;
   };
@@ -2762,7 +2765,7 @@
     sb.v6(_Char___init__impl__6a9atx(123)).u6(nl);
     appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.v24_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.c25_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.d25_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
     appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.y24_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
@@ -2781,7 +2784,7 @@
       var i = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyValueRaw($this, sb, innerUnits, $this.s26(field.f26_1), '"' + $this.s26(field.g26_1) + '"', colon);
+      appendKeyValueRaw($this, sb, innerUnits, $this.t26(field.g26_1), '"' + $this.t26(field.h26_1) + '"', colon);
       if (!(i === get_lastIndex(fields))) {
         sb.v6(_Char___init__impl__6a9atx(44));
       }
@@ -2799,7 +2802,7 @@
       var fi = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyRaw($this, sb, inner, $this.s26(field.f26_1), colon);
+      appendKeyRaw($this, sb, inner, $this.t26(field.g26_1), colon);
       sb.v6(_Char___init__impl__6a9atx(91));
       var inductionVariable = 0;
       var last = path.l23_1;
@@ -2810,7 +2813,7 @@
           if (i > 0) {
             sb.v6(_Char___init__impl__6a9atx(44));
           }
-          sb.u6(numberOrNull($this, path.n26(i, field), options.q26_1));
+          sb.u6(numberOrNull($this, path.o26(i, field), options.r26_1));
         }
          while (inductionVariable < last);
       sb.v6(_Char___init__impl__6a9atx(93));
@@ -2827,7 +2830,7 @@
     if (isNaN_0(value) || isInfinite(value)) {
       tmp = 'null';
     } else {
-      tmp = CsvNumberFormat_getInstance().x25(value, decimals);
+      tmp = CsvNumberFormat_getInstance().y25(value, decimals);
     }
     return tmp;
   }
@@ -2840,18 +2843,18 @@
   }
   function JsonWriter() {
   }
-  protoOf(JsonWriter).t26 = function (path, options) {
-    var tmp0_elvis_lhs = options.o26_1;
-    var fields = tmp0_elvis_lhs == null ? get_entries_2() : tmp0_elvis_lhs;
+  protoOf(JsonWriter).u26 = function (path, options) {
+    var tmp0_elvis_lhs = options.p26_1;
+    var fields = tmp0_elvis_lhs == null ? get_entries_3() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
-    var indent = options.p26_1 ? '  ' : '';
-    var nl = options.p26_1 ? '\n' : '';
-    var colon = options.p26_1 ? ': ' : ':';
+    var indent = options.q26_1 ? '  ' : '';
+    var nl = options.q26_1 ? '\n' : '';
+    var colon = options.q26_1 ? ': ' : ':';
     sb.v6(_Char___init__impl__6a9atx(123)).u6(nl);
     appendKeyValueRaw(this, sb, indent, 'size', path.l23_1.toString(), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    if (options.r26_1) {
-      appendMeta(this, sb, path, fields, options.q26_1, indent, nl, colon);
+    if (options.s26_1) {
+      appendMeta(this, sb, path, fields, options.r26_1, indent, nl, colon);
       sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
     }
     appendKeyRaw(this, sb, indent, 'fields', colon);
@@ -2859,7 +2862,7 @@
     sb.u6(nl).v6(_Char___init__impl__6a9atx(125));
     return sb.toString();
   };
-  protoOf(JsonWriter).s26 = function (value) {
+  protoOf(JsonWriter).t26 = function (value) {
     var sb = StringBuilder_init_$Create$_0(value.length);
     var inductionVariable = 0;
     var last = value.length;
@@ -2895,17 +2898,17 @@
     return JsonWriter_instance;
   }
   function DeckDetection(accepted, rejected, tallRunsTooShort) {
-    this.u26_1 = accepted;
-    this.v26_1 = rejected;
-    this.w26_1 = tallRunsTooShort;
+    this.v26_1 = accepted;
+    this.w26_1 = rejected;
+    this.x26_1 = tallRunsTooShort;
   }
   protoOf(DeckDetection).toString = function () {
-    return 'DeckDetection(accepted=' + toString_0(this.u26_1) + ', rejected=' + toString_0(this.v26_1) + ', tallRunsTooShort=' + this.w26_1 + ')';
+    return 'DeckDetection(accepted=' + toString_0(this.v26_1) + ', rejected=' + toString_0(this.w26_1) + ', tallRunsTooShort=' + this.x26_1 + ')';
   };
   protoOf(DeckDetection).hashCode = function () {
-    var result = hashCode(this.u26_1);
-    result = imul(result, 31) + hashCode(this.v26_1) | 0;
-    result = imul(result, 31) + this.w26_1 | 0;
+    var result = hashCode(this.v26_1);
+    result = imul(result, 31) + hashCode(this.w26_1) | 0;
+    result = imul(result, 31) + this.x26_1 | 0;
     return result;
   };
   protoOf(DeckDetection).equals = function (other) {
@@ -2913,34 +2916,34 @@
       return true;
     if (!(other instanceof DeckDetection))
       return false;
-    if (!equals(this.u26_1, other.u26_1))
-      return false;
     if (!equals(this.v26_1, other.v26_1))
       return false;
-    if (!(this.w26_1 === other.w26_1))
+    if (!equals(this.w26_1, other.w26_1))
+      return false;
+    if (!(this.x26_1 === other.x26_1))
       return false;
     return true;
   };
   function DeckCandidate(first, last, startM, endM, metrics, rejection, deckRanges) {
-    this.x26_1 = first;
-    this.y26_1 = last;
-    this.z26_1 = startM;
-    this.a27_1 = endM;
-    this.b27_1 = metrics;
-    this.c27_1 = rejection;
-    this.d27_1 = deckRanges;
+    this.y26_1 = first;
+    this.z26_1 = last;
+    this.a27_1 = startM;
+    this.b27_1 = endM;
+    this.c27_1 = metrics;
+    this.d27_1 = rejection;
+    this.e27_1 = deckRanges;
   }
   protoOf(DeckCandidate).toString = function () {
-    return 'DeckCandidate(first=' + this.x26_1 + ', last=' + this.y26_1 + ', startM=' + this.z26_1 + ', endM=' + this.a27_1 + ', metrics=' + toString(this.b27_1) + ', rejection=' + toString(this.c27_1) + ', deckRanges=' + toString_0(this.d27_1) + ')';
+    return 'DeckCandidate(first=' + this.y26_1 + ', last=' + this.z26_1 + ', startM=' + this.a27_1 + ', endM=' + this.b27_1 + ', metrics=' + toString(this.c27_1) + ', rejection=' + toString(this.d27_1) + ', deckRanges=' + toString_0(this.e27_1) + ')';
   };
   protoOf(DeckCandidate).hashCode = function () {
-    var result = this.x26_1;
-    result = imul(result, 31) + this.y26_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z26_1) | 0;
+    var result = this.y26_1;
+    result = imul(result, 31) + this.z26_1 | 0;
     result = imul(result, 31) + getNumberHashCode(this.a27_1) | 0;
-    result = imul(result, 31) + (this.b27_1 == null ? 0 : this.b27_1.hashCode()) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.b27_1) | 0;
     result = imul(result, 31) + (this.c27_1 == null ? 0 : this.c27_1.hashCode()) | 0;
-    result = imul(result, 31) + hashCode(this.d27_1) | 0;
+    result = imul(result, 31) + (this.d27_1 == null ? 0 : this.d27_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.e27_1) | 0;
     return result;
   };
   protoOf(DeckCandidate).equals = function (other) {
@@ -2948,11 +2951,9 @@
       return true;
     if (!(other instanceof DeckCandidate))
       return false;
-    if (!(this.x26_1 === other.x26_1))
-      return false;
     if (!(this.y26_1 === other.y26_1))
       return false;
-    if (!equals(this.z26_1, other.z26_1))
+    if (!(this.z26_1 === other.z26_1))
       return false;
     if (!equals(this.a27_1, other.a27_1))
       return false;
@@ -2962,11 +2963,13 @@
       return false;
     if (!equals(this.d27_1, other.d27_1))
       return false;
+    if (!equals(this.e27_1, other.e27_1))
+      return false;
     return true;
   };
   function Companion_1() {
   }
-  protoOf(Companion_1).e27 = function (mnsM, mntM) {
+  protoOf(Companion_1).f27 = function (mnsM, mntM) {
     // Inline function 'kotlin.require' call
     if (!(mnsM.length === mntM.length)) {
       var message = 'MNS and MNT sizes differ: ' + mnsM.length + ', ' + mntM.length;
@@ -2987,23 +2990,23 @@
     return Companion_instance_2;
   }
   function DeckProfile(mnhM, mnsM, mntM) {
-    this.f27_1 = mnhM;
-    this.g27_1 = mnsM;
-    this.h27_1 = mntM;
+    this.g27_1 = mnhM;
+    this.h27_1 = mnsM;
+    this.i27_1 = mntM;
     // Inline function 'kotlin.require' call
-    if (!(this.f27_1.length === this.g27_1.length && this.g27_1.length === this.h27_1.length)) {
-      var message = 'MNH, MNS and MNT must have one sample per station: ' + this.f27_1.length + ', ' + this.g27_1.length + ', ' + this.h27_1.length;
+    if (!(this.g27_1.length === this.h27_1.length && this.h27_1.length === this.i27_1.length)) {
+      var message = 'MNH, MNS and MNT must have one sample per station: ' + this.g27_1.length + ', ' + this.h27_1.length + ', ' + this.i27_1.length;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   protoOf(DeckProfile).o = function () {
-    return this.f27_1.length;
+    return this.g27_1.length;
   };
   function SurfaceState(mnh, mf, rough, clean) {
-    this.i27_1 = mnh;
-    this.j27_1 = mf;
-    this.k27_1 = rough;
-    this.l27_1 = clean;
+    this.j27_1 = mnh;
+    this.k27_1 = mf;
+    this.l27_1 = rough;
+    this.m27_1 = clean;
   }
   function roughness($this, mns, mf, half) {
     var tmp = 0;
@@ -3017,7 +3020,7 @@
       tmp = tmp + 1 | 0;
     }
     var sq = tmp_1;
-    var mean = $this.m27(sq, half);
+    var mean = $this.n27(sq, half);
     var tmp_3 = 0;
     var tmp_4 = mns.length;
     var tmp_5 = new Float64Array(tmp_4);
@@ -3062,7 +3065,7 @@
     if (tmp_0) {
       tmp = NaN;
     } else {
-      tmp = $this.n27(values, 0.95);
+      tmp = $this.o27(values, 0.95);
     }
     return tmp;
   }
@@ -3091,16 +3094,16 @@
     return tmp;
   }
   function sam$kotlin_Comparator$0(function_0) {
-    this.o27_1 = function_0;
+    this.p27_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).la = function (a, b) {
-    return this.o27_1(a, b);
+    return this.p27_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.o27_1;
+    return this.p27_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
@@ -3123,8 +3126,8 @@
   function detect$classify($options, slope, clean, mns, mnh, rough, mnt, n, step, mf, span, fraction) {
     var a = span.oe_1;
     var b = span.pe_1;
-    var short = (b - a | 0) <= $options.o28();
-    var h = $options.p28();
+    var short = (b - a | 0) <= $options.p28();
+    var h = $options.q28();
     var tmp;
     if (short) {
       tmp = new Float64Array(0);
@@ -3144,8 +3147,8 @@
       tmp = tmp_2;
     }
     var rawSlopes = tmp;
-    var cleanFraction = short ? NaN : DeckDetector_instance.q28(clean, a, b, h);
-    var cleanSlopes = !short && $options.h28_1 ? DeckDetector_instance.r28(mns, mnh, clean, cleanFraction, a, b, $options) : null;
+    var cleanFraction = short ? NaN : DeckDetector_instance.r28(clean, a, b, h);
+    var cleanSlopes = !short && $options.i28_1 ? DeckDetector_instance.s28(mns, mnh, clean, cleanFraction, a, b, $options) : null;
     var slopes = cleanSlopes == null ? rawSlopes : cleanSlopes;
     var slopeP95 = p95OrNaN(DeckDetector_instance, slopes);
     var tmp_4;
@@ -3165,7 +3168,7 @@
       do {
         var element = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        if (mnh[element] > $options.q27_1) {
+        if (mnh[element] > $options.r27_1) {
           destination.k(element);
         }
       }
@@ -3325,7 +3328,7 @@
     }
     var tmp2_elvis_lhs = maxOrNull(destination_5);
     var metrics = new DeckMetrics(tmp_10, slopeP95, slopeMax, tmp_11, cleanFraction, tmp_12, roughness, fraction, tmp_13, mntDrop, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
-    var rejection = stoppedOnNaN || isNaN_0(mntDrop) ? DeckRejection_NO_DATA_getInstance() : !(mntDrop > $options.d28_1) ? DeckRejection_NO_CANYON_getInstance() : short && isNaN_0(roughness) ? DeckRejection_NO_DATA_getInstance() : short ? roughness < $options.c28_1 ? null : DeckRejection_SHORT_ROUGH_getInstance() : isNaN_0(slopeP95) ? DeckRejection_NO_DATA_getInstance() : slopeP95 <= $options.z27_1 && (b - a | 0) * step >= $options.a28_1 ? null : DeckRejection_STEEP_getInstance();
+    var rejection = stoppedOnNaN || isNaN_0(mntDrop) ? DeckRejection_NO_DATA_getInstance() : !(mntDrop > $options.e28_1) ? DeckRejection_NO_CANYON_getInstance() : short && isNaN_0(roughness) ? DeckRejection_NO_DATA_getInstance() : short ? roughness < $options.d28_1 ? null : DeckRejection_SHORT_ROUGH_getInstance() : isNaN_0(slopeP95) ? DeckRejection_NO_DATA_getInstance() : slopeP95 <= $options.a28_1 && (b - a | 0) * step >= $options.b28_1 ? null : DeckRejection_STEEP_getInstance();
     return to(metrics, rejection);
   }
   function DeckDetector$detect$lambda($mf) {
@@ -3335,8 +3338,8 @@
   }
   function DeckDetector$detect$lambda_0(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.x26_1;
-    var tmp$ret$2 = b.x26_1;
+    var tmp = a.y26_1;
+    var tmp$ret$2 = b.y26_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckDetector$detect$lambda_1($this) {
@@ -3347,8 +3350,8 @@
         tmp = previousCompare;
       } else {
         // Inline function 'kotlin.comparisons.compareValuesBy' call
-        var tmp_0 = a.y26_1;
-        var tmp$ret$2 = b.y26_1;
+        var tmp_0 = a.z26_1;
+        var tmp$ret$2 = b.z26_1;
         tmp = compareValues(tmp_0, tmp$ret$2);
       }
       return tmp;
@@ -3367,33 +3370,33 @@
   }
   function DeckDetector() {
   }
-  protoOf(DeckDetector).s28 = function (profile, options) {
+  protoOf(DeckDetector).t28 = function (profile, options) {
     var n = profile.o();
-    var mns = profile.g27_1;
-    var mnt = profile.h27_1;
-    var step = options.p27_1;
+    var mns = profile.h27_1;
+    var mnt = profile.i27_1;
+    var step = options.q27_1;
     if (n === 0)
       return new DeckDetection(emptyList(), emptyList(), 0);
-    var state = this.t28(profile, options);
-    var mnh = state.i27_1;
-    var mf = state.j27_1;
-    var rough = state.k27_1;
+    var state = this.u28(profile, options);
+    var mnh = state.j27_1;
+    var mf = state.k27_1;
+    var rough = state.l27_1;
     var tmp = 0;
     var tmp_0 = booleanArray(n);
     while (tmp < n) {
       var tmp_1 = tmp;
-      tmp_0[tmp_1] = mnh[tmp_1] > options.q27_1;
+      tmp_0[tmp_1] = mnh[tmp_1] > options.r27_1;
       tmp = tmp + 1 | 0;
     }
     var tall = tmp_0;
-    var tallRuns = this.u28(tall);
+    var tallRuns = this.v28(tall);
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tallRuns.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
-      if (((element.pe_1 - element.oe_1 | 0) + 1 | 0) >= options.v28()) {
+      if (((element.pe_1 - element.oe_1 | 0) + 1 | 0) >= options.w28()) {
         destination.k(element);
       }
     }
@@ -3426,7 +3429,7 @@
           do {
             var element_0 = inductionVariable;
             inductionVariable = inductionVariable + 1 | 0;
-            if (rough[element_0] < options.u27_1) {
+            if (rough[element_0] < options.v27_1) {
               count = count + 1 | 0;
               checkCountOverflow(count);
             }
@@ -3466,11 +3469,11 @@
       }
       var unknown = tmp$ret$6;
       var fraction = smooth / len;
-      if (fraction >= options.v27_1) {
+      if (fraction >= options.w27_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element_2 = to(r, fraction);
         kept.k(element_2);
-      } else if ((smooth + unknown | 0) / len >= options.v27_1) {
+      } else if ((smooth + unknown | 0) / len >= options.w27_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         noDataRuns.k(r);
       } else {
@@ -3478,7 +3481,7 @@
         roughRuns.k(r);
       }
     }
-    var gap = options.w28();
+    var gap = options.x28();
     var merged = ArrayList_init_$Create$();
     var _iterator__ex2g4s_1 = kept.l();
     while (_iterator__ex2g4s_1.m()) {
@@ -3499,15 +3502,15 @@
         merged.k(element_3);
       }
     }
-    var island = options.x28();
+    var island = options.y28();
     var spans = ArrayList_init_$Create$();
     var _iterator__ex2g4s_2 = merged.l();
     while (_iterator__ex2g4s_2.m()) {
       var _destruct__k2r9zo_0 = _iterator__ex2g4s_2.n();
       var r_1 = _destruct__k2r9zo_0.kc();
       var f_0 = _destruct__k2r9zo_0.lc();
-      var a_0 = this.z28(mnh, r_1.oe_1, -1, options.x27_1, island, options.y28());
-      var b = this.z28(mnh, r_1.pe_1, 1, options.x27_1, island, options.y28());
+      var a_0 = this.a29(mnh, r_1.oe_1, -1, options.y27_1, island, options.z28());
+      var b = this.a29(mnh, r_1.pe_1, 1, options.y27_1, island, options.z28());
       var prev_0 = lastOrNull(spans);
       if (!(prev_0 == null) && a_0 <= prev_0.ic_1.pe_1) {
         var tmp_6 = spans.o() - 1 | 0;
@@ -3525,16 +3528,16 @@
         spans.k(element_4);
       }
     }
-    var slope = this.a29(mf, options.p28(), step);
-    var clean = state.l27_1;
+    var slope = this.b29(mf, options.q28(), step);
+    var clean = state.m27_1;
     var parts = ArrayList_init_$Create$();
     var _iterator__ex2g4s_3 = kept.l();
     while (_iterator__ex2g4s_3.m()) {
       var _destruct__k2r9zo_1 = _iterator__ex2g4s_3.n();
       var r_2 = _destruct__k2r9zo_1.kc();
       var f_1 = _destruct__k2r9zo_1.lc();
-      var a_3 = this.z28(mnh, r_2.oe_1, -1, options.x27_1, island, options.y28());
-      var b_0 = this.z28(mnh, r_2.pe_1, 1, options.x27_1, island, options.y28());
+      var a_3 = this.a29(mnh, r_2.oe_1, -1, options.y27_1, island, options.z28());
+      var b_0 = this.a29(mnh, r_2.pe_1, 1, options.y27_1, island, options.z28());
       var prev_1 = lastOrNull(parts);
       if (!(prev_1 == null) && a_3 <= prev_1.ic_1.pe_1) {
         var tmp_8 = parts.o() - 1 | 0;
@@ -3562,7 +3565,7 @@
       var metrics = _destruct__k2r9zo_3.kc();
       var rejection = _destruct__k2r9zo_3.lc();
       var tmp_10;
-      if (options.n28_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
+      if (options.o28_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
         // Inline function 'kotlin.collections.filter' call
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -3602,7 +3605,7 @@
     var tmp_12 = booleanArray(n);
     while (tmp_11 < n) {
       var tmp_13 = tmp_11;
-      tmp_12[tmp_13] = mnh[tmp_13] > options.x27_1;
+      tmp_12[tmp_13] = mnh[tmp_13] > options.y27_1;
       tmp_11 = tmp_11 + 1 | 0;
     }
     var deckMask = tmp_12;
@@ -3612,10 +3615,10 @@
       var span_0 = _destruct__k2r9zo_5.kc();
       var rejection_0 = _destruct__k2r9zo_5.hh();
       if (rejection_0 == null) {
-        this.b29(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
+        this.c29(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
       }
     }
-    var deckRuns = this.u28(deckMask);
+    var deckRuns = this.v28(deckMask);
     var accepted = ArrayList_init_$Create$();
     var rejected = ArrayList_init_$Create$();
     var _iterator__ex2g4s_8 = classified.l();
@@ -3636,7 +3639,7 @@
         var _iterator__ex2g4s_9 = deckRuns.l();
         while (_iterator__ex2g4s_9.m()) {
           var element_9 = _iterator__ex2g4s_9.n();
-          if ((((element_9.pe_1 - element_9.oe_1 | 0) + 1 | 0) >= options.c29() || (b_1 - a_6 | 0) <= options.d29()) && element_9.oe_1 <= b_1 && element_9.pe_1 >= a_6) {
+          if ((((element_9.pe_1 - element_9.oe_1 | 0) + 1 | 0) >= options.d29() || (b_1 - a_6 | 0) <= options.e29()) && element_9.oe_1 <= b_1 && element_9.pe_1 >= a_6) {
             destination_1.k(element_9);
           }
         }
@@ -3667,14 +3670,14 @@
         rejected.k(candidate);
       }
     }
-    var _iterator__ex2g4s_11 = this.e29(roughRuns, gap).l();
+    var _iterator__ex2g4s_11 = this.f29(roughRuns, gap).l();
     while (_iterator__ex2g4s_11.m()) {
       var g = _iterator__ex2g4s_11.n();
       // Inline function 'kotlin.collections.plusAssign' call
       var element_10 = new DeckCandidate(g.oe_1, g.pe_1, g.oe_1 * step, g.pe_1 * step, null, DeckRejection_ROUGH_getInstance(), emptyList());
       rejected.k(element_10);
     }
-    var _iterator__ex2g4s_12 = this.e29(noDataRuns, gap).l();
+    var _iterator__ex2g4s_12 = this.f29(noDataRuns, gap).l();
     while (_iterator__ex2g4s_12.m()) {
       var g_0 = _iterator__ex2g4s_12.n();
       // Inline function 'kotlin.collections.plusAssign' call
@@ -3690,40 +3693,40 @@
     sortWith(rejected, tmp$ret$40);
     return new DeckDetection(accepted, rejected, tooShort);
   };
-  protoOf(DeckDetector).t28 = function (profile, options) {
+  protoOf(DeckDetector).u28 = function (profile, options) {
     var n = profile.o();
-    var mns = profile.g27_1;
-    var mnt = profile.h27_1;
+    var mns = profile.h27_1;
+    var mnt = profile.i27_1;
     var tmp;
-    if (options.k28_1) {
-      var tol = options.l28_1;
+    if (options.l28_1) {
+      var tol = options.m28_1;
       var tmp_0 = 0;
       var tmp_1 = new Float64Array(n);
       while (tmp_0 < n) {
         var tmp_2 = tmp_0;
-        tmp_1[tmp_2] = mnt[tmp_2] > mns[tmp_2] + tol ? Infinity : profile.f27_1[tmp_2];
+        tmp_1[tmp_2] = mnt[tmp_2] > mns[tmp_2] + tol ? Infinity : profile.g27_1[tmp_2];
         tmp_0 = tmp_0 + 1 | 0;
       }
       tmp = tmp_1;
     } else {
-      tmp = profile.f27_1;
+      tmp = profile.g27_1;
     }
     var mnh = tmp;
-    var mf = this.g29(mns, options.f29() / 2 | 0);
-    var rough = roughness(this, mns, mf, options.h29() / 2 | 0);
+    var mf = this.h29(mns, options.g29() / 2 | 0);
+    var rough = roughness(this, mns, mf, options.i29() / 2 | 0);
     // Inline function 'kotlin.let' call
-    var m = this.i29(rough, options.h29() / 2 | 0);
+    var m = this.j29(rough, options.i29() / 2 | 0);
     var tmp_3 = 0;
     var tmp_4 = booleanArray(n);
     while (tmp_3 < n) {
       var tmp_5 = tmp_3;
-      tmp_4[tmp_5] = m[tmp_5] < options.u27_1;
+      tmp_4[tmp_5] = m[tmp_5] < options.v27_1;
       tmp_3 = tmp_3 + 1 | 0;
     }
     var clean = tmp_4;
     return new SurfaceState(mnh, mf, rough, clean);
   };
-  protoOf(DeckDetector).q28 = function (clean, a, b, h) {
+  protoOf(DeckDetector).r28 = function (clean, a, b, h) {
     var tmp;
     if ((b - h | 0) < (a + h | 0)) {
       tmp = NaN;
@@ -3761,9 +3764,9 @@
     }
     return tmp;
   };
-  protoOf(DeckDetector).r28 = function (mns, mnh, clean, cleanFraction, a, b, options) {
+  protoOf(DeckDetector).s28 = function (mns, mnh, clean, cleanFraction, a, b, options) {
     var n = mns.length;
-    var h = options.p28();
+    var h = options.q28();
     if ((b - h | 0) < (a + h | 0))
       return null;
     // Inline function 'kotlin.collections.filter' call
@@ -3782,11 +3785,11 @@
       }
        while (!(element === last));
     var inSpan = destination;
-    if (inSpan.o() < options.j28_1)
+    if (inSpan.o() < options.k28_1)
       return null;
-    if (!(cleanFraction >= options.i28_1))
+    if (!(cleanFraction >= options.j28_1))
       return null;
-    var medianHalf = options.f29() / 2 | 0;
+    var medianHalf = options.g29() / 2 | 0;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - medianHalf | 0;
     var lo = Math.max(0, b_0);
@@ -3823,7 +3826,7 @@
             do {
               var element_0 = inductionVariable_1;
               inductionVariable_1 = inductionVariable_1 + 1 | 0;
-              if (mnh[element_0] <= options.m28_1) {
+              if (mnh[element_0] <= options.n28_1) {
                 tmp$ret$5 = true;
                 break $l$block_0;
               }
@@ -3843,7 +3846,7 @@
            while (inductionVariable_2 < c1);
       }
        while (inductionVariable_0 < last_0);
-    var mfClean = this.g29(x, medianHalf);
+    var mfClean = this.h29(x, medianHalf);
     var tmp_0 = 0;
     var tmp_1 = ((b - h | 0) - (a + h | 0) | 0) + 1 | 0;
     var tmp_2 = new Float64Array(tmp_1);
@@ -3851,13 +3854,13 @@
       var tmp_3 = tmp_0;
       var k_0 = (a + h | 0) + tmp_3 | 0;
       // Inline function 'kotlin.math.abs' call
-      var x_0 = (mfClean[(k_0 + h | 0) - lo | 0] - mfClean[(k_0 - h | 0) - lo | 0]) / (imul(2, h) * options.p27_1);
+      var x_0 = (mfClean[(k_0 + h | 0) - lo | 0] - mfClean[(k_0 - h | 0) - lo | 0]) / (imul(2, h) * options.q27_1);
       tmp_2[tmp_3] = Math.abs(x_0);
       tmp_0 = tmp_0 + 1 | 0;
     }
     return tmp_2;
   };
-  protoOf(DeckDetector).z28 = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
+  protoOf(DeckDetector).a29 = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
     var n = mnh.length;
     var ok = DeckDetector$extend$lambda(n, mnh, threshold);
     var k = from;
@@ -3891,7 +3894,7 @@
     }
     return abs(k - from | 0) > maxSteps ? from : k;
   };
-  protoOf(DeckDetector).b29 = function (mask, span, maxHole, fill) {
+  protoOf(DeckDetector).c29 = function (mask, span, maxHole, fill) {
     var k = span.oe_1;
     $l$loop: while (k <= span.pe_1) {
       if (mask[k]) {
@@ -3951,7 +3954,7 @@
       k = end + 1 | 0;
     }
   };
-  protoOf(DeckDetector).g29 = function (x, half) {
+  protoOf(DeckDetector).h29 = function (x, half) {
     var n = x.length;
     var window_0 = new Float64Array(imul(2, half) + 1 | 0);
     var tmp = 0;
@@ -3985,7 +3988,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).m27 = function (x, half) {
+  protoOf(DeckDetector).n27 = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4006,7 +4009,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).i29 = function (x, half) {
+  protoOf(DeckDetector).j29 = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4037,7 +4040,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).a29 = function (x, h, stepM) {
+  protoOf(DeckDetector).b29 = function (x, h, stepM) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4054,7 +4057,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).u28 = function (mask) {
+  protoOf(DeckDetector).v28 = function (mask) {
     var out = ArrayList_init_$Create$();
     var start = -1;
     var inductionVariable = 0;
@@ -4080,7 +4083,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).e29 = function (rs, gapStations) {
+  protoOf(DeckDetector).f29 = function (rs, gapStations) {
     var out = ArrayList_init_$Create$();
     var _iterator__ex2g4s = rs.l();
     while (_iterator__ex2g4s.m()) {
@@ -4100,7 +4103,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).n27 = function (values, q) {
+  protoOf(DeckDetector).o27 = function (values, q) {
     var s = sortedArray(values);
     var rank = (s.length - 1 | 0) * q;
     // Inline function 'kotlin.math.floor' call
@@ -4117,33 +4120,33 @@
     return DeckDetector_instance;
   }
   function DeckMetrics(lengthM, slopeP95, slopeMax, rawSlopeP95, cleanFraction, slopeOnCleanDeck, roughnessM, smoothFraction, canyonM, mntDropM, deckTopM) {
-    this.j29_1 = lengthM;
-    this.k29_1 = slopeP95;
-    this.l29_1 = slopeMax;
-    this.m29_1 = rawSlopeP95;
-    this.n29_1 = cleanFraction;
-    this.o29_1 = slopeOnCleanDeck;
-    this.p29_1 = roughnessM;
-    this.q29_1 = smoothFraction;
-    this.r29_1 = canyonM;
-    this.s29_1 = mntDropM;
-    this.t29_1 = deckTopM;
+    this.k29_1 = lengthM;
+    this.l29_1 = slopeP95;
+    this.m29_1 = slopeMax;
+    this.n29_1 = rawSlopeP95;
+    this.o29_1 = cleanFraction;
+    this.p29_1 = slopeOnCleanDeck;
+    this.q29_1 = roughnessM;
+    this.r29_1 = smoothFraction;
+    this.s29_1 = canyonM;
+    this.t29_1 = mntDropM;
+    this.u29_1 = deckTopM;
   }
   protoOf(DeckMetrics).toString = function () {
-    return 'DeckMetrics(lengthM=' + this.j29_1 + ', slopeP95=' + this.k29_1 + ', slopeMax=' + this.l29_1 + ', rawSlopeP95=' + this.m29_1 + ', cleanFraction=' + this.n29_1 + ', slopeOnCleanDeck=' + this.o29_1 + ', roughnessM=' + this.p29_1 + ', smoothFraction=' + this.q29_1 + ', canyonM=' + this.r29_1 + ', mntDropM=' + this.s29_1 + ', deckTopM=' + this.t29_1 + ')';
+    return 'DeckMetrics(lengthM=' + this.k29_1 + ', slopeP95=' + this.l29_1 + ', slopeMax=' + this.m29_1 + ', rawSlopeP95=' + this.n29_1 + ', cleanFraction=' + this.o29_1 + ', slopeOnCleanDeck=' + this.p29_1 + ', roughnessM=' + this.q29_1 + ', smoothFraction=' + this.r29_1 + ', canyonM=' + this.s29_1 + ', mntDropM=' + this.t29_1 + ', deckTopM=' + this.u29_1 + ')';
   };
   protoOf(DeckMetrics).hashCode = function () {
-    var result = getNumberHashCode(this.j29_1);
-    result = imul(result, 31) + getNumberHashCode(this.k29_1) | 0;
+    var result = getNumberHashCode(this.k29_1);
     result = imul(result, 31) + getNumberHashCode(this.l29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.m29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.n29_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.o29_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p29_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.o29_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.p29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.q29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.r29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.s29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.t29_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u29_1) | 0;
     return result;
   };
   protoOf(DeckMetrics).equals = function (other) {
@@ -4151,8 +4154,6 @@
       return true;
     if (!(other instanceof DeckMetrics))
       return false;
-    if (!equals(this.j29_1, other.j29_1))
-      return false;
     if (!equals(this.k29_1, other.k29_1))
       return false;
     if (!equals(this.l29_1, other.l29_1))
@@ -4161,9 +4162,9 @@
       return false;
     if (!equals(this.n29_1, other.n29_1))
       return false;
-    if (!(this.o29_1 === other.o29_1))
+    if (!equals(this.o29_1, other.o29_1))
       return false;
-    if (!equals(this.p29_1, other.p29_1))
+    if (!(this.p29_1 === other.p29_1))
       return false;
     if (!equals(this.q29_1, other.q29_1))
       return false;
@@ -4173,6 +4174,8 @@
       return false;
     if (!equals(this.t29_1, other.t29_1))
       return false;
+    if (!equals(this.u29_1, other.u29_1))
+      return false;
     return true;
   };
   var static_init_called_1;
@@ -4215,21 +4218,21 @@
     return DeckRejection_NO_DATA_instance;
   }
   function stations($this, metres, name) {
-    var r = metres / $this.p27_1;
+    var r = metres / $this.q27_1;
     var k = roundToInt(r);
     // Inline function 'kotlin.math.abs' call
     var x = r - k;
     // Inline function 'kotlin.require' call
     if (!(Math.abs(x) < 1.0E-9)) {
-      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.p27_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.q27_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
   function Companion_2() {
     Companion_instance_3 = this;
-    this.u29_1 = new DeckDetectorOptions();
-    this.v29_1 = new DeckDetectorOptions(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, false, VOID, VOID, false, VOID, VOID, false);
+    this.v29_1 = new DeckDetectorOptions();
+    this.w29_1 = new DeckDetectorOptions(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, false, VOID, VOID, false, VOID, VOID, false);
   }
   var Companion_instance_3;
   function Companion_getInstance_3() {
@@ -4264,37 +4267,37 @@
     mntAboveMnsToleranceM = mntAboveMnsToleranceM === VOID ? 0.5 : mntAboveMnsToleranceM;
     cleanGapGroundMnhM = cleanGapGroundMnhM === VOID ? 1.0 : cleanGapGroundMnhM;
     splitSteepMerged = splitSteepMerged === VOID ? true : splitSteepMerged;
-    this.p27_1 = stepM;
-    this.q27_1 = tallMnhM;
-    this.r27_1 = minTallRunM;
-    this.s27_1 = surfaceMedianWindowM;
-    this.t27_1 = roughnessWindowM;
-    this.u27_1 = maxRoughnessM;
-    this.v27_1 = minSmoothFraction;
-    this.w27_1 = mergeGapM;
-    this.x27_1 = deckMnhM;
-    this.y27_1 = slopeHalfWindowM;
-    this.z27_1 = maxSlopeP95;
-    this.a28_1 = minLengthM;
-    this.b28_1 = shortSpanM;
-    this.c28_1 = maxShortRoughnessM;
-    this.d28_1 = minCanyonDropM;
-    this.e28_1 = deckMinRunM;
-    this.f28_1 = smallSpanM;
-    this.g28_1 = maxAbutmentM;
-    this.h28_1 = slopeOnCleanDeck;
-    this.i28_1 = minCleanFraction;
-    this.j28_1 = minCleanStationsCount;
-    this.k28_1 = mntAboveMnsAsTall;
-    this.l28_1 = mntAboveMnsToleranceM;
-    this.m28_1 = cleanGapGroundMnhM;
-    this.n28_1 = splitSteepMerged;
+    this.q27_1 = stepM;
+    this.r27_1 = tallMnhM;
+    this.s27_1 = minTallRunM;
+    this.t27_1 = surfaceMedianWindowM;
+    this.u27_1 = roughnessWindowM;
+    this.v27_1 = maxRoughnessM;
+    this.w27_1 = minSmoothFraction;
+    this.x27_1 = mergeGapM;
+    this.y27_1 = deckMnhM;
+    this.z27_1 = slopeHalfWindowM;
+    this.a28_1 = maxSlopeP95;
+    this.b28_1 = minLengthM;
+    this.c28_1 = shortSpanM;
+    this.d28_1 = maxShortRoughnessM;
+    this.e28_1 = minCanyonDropM;
+    this.f28_1 = deckMinRunM;
+    this.g28_1 = smallSpanM;
+    this.h28_1 = maxAbutmentM;
+    this.i28_1 = slopeOnCleanDeck;
+    this.j28_1 = minCleanFraction;
+    this.k28_1 = minCleanStationsCount;
+    this.l28_1 = mntAboveMnsAsTall;
+    this.m28_1 = mntAboveMnsToleranceM;
+    this.n28_1 = cleanGapGroundMnhM;
+    this.o28_1 = splitSteepMerged;
     // Inline function 'kotlin.require' call
-    if (!(this.p27_1 > 0.0 && isFinite(this.p27_1))) {
-      var message = 'stepM must be positive, got ' + this.p27_1;
+    if (!(this.q27_1 > 0.0 && isFinite(this.q27_1))) {
+      var message = 'stepM must be positive, got ' + this.q27_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    var thresholds = mapOf([to('tallMnhM', this.q27_1), to('minTallRunM', this.r27_1), to('surfaceMedianWindowM', this.s27_1), to('roughnessWindowM', this.t27_1), to('maxRoughnessM', this.u27_1), to('minSmoothFraction', this.v27_1), to('mergeGapM', this.w27_1), to('deckMnhM', this.x27_1), to('slopeHalfWindowM', this.y27_1), to('maxSlopeP95', this.z27_1), to('minLengthM', this.a28_1), to('shortSpanM', this.b28_1), to('maxShortRoughnessM', this.c28_1), to('minCanyonDropM', this.d28_1), to('deckMinRunM', this.e28_1), to('smallSpanM', this.f28_1), to('maxAbutmentM', this.g28_1), to('minCleanFraction', this.i28_1), to('mntAboveMnsToleranceM', this.l28_1), to('cleanGapGroundMnhM', this.m28_1)]);
+    var thresholds = mapOf([to('tallMnhM', this.r27_1), to('minTallRunM', this.s27_1), to('surfaceMedianWindowM', this.t27_1), to('roughnessWindowM', this.u27_1), to('maxRoughnessM', this.v27_1), to('minSmoothFraction', this.w27_1), to('mergeGapM', this.x27_1), to('deckMnhM', this.y27_1), to('slopeHalfWindowM', this.z27_1), to('maxSlopeP95', this.a28_1), to('minLengthM', this.b28_1), to('shortSpanM', this.c28_1), to('maxShortRoughnessM', this.d28_1), to('minCanyonDropM', this.e28_1), to('deckMinRunM', this.f28_1), to('smallSpanM', this.g28_1), to('maxAbutmentM', this.h28_1), to('minCleanFraction', this.j28_1), to('mntAboveMnsToleranceM', this.m28_1), to('cleanGapGroundMnhM', this.n28_1)]);
     // Inline function 'kotlin.collections.forEach' call
     // Inline function 'kotlin.collections.iterator' call
     var _iterator__ex2g4s = thresholds.t1().l();
@@ -4311,98 +4314,97 @@
       }
     }
     // Inline function 'kotlin.require' call
-    if (!((this.f29() % 2 | 0) === 1)) {
+    if (!((this.g29() % 2 | 0) === 1)) {
       var message_1 = 'surfaceMedianWindowM must be an odd number of stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!((this.h29() % 2 | 0) === 1)) {
+    if (!((this.i29() % 2 | 0) === 1)) {
       var message_2 = 'roughnessWindowM must be an odd number of stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_2));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.v28() >= 1)) {
+    if (!(this.w28() >= 1)) {
       var message_3 = 'minTallRunM must cover at least one station';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_3));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.p28() >= 1)) {
+    if (!(this.q28() >= 1)) {
       var message_4 = 'slopeHalfWindowM must cover at least one station';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_4));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.w28() >= 0 && this.c29() >= 1)) {
+    if (!(this.x28() >= 0 && this.d29() >= 1)) {
       var message_5 = 'negative window';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_5));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.o28() >= 0 && this.d29() >= 0)) {
+    if (!(this.p28() >= 0 && this.e29() >= 0)) {
       var message_6 = 'negative span threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.y28() >= 0)) {
+    if (!(this.z28() >= 0)) {
       var message_7 = 'negative maxAbutmentM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_7));
     }
-    var containsArg = this.i28_1;
+    var containsArg = this.j28_1;
     // Inline function 'kotlin.require' call
     if (!(0.0 <= containsArg ? containsArg <= 1.0 : false)) {
-      var message_8 = 'minCleanFraction must be in 0..1, got ' + this.i28_1;
+      var message_8 = 'minCleanFraction must be in 0..1, got ' + this.j28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_8));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.l28_1 >= 0.0)) {
-      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.l28_1;
+    if (!(this.m28_1 >= 0.0)) {
+      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.m28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_9));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.j28_1 >= 2)) {
-      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.j28_1;
+    if (!(this.k28_1 >= 2)) {
+      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.k28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_10));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.o28() >= (imul(2, this.p28()) - 1 | 0))) {
+    if (!(this.p28() >= (imul(2, this.q28()) - 1 | 0))) {
       var message_11 = 'shortSpanM must be at least 2\xB7slopeHalfWindowM \u2212 stepM, or a long span has no slope sample';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_11));
     }
   }
-  protoOf(DeckDetectorOptions).v28 = function () {
-    return stations(this, this.r27_1, 'minTallRunM');
+  protoOf(DeckDetectorOptions).w28 = function () {
+    return stations(this, this.s27_1, 'minTallRunM');
   };
-  protoOf(DeckDetectorOptions).f29 = function () {
-    return stations(this, this.s27_1, 'surfaceMedianWindowM');
+  protoOf(DeckDetectorOptions).g29 = function () {
+    return stations(this, this.t27_1, 'surfaceMedianWindowM');
   };
-  protoOf(DeckDetectorOptions).h29 = function () {
-    return stations(this, this.t27_1, 'roughnessWindowM');
+  protoOf(DeckDetectorOptions).i29 = function () {
+    return stations(this, this.u27_1, 'roughnessWindowM');
   };
-  protoOf(DeckDetectorOptions).w28 = function () {
-    return stations(this, this.w27_1, 'mergeGapM');
+  protoOf(DeckDetectorOptions).x28 = function () {
+    return stations(this, this.x27_1, 'mergeGapM');
+  };
+  protoOf(DeckDetectorOptions).q28 = function () {
+    return stations(this, this.z27_1, 'slopeHalfWindowM');
   };
   protoOf(DeckDetectorOptions).p28 = function () {
-    return stations(this, this.y27_1, 'slopeHalfWindowM');
+    return stations(this, this.c28_1, 'shortSpanM');
   };
-  protoOf(DeckDetectorOptions).o28 = function () {
-    return stations(this, this.b28_1, 'shortSpanM');
+  protoOf(DeckDetectorOptions).d29 = function () {
+    return stations(this, this.f28_1, 'deckMinRunM');
   };
-  protoOf(DeckDetectorOptions).c29 = function () {
-    return stations(this, this.e28_1, 'deckMinRunM');
+  protoOf(DeckDetectorOptions).z28 = function () {
+    return stations(this, this.h28_1, 'maxAbutmentM');
   };
   protoOf(DeckDetectorOptions).y28 = function () {
-    return stations(this, this.g28_1, 'maxAbutmentM');
-  };
-  protoOf(DeckDetectorOptions).x28 = function () {
-    return this.f29() / 2 | 0;
+    return this.g29() / 2 | 0;
   };
-  protoOf(DeckDetectorOptions).d29 = function () {
-    return stations(this, this.f28_1, 'smallSpanM');
+  protoOf(DeckDetectorOptions).e29 = function () {
+    return stations(this, this.g28_1, 'smallSpanM');
   };
   protoOf(DeckDetectorOptions).toString = function () {
-    return 'DeckDetectorOptions(stepM=' + this.p27_1 + ', tallMnhM=' + this.q27_1 + ', minTallRunM=' + this.r27_1 + ', surfaceMedianWindowM=' + this.s27_1 + ', roughnessWindowM=' + this.t27_1 + ', maxRoughnessM=' + this.u27_1 + ', minSmoothFraction=' + this.v27_1 + ', mergeGapM=' + this.w27_1 + ', deckMnhM=' + this.x27_1 + ', slopeHalfWindowM=' + this.y27_1 + ', maxSlopeP95=' + this.z27_1 + ', minLengthM=' + this.a28_1 + ', shortSpanM=' + this.b28_1 + ', maxShortRoughnessM=' + this.c28_1 + ', minCanyonDropM=' + this.d28_1 + ', deckMinRunM=' + this.e28_1 + ', smallSpanM=' + this.f28_1 + ', maxAbutmentM=' + this.g28_1 + ', slopeOnCleanDeck=' + this.h28_1 + ', minCleanFraction=' + this.i28_1 + ', minCleanStationsCount=' + this.j28_1 + ', mntAboveMnsAsTall=' + this.k28_1 + ', mntAboveMnsToleranceM=' + this.l28_1 + ', cleanGapGroundMnhM=' + this.m28_1 + ', splitSteepMerged=' + this.n28_1 + ')';
+    return 'DeckDetectorOptions(stepM=' + this.q27_1 + ', tallMnhM=' + this.r27_1 + ', minTallRunM=' + this.s27_1 + ', surfaceMedianWindowM=' + this.t27_1 + ', roughnessWindowM=' + this.u27_1 + ', maxRoughnessM=' + this.v27_1 + ', minSmoothFraction=' + this.w27_1 + ', mergeGapM=' + this.x27_1 + ', deckMnhM=' + this.y27_1 + ', slopeHalfWindowM=' + this.z27_1 + ', maxSlopeP95=' + this.a28_1 + ', minLengthM=' + this.b28_1 + ', shortSpanM=' + this.c28_1 + ', maxShortRoughnessM=' + this.d28_1 + ', minCanyonDropM=' + this.e28_1 + ', deckMinRunM=' + this.f28_1 + ', smallSpanM=' + this.g28_1 + ', maxAbutmentM=' + this.h28_1 + ', slopeOnCleanDeck=' + this.i28_1 + ', minCleanFraction=' + this.j28_1 + ', minCleanStationsCount=' + this.k28_1 + ', mntAboveMnsAsTall=' + this.l28_1 + ', mntAboveMnsToleranceM=' + this.m28_1 + ', cleanGapGroundMnhM=' + this.n28_1 + ', splitSteepMerged=' + this.o28_1 + ')';
   };
   protoOf(DeckDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.p27_1);
-    result = imul(result, 31) + getNumberHashCode(this.q27_1) | 0;
+    var result = getNumberHashCode(this.q27_1);
     result = imul(result, 31) + getNumberHashCode(this.r27_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.s27_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.t27_1) | 0;
@@ -4419,13 +4421,14 @@
     result = imul(result, 31) + getNumberHashCode(this.e28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.f28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.g28_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.h28_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i28_1) | 0;
-    result = imul(result, 31) + this.j28_1 | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.k28_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.l28_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h28_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.i28_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j28_1) | 0;
+    result = imul(result, 31) + this.k28_1 | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.l28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.m28_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.n28_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n28_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.o28_1) | 0;
     return result;
   };
   protoOf(DeckDetectorOptions).equals = function (other) {
@@ -4433,8 +4436,6 @@
       return true;
     if (!(other instanceof DeckDetectorOptions))
       return false;
-    if (!equals(this.p27_1, other.p27_1))
-      return false;
     if (!equals(this.q27_1, other.q27_1))
       return false;
     if (!equals(this.r27_1, other.r27_1))
@@ -4469,83 +4470,85 @@
       return false;
     if (!equals(this.g28_1, other.g28_1))
       return false;
-    if (!(this.h28_1 === other.h28_1))
+    if (!equals(this.h28_1, other.h28_1))
       return false;
-    if (!equals(this.i28_1, other.i28_1))
+    if (!(this.i28_1 === other.i28_1))
       return false;
-    if (!(this.j28_1 === other.j28_1))
+    if (!equals(this.j28_1, other.j28_1))
       return false;
     if (!(this.k28_1 === other.k28_1))
       return false;
-    if (!equals(this.l28_1, other.l28_1))
+    if (!(this.l28_1 === other.l28_1))
       return false;
     if (!equals(this.m28_1, other.m28_1))
       return false;
-    if (!(this.n28_1 === other.n28_1))
+    if (!equals(this.n28_1, other.n28_1))
+      return false;
+    if (!(this.o28_1 === other.o28_1))
       return false;
     return true;
   };
   function DeckReplacement(first, last, spanFirst, spanLast, anchorFirst, anchorLast, anchors, elevationM, spans) {
-    this.w29_1 = first;
-    this.x29_1 = last;
-    this.y29_1 = spanFirst;
-    this.z29_1 = spanLast;
-    this.a2a_1 = anchorFirst;
-    this.b2a_1 = anchorLast;
-    this.c2a_1 = anchors;
-    this.d2a_1 = elevationM;
-    this.e2a_1 = spans;
-  }
-  protoOf(DeckReplacement).f2a = function () {
-    return this.w29_1 < this.y29_1;
-  };
+    this.x29_1 = first;
+    this.y29_1 = last;
+    this.z29_1 = spanFirst;
+    this.a2a_1 = spanLast;
+    this.b2a_1 = anchorFirst;
+    this.c2a_1 = anchorLast;
+    this.d2a_1 = anchors;
+    this.e2a_1 = elevationM;
+    this.f2a_1 = spans;
+  }
   protoOf(DeckReplacement).g2a = function () {
-    return this.x29_1 > this.z29_1;
+    return this.x29_1 < this.z29_1;
   };
-  protoOf(DeckReplacement).h2a = function (startM, endM) {
+  protoOf(DeckReplacement).h2a = function () {
+    return this.y29_1 > this.a2a_1;
+  };
+  protoOf(DeckReplacement).i2a = function (startM, endM) {
     // Inline function 'kotlin.collections.copyOf' call
     // Inline function 'kotlin.js.asDynamic' call
-    var z = this.d2a_1.slice();
-    if (this.f2a()) {
+    var z = this.e2a_1.slice();
+    if (this.g2a()) {
       z[0] = startM;
     }
-    if (this.g2a()) {
+    if (this.h2a()) {
       z[z.length - 1 | 0] = endM;
     }
     fillLinear(z);
     return z;
   };
   protoOf(DeckReplacement).toString = function () {
-    var tmp = 'DeckReplacement(first=' + this.w29_1 + ', last=' + this.x29_1 + ', span=' + this.y29_1 + '..' + this.z29_1 + ', anchors=' + this.a2a_1 + '..' + this.b2a_1 + ' ';
-    var tmp_0 = this.c2a_1.length;
+    var tmp = 'DeckReplacement(first=' + this.x29_1 + ', last=' + this.y29_1 + ', span=' + this.z29_1 + '..' + this.a2a_1 + ', anchors=' + this.b2a_1 + '..' + this.c2a_1 + ' ';
+    var tmp_0 = this.d2a_1.length;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.e2a_1;
+    var this_0 = this.f2a_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = numberRangeToNumber(item.x26_1, item.y26_1);
+      var tmp$ret$2 = numberRangeToNumber(item.y26_1, item.z26_1);
       destination.k(tmp$ret$2);
     }
     return tmp + ('(' + tmp_0 + '), spans=' + toString_0(destination) + ')');
   };
   function DeckProfiles(replacements, dropped) {
-    this.i2a_1 = replacements;
-    this.j2a_1 = dropped;
+    this.j2a_1 = replacements;
+    this.k2a_1 = dropped;
   }
   function joins($this, previous, next, mns, mnt, options) {
     var a = previous.kc();
     var aAnchors = previous.lc();
     var b = next.kc();
     var bAnchors = next.lc();
-    if (((b.x26_1 - a.y26_1 | 0) - 1 | 0) >= options.w28())
+    if (((b.y26_1 - a.z26_1 | 0) - 1 | 0) >= options.x28())
       return false;
     if (aAnchors.q() || bAnchors.q())
       return false;
     var c0 = last(aAnchors);
     var c1 = first(bAnchors);
-    var tmp0 = until(a.y26_1 + 1 | 0, b.x26_1);
+    var tmp0 = until(a.z26_1 + 1 | 0, b.y26_1);
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.none' call
@@ -4567,7 +4570,7 @@
           inductionVariable = inductionVariable + 1 | 0;
           var k = element;
           var line = mns[c0] + (mns[c1] - mns[c0]) * (k - c0 | 0) / (c1 - c0 | 0);
-          if (!(line - mnt[k] > options.d28_1)) {
+          if (!(line - mnt[k] > options.e28_1)) {
             tmp$ret$0 = false;
             break $l$block_0;
           }
@@ -4580,7 +4583,7 @@
   function replacement($this, spans, anchors, mns, n, options) {
     var u = first_0(anchors);
     var v = last_0(anchors);
-    var half = options.f29() / 2 | 0;
+    var half = options.g29() / 2 | 0;
     var tmp = 0;
     var tmp_0 = ((v - u | 0) + 1 | 0) + imul(2, half) | 0;
     var tmp_1 = new Float64Array(tmp_0);
@@ -4607,7 +4610,7 @@
            while (!(k === c1));
       }
        while (inductionVariable < last_2);
-    var median = DeckDetector_instance.g29(x, half);
+    var median = DeckDetector_instance.h29(x, half);
     var tmp_2 = 0;
     var tmp_3 = (v - u | 0) + 1 | 0;
     var tmp_4 = new Float64Array(tmp_3);
@@ -4617,9 +4620,9 @@
       tmp_2 = tmp_2 + 1 | 0;
     }
     var deck = tmp_4;
-    $this.k2a(deck, options.z27_1 * options.p27_1);
-    var spanFirst = first(spans).x26_1;
-    var spanLast = last(spans).y26_1;
+    $this.l2a(deck, options.a28_1 * options.q27_1);
+    var spanFirst = first(spans).y26_1;
+    var spanLast = last(spans).z26_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b = spanFirst - 1 | 0;
     var first_2 = Math.max(0, b);
@@ -4640,16 +4643,16 @@
     return new DeckReplacement(first_2, last_3, spanFirst, spanLast, u, v, anchors, z, spans);
   }
   function sam$kotlin_Comparator$0_0(function_0) {
-    this.l2a_1 = function_0;
+    this.m2a_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0_0).la = function (a, b) {
-    return this.l2a_1(a, b);
+    return this.m2a_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.l2a_1;
+    return this.m2a_1;
   };
   protoOf(sam$kotlin_Comparator$0_0).equals = function (other) {
     var tmp;
@@ -4671,7 +4674,7 @@
   };
   function build$anchorsOf(state, mns, span) {
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp0 = span.d27_1;
+    var tmp0 = span.e27_1;
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.l();
@@ -4688,9 +4691,9 @@
       var element_0 = _iterator__ex2g4s_0.n();
       var tmp;
       var tmp_0;
-      var containsLower = span.x26_1;
-      if (element_0 <= span.y26_1 ? containsLower <= element_0 : false) {
-        tmp_0 = state.l27_1[element_0];
+      var containsLower = span.y26_1;
+      if (element_0 <= span.z26_1 ? containsLower <= element_0 : false) {
+        tmp_0 = state.m27_1[element_0];
       } else {
         tmp_0 = false;
       }
@@ -4707,21 +4710,21 @@
   }
   function DeckProfileBuilder$build$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.x26_1;
-    var tmp$ret$2 = b.x26_1;
+    var tmp = a.y26_1;
+    var tmp$ret$2 = b.y26_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckProfileBuilder() {
   }
-  protoOf(DeckProfileBuilder).m2a = function (profile, detection, options) {
+  protoOf(DeckProfileBuilder).n2a = function (profile, detection, options) {
     var n = profile.o();
-    if (n === 0 || detection.u26_1.q())
+    if (n === 0 || detection.v26_1.q())
       return new DeckProfiles(emptyList(), emptyList());
-    var state = DeckDetector_instance.t28(profile, options);
-    var mns = profile.g27_1;
-    var mnt = profile.h27_1;
+    var state = DeckDetector_instance.u28(profile, options);
+    var mns = profile.h27_1;
+    var mnt = profile.i27_1;
     // Inline function 'kotlin.collections.sortedBy' call
-    var this_0 = detection.u26_1;
+    var this_0 = detection.v26_1;
     // Inline function 'kotlin.comparisons.compareBy' call
     var tmp = DeckProfileBuilder$build$lambda;
     var tmp$ret$1 = new sam$kotlin_Comparator$0_0(tmp);
@@ -4778,7 +4781,7 @@
     }
     return new DeckProfiles(replacements, dropped);
   };
-  protoOf(DeckProfileBuilder).k2a = function (z, maxRise) {
+  protoOf(DeckProfileBuilder).l2a = function (z, maxRise) {
     var inductionVariable = 1;
     var last = z.length;
     if (inductionVariable < last)
@@ -4831,35 +4834,155 @@
       }
        while (inductionVariable <= last);
   }
+  function ElevationCorrections(bridgeDecks, bridgeDecksApplied, bridgeDecksDropped, tunnels, tunnelsApplied, tunnelsDropped, warnings) {
+    this.o2a_1 = bridgeDecks;
+    this.p2a_1 = bridgeDecksApplied;
+    this.q2a_1 = bridgeDecksDropped;
+    this.r2a_1 = tunnels;
+    this.s2a_1 = tunnelsApplied;
+    this.t2a_1 = tunnelsDropped;
+    this.u2a_1 = warnings;
+  }
+  protoOf(ElevationCorrections).toString = function () {
+    return 'ElevationCorrections(bridgeDecks=' + this.o2a_1.toString() + ', bridgeDecksApplied=' + this.p2a_1 + ', bridgeDecksDropped=' + this.q2a_1 + ', tunnels=' + this.r2a_1.toString() + ', tunnelsApplied=' + this.s2a_1 + ', tunnelsDropped=' + this.t2a_1 + ', warnings=' + toString_0(this.u2a_1) + ')';
+  };
+  protoOf(ElevationCorrections).hashCode = function () {
+    var result = this.o2a_1.hashCode();
+    result = imul(result, 31) + this.p2a_1 | 0;
+    result = imul(result, 31) + this.q2a_1 | 0;
+    result = imul(result, 31) + this.r2a_1.hashCode() | 0;
+    result = imul(result, 31) + this.s2a_1 | 0;
+    result = imul(result, 31) + this.t2a_1 | 0;
+    result = imul(result, 31) + hashCode(this.u2a_1) | 0;
+    return result;
+  };
+  protoOf(ElevationCorrections).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof ElevationCorrections))
+      return false;
+    if (!this.o2a_1.equals(other.o2a_1))
+      return false;
+    if (!(this.p2a_1 === other.p2a_1))
+      return false;
+    if (!(this.q2a_1 === other.q2a_1))
+      return false;
+    if (!this.r2a_1.equals(other.r2a_1))
+      return false;
+    if (!(this.s2a_1 === other.s2a_1))
+      return false;
+    if (!(this.t2a_1 === other.t2a_1))
+      return false;
+    if (!equals(this.u2a_1, other.u2a_1))
+      return false;
+    return true;
+  };
+  var static_init_called_2;
+  function static_init_2() {
+    if (static_init_called_2)
+      return Unit_instance;
+    static_init_called_2 = true;
+    ElevationCorrectionStatus_NOT_RUN_instance = new ElevationCorrectionStatus('NOT_RUN', 0, 'not-run');
+    ElevationCorrectionStatus_UNAVAILABLE_instance = new ElevationCorrectionStatus('UNAVAILABLE', 1, 'unavailable');
+    ElevationCorrectionStatus_NO_COVERAGE_instance = new ElevationCorrectionStatus('NO_COVERAGE', 2, 'no-coverage');
+    ElevationCorrectionStatus_NONE_FOUND_instance = new ElevationCorrectionStatus('NONE_FOUND', 3, 'none-found');
+    ElevationCorrectionStatus_APPLIED_instance = new ElevationCorrectionStatus('APPLIED', 4, 'applied');
+    ElevationCorrectionStatus_FETCH_FAILED_instance = new ElevationCorrectionStatus('FETCH_FAILED', 5, 'fetch-failed');
+    if (Companion_instance_4 == null) {
+      Companion_instance;
+      new Companion_3();
+    }
+  }
+  var ElevationCorrectionStatus_NOT_RUN_instance;
+  var ElevationCorrectionStatus_UNAVAILABLE_instance;
+  var ElevationCorrectionStatus_NO_COVERAGE_instance;
+  var ElevationCorrectionStatus_NONE_FOUND_instance;
+  var ElevationCorrectionStatus_APPLIED_instance;
+  var ElevationCorrectionStatus_FETCH_FAILED_instance;
   function Companion_3() {
+    Companion_instance_4 = this;
+    var tmp = this;
+    // Inline function 'kotlin.collections.map' call
+    var this_0 = get_entries_1();
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var _iterator__ex2g4s = this_0.l();
+    while (_iterator__ex2g4s.m()) {
+      var item = _iterator__ex2g4s.n();
+      var tmp$ret$2 = item.x2a_1;
+      destination.k(tmp$ret$2);
+    }
+    tmp.y2a_1 = destination;
   }
-  protoOf(Companion_3).n2a = function (options) {
-    return new ElevationGainResult(0.0, 0.0, 0.0, 0.0, options.q2a_1, options.r2a_1, 0);
-  };
   var Companion_instance_4;
+  function values_1() {
+    static_init_2();
+    return [ElevationCorrectionStatus_NOT_RUN_getInstance(), ElevationCorrectionStatus_UNAVAILABLE_getInstance(), ElevationCorrectionStatus_NO_COVERAGE_getInstance(), ElevationCorrectionStatus_NONE_FOUND_getInstance(), ElevationCorrectionStatus_APPLIED_getInstance(), ElevationCorrectionStatus_FETCH_FAILED_getInstance()];
+  }
+  function get_entries_1() {
+    static_init_2();
+    if ($ENTRIES_1 == null)
+      $ENTRIES_1 = enumEntries(values_1());
+    return $ENTRIES_1;
+  }
+  var $ENTRIES_1;
+  function ElevationCorrectionStatus(name, ordinal, id) {
+    Enum.call(this, name, ordinal);
+    this.x2a_1 = id;
+  }
+  function ElevationCorrectionStatus_NOT_RUN_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_NOT_RUN_instance;
+  }
+  function ElevationCorrectionStatus_UNAVAILABLE_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_UNAVAILABLE_instance;
+  }
+  function ElevationCorrectionStatus_NO_COVERAGE_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_NO_COVERAGE_instance;
+  }
+  function ElevationCorrectionStatus_NONE_FOUND_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_NONE_FOUND_instance;
+  }
+  function ElevationCorrectionStatus_APPLIED_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_APPLIED_instance;
+  }
+  function ElevationCorrectionStatus_FETCH_FAILED_getInstance() {
+    static_init_2();
+    return ElevationCorrectionStatus_FETCH_FAILED_instance;
+  }
+  function Companion_4() {
+  }
+  protoOf(Companion_4).z2a = function (options) {
+    return new ElevationGainResult(0.0, 0.0, 0.0, 0.0, options.c2b_1, options.d2b_1, 0);
+  };
+  var Companion_instance_5;
   function Companion_getInstance_4() {
-    return Companion_instance_4;
+    return Companion_instance_5;
   }
   function ElevationGainResult(gainM, lossM, rawGainM, rawLossM, thresholdM, smoothWindowM, legCount) {
-    this.s2a_1 = gainM;
-    this.t2a_1 = lossM;
-    this.u2a_1 = rawGainM;
-    this.v2a_1 = rawLossM;
-    this.w2a_1 = thresholdM;
-    this.x2a_1 = smoothWindowM;
-    this.y2a_1 = legCount;
+    this.e2b_1 = gainM;
+    this.f2b_1 = lossM;
+    this.g2b_1 = rawGainM;
+    this.h2b_1 = rawLossM;
+    this.i2b_1 = thresholdM;
+    this.j2b_1 = smoothWindowM;
+    this.k2b_1 = legCount;
   }
   protoOf(ElevationGainResult).toString = function () {
-    return 'ElevationGainResult(gainM=' + this.s2a_1 + ', lossM=' + this.t2a_1 + ', rawGainM=' + this.u2a_1 + ', rawLossM=' + this.v2a_1 + ', thresholdM=' + this.w2a_1 + ', smoothWindowM=' + this.x2a_1 + ', legCount=' + this.y2a_1 + ')';
+    return 'ElevationGainResult(gainM=' + this.e2b_1 + ', lossM=' + this.f2b_1 + ', rawGainM=' + this.g2b_1 + ', rawLossM=' + this.h2b_1 + ', thresholdM=' + this.i2b_1 + ', smoothWindowM=' + this.j2b_1 + ', legCount=' + this.k2b_1 + ')';
   };
   protoOf(ElevationGainResult).hashCode = function () {
-    var result = getNumberHashCode(this.s2a_1);
-    result = imul(result, 31) + getNumberHashCode(this.t2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x2a_1) | 0;
-    result = imul(result, 31) + this.y2a_1 | 0;
+    var result = getNumberHashCode(this.e2b_1);
+    result = imul(result, 31) + getNumberHashCode(this.f2b_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.g2b_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h2b_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i2b_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j2b_1) | 0;
+    result = imul(result, 31) + this.k2b_1 | 0;
     return result;
   };
   protoOf(ElevationGainResult).equals = function (other) {
@@ -4867,26 +4990,26 @@
       return true;
     if (!(other instanceof ElevationGainResult))
       return false;
-    if (!equals(this.s2a_1, other.s2a_1))
+    if (!equals(this.e2b_1, other.e2b_1))
       return false;
-    if (!equals(this.t2a_1, other.t2a_1))
+    if (!equals(this.f2b_1, other.f2b_1))
       return false;
-    if (!equals(this.u2a_1, other.u2a_1))
+    if (!equals(this.g2b_1, other.g2b_1))
       return false;
-    if (!equals(this.v2a_1, other.v2a_1))
+    if (!equals(this.h2b_1, other.h2b_1))
       return false;
-    if (!equals(this.w2a_1, other.w2a_1))
+    if (!equals(this.i2b_1, other.i2b_1))
       return false;
-    if (!equals(this.x2a_1, other.x2a_1))
+    if (!equals(this.j2b_1, other.j2b_1))
       return false;
-    if (!(this.y2a_1 === other.y2a_1))
+    if (!(this.k2b_1 === other.k2b_1))
       return false;
     return true;
   };
   function Banked(gainM, lossM, legCount) {
-    this.z2a_1 = gainM;
-    this.a2b_1 = lossM;
-    this.b2b_1 = legCount;
+    this.l2b_1 = gainM;
+    this.m2b_1 = lossM;
+    this.n2b_1 = legCount;
   }
   function accumulate($this, h, threshold) {
     var gain = 0.0;
@@ -4968,15 +5091,15 @@
   }
   function ElevationGain() {
   }
-  protoOf(ElevationGain).c2b = function (path, options) {
+  protoOf(ElevationGain).o2b = function (path, options) {
     if (path.l23_1 < 2)
-      return Companion_instance_4.n2a(options);
+      return Companion_instance_5.z2a(options);
     var tmp = 0;
     var tmp_0 = path.l23_1;
     var tmp_1 = new Float64Array(tmp_0);
     while (tmp < tmp_0) {
       var tmp_2 = tmp;
-      tmp_1[tmp_2] = path.d2b(tmp_2);
+      tmp_1[tmp_2] = path.p2b(tmp_2);
       tmp = tmp + 1 | 0;
     }
     var distanceM = tmp_1;
@@ -4985,28 +5108,28 @@
     var tmp_5 = new Float64Array(tmp_4);
     while (tmp_3 < tmp_4) {
       var tmp_6 = tmp_3;
-      var source = path.e2b(tmp_6);
+      var source = path.q2b(tmp_6);
       tmp_5[tmp_6] = isNaN_0(source) ? path.q23(tmp_6) : source;
       tmp_3 = tmp_3 + 1 | 0;
     }
     var elevationM = tmp_5;
-    return this.f2b(distanceM, elevationM, options);
+    return this.r2b(distanceM, elevationM, options);
   };
-  protoOf(ElevationGain).g2b = function (path, options) {
-    var result = this.c2b(path, options);
-    path.a25_1 = result.s2a_1;
-    path.b25_1 = result.t2a_1;
+  protoOf(ElevationGain).s2b = function (path, options) {
+    var result = this.o2b(path, options);
+    path.a25_1 = result.e2b_1;
+    path.b25_1 = result.f2b_1;
     return result;
   };
-  protoOf(ElevationGain).f2b = function (distanceM, elevationM, options) {
+  protoOf(ElevationGain).r2b = function (distanceM, elevationM, options) {
     // Inline function 'kotlin.require' call
     if (!(distanceM.length === elevationM.length)) {
       var message = 'distanceM (' + distanceM.length + ') and elevationM (' + elevationM.length + ') must have the same length';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     if (elevationM.length < 2)
-      return Companion_instance_4.n2a(options);
-    var profile = ElevationSmoother_instance.k17(distanceM, elevationM, options.r2a_1);
+      return Companion_instance_5.z2a(options);
+    var profile = ElevationSmoother_instance.k17(distanceM, elevationM, options.d2b_1);
     var rawGain = 0.0;
     var rawLoss = 0.0;
     var inductionVariable = 1;
@@ -5022,48 +5145,48 @@
           rawLoss = rawLoss + d;
       }
        while (inductionVariable < last);
-    if (options.q2a_1 <= 0.0) {
-      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.r2a_1, 0);
+    if (options.c2b_1 <= 0.0) {
+      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.d2b_1, 0);
     }
-    var banked = accumulate(this, profile, options.q2a_1);
-    return new ElevationGainResult(banked.z2a_1, banked.a2b_1, rawGain, rawLoss, options.q2a_1, options.r2a_1, banked.b2b_1);
+    var banked = accumulate(this, profile, options.c2b_1);
+    return new ElevationGainResult(banked.l2b_1, banked.m2b_1, rawGain, rawLoss, options.c2b_1, options.d2b_1, banked.n2b_1);
   };
   var ElevationGain_instance;
   function ElevationGain_getInstance() {
     return ElevationGain_instance;
   }
   function ElevationGainPreset$Companion$byId$lambda(it) {
-    return it.l2b();
+    return it.x2b();
   }
-  var static_init_called_2;
-  function static_init_2() {
-    if (static_init_called_2)
+  var static_init_called_3;
+  function static_init_3() {
+    if (static_init_called_3)
       return Unit_instance;
-    static_init_called_2 = true;
+    static_init_called_3 = true;
     ElevationGainPreset_RAW_instance = new ElevationGainPreset('RAW', 0, 0.0, 0.0);
     ElevationGainPreset_BAROMETRIC_instance = new ElevationGainPreset('BAROMETRIC', 1, 2.0, 15.0);
     ElevationGainPreset_DEM_instance = new ElevationGainPreset('DEM', 2, 3.0, 30.0);
     ElevationGainPreset_GPS_instance = new ElevationGainPreset('GPS', 3, 10.0, 50.0);
-    if (Companion_instance_5 == null) {
+    if (Companion_instance_6 == null) {
       Companion_instance;
-      new Companion_4();
+      new Companion_5();
     }
   }
   var ElevationGainPreset_RAW_instance;
   var ElevationGainPreset_BAROMETRIC_instance;
   var ElevationGainPreset_DEM_instance;
   var ElevationGainPreset_GPS_instance;
-  function Companion_4() {
+  function Companion_5() {
   }
-  protoOf(Companion_4).q17 = function (name) {
-    var tmp0 = get_entries_1();
+  protoOf(Companion_5).q17 = function (name) {
+    var tmp0 = get_entries_2();
     var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.collections.firstOrNull' call
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (equals_0(element.l2b(), name, true) || equals_0(element.u1_1, name, true)) {
+        if (equals_0(element.x2b(), name, true) || equals_0(element.u1_1, name, true)) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -5073,34 +5196,34 @@
     var tmp0_elvis_lhs = tmp$ret$0;
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      var tmp_0 = get_entries_1();
+      var tmp_0 = get_entries_2();
       throw IllegalArgumentException_init_$Create$_0("Unknown elevation gain preset '" + name + "': expected one of " + joinToString(tmp_0, ', ', VOID, VOID, VOID, VOID, ElevationGainPreset$Companion$byId$lambda));
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   };
-  var Companion_instance_5;
+  var Companion_instance_6;
   function Companion_getInstance_5() {
-    return Companion_instance_5;
+    return Companion_instance_6;
   }
-  function values_1() {
-    static_init_2();
+  function values_2() {
+    static_init_3();
     return [ElevationGainPreset_RAW_getInstance(), ElevationGainPreset_BAROMETRIC_getInstance(), ElevationGainPreset_DEM_getInstance(), ElevationGainPreset_GPS_getInstance()];
   }
-  function get_entries_1() {
-    static_init_2();
-    if ($ENTRIES_1 == null)
-      $ENTRIES_1 = enumEntries(values_1());
-    return $ENTRIES_1;
+  function get_entries_2() {
+    static_init_3();
+    if ($ENTRIES_2 == null)
+      $ENTRIES_2 = enumEntries(values_2());
+    return $ENTRIES_2;
   }
-  var $ENTRIES_1;
+  var $ENTRIES_2;
   function ElevationGainPreset(name, ordinal, thresholdM, smoothWindowM) {
     Enum.call(this, name, ordinal);
-    this.j2b_1 = thresholdM;
-    this.k2b_1 = smoothWindowM;
+    this.v2b_1 = thresholdM;
+    this.w2b_1 = smoothWindowM;
   }
-  protoOf(ElevationGainPreset).l2b = function () {
+  protoOf(ElevationGainPreset).x2b = function () {
     var tmp;
     switch (this.v1_1) {
       case 0:
@@ -5121,46 +5244,46 @@
     }
     return tmp;
   };
-  function Companion_5() {
-    Companion_instance_6 = this;
-    this.m2b_1 = new ElevationGainOptions();
-    this.n2b_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
+  function Companion_6() {
+    Companion_instance_7 = this;
+    this.y2b_1 = new ElevationGainOptions();
+    this.z2b_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
   }
-  var Companion_instance_6;
+  var Companion_instance_7;
   function Companion_getInstance_6() {
-    if (Companion_instance_6 == null)
-      new Companion_5();
-    return Companion_instance_6;
+    if (Companion_instance_7 == null)
+      new Companion_6();
+    return Companion_instance_7;
   }
   function ElevationGainOptions(enabled, preset, thresholdM, smoothWindowM) {
     Companion_getInstance_6();
     enabled = enabled === VOID ? true : enabled;
     preset = preset === VOID ? ElevationGainPreset_DEM_getInstance() : preset;
-    thresholdM = thresholdM === VOID ? preset.j2b_1 : thresholdM;
-    smoothWindowM = smoothWindowM === VOID ? preset.k2b_1 : smoothWindowM;
-    this.o2a_1 = enabled;
-    this.p2a_1 = preset;
-    this.q2a_1 = thresholdM;
-    this.r2a_1 = smoothWindowM;
+    thresholdM = thresholdM === VOID ? preset.v2b_1 : thresholdM;
+    smoothWindowM = smoothWindowM === VOID ? preset.w2b_1 : smoothWindowM;
+    this.a2b_1 = enabled;
+    this.b2b_1 = preset;
+    this.c2b_1 = thresholdM;
+    this.d2b_1 = smoothWindowM;
     // Inline function 'kotlin.require' call
-    if (!(this.q2a_1 >= 0.0 && isFinite(this.q2a_1))) {
-      var message = 'thresholdM must be finite and >= 0, was ' + this.q2a_1;
+    if (!(this.c2b_1 >= 0.0 && isFinite(this.c2b_1))) {
+      var message = 'thresholdM must be finite and >= 0, was ' + this.c2b_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.r2a_1 >= 0.0 && isFinite(this.r2a_1))) {
-      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.r2a_1;
+    if (!(this.d2b_1 >= 0.0 && isFinite(this.d2b_1))) {
+      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.d2b_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_0));
     }
   }
   protoOf(ElevationGainOptions).toString = function () {
-    return 'ElevationGainOptions(enabled=' + this.o2a_1 + ', preset=' + this.p2a_1.toString() + ', thresholdM=' + this.q2a_1 + ', smoothWindowM=' + this.r2a_1 + ')';
+    return 'ElevationGainOptions(enabled=' + this.a2b_1 + ', preset=' + this.b2b_1.toString() + ', thresholdM=' + this.c2b_1 + ', smoothWindowM=' + this.d2b_1 + ')';
   };
   protoOf(ElevationGainOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.o2a_1);
-    result = imul(result, 31) + this.p2a_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.q2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r2a_1) | 0;
+    var result = getBooleanHashCode(this.a2b_1);
+    result = imul(result, 31) + this.b2b_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.c2b_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.d2b_1) | 0;
     return result;
   };
   protoOf(ElevationGainOptions).equals = function (other) {
@@ -5168,30 +5291,30 @@
       return true;
     if (!(other instanceof ElevationGainOptions))
       return false;
-    if (!(this.o2a_1 === other.o2a_1))
+    if (!(this.a2b_1 === other.a2b_1))
       return false;
-    if (!this.p2a_1.equals(other.p2a_1))
+    if (!this.b2b_1.equals(other.b2b_1))
       return false;
-    if (!equals(this.q2a_1, other.q2a_1))
+    if (!equals(this.c2b_1, other.c2b_1))
       return false;
-    if (!equals(this.r2a_1, other.r2a_1))
+    if (!equals(this.d2b_1, other.d2b_1))
       return false;
     return true;
   };
   function ElevationGainPreset_RAW_getInstance() {
-    static_init_2();
+    static_init_3();
     return ElevationGainPreset_RAW_instance;
   }
   function ElevationGainPreset_BAROMETRIC_getInstance() {
-    static_init_2();
+    static_init_3();
     return ElevationGainPreset_BAROMETRIC_instance;
   }
   function ElevationGainPreset_DEM_getInstance() {
-    static_init_2();
+    static_init_3();
     return ElevationGainPreset_DEM_instance;
   }
   function ElevationGainPreset_GPS_getInstance() {
-    static_init_2();
+    static_init_3();
     return ElevationGainPreset_GPS_instance;
   }
   function copyAllSlots($this, source) {
@@ -5202,10 +5325,10 @@
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var _iterator__ex2g4s = get_entries_2().l();
+        var _iterator__ex2g4s = get_entries_3().l();
         while (_iterator__ex2g4s.m()) {
           var field = _iterator__ex2g4s.n();
-          out.o2b(i, field, source.n26(i, field));
+          out.a2c(i, field, source.o26(i, field));
         }
       }
        while (inductionVariable < last);
@@ -5213,9 +5336,9 @@
   }
   function $fixElevationCOROUTINE$(_this__u8e3s4, source, provider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.x2b_1 = _this__u8e3s4;
-    this.y2b_1 = source;
-    this.z2b_1 = provider;
+    this.j2c_1 = _this__u8e3s4;
+    this.k2c_1 = source;
+    this.l2c_1 = provider;
   }
   protoOf($fixElevationCOROUTINE$).o7 = function () {
     var suspendResult = this.i7_1;
@@ -5225,21 +5348,21 @@
         switch (tmp) {
           case 0:
             this.h7_1 = 2;
-            if (this.y2b_1.l23_1 === 0)
+            if (this.k2c_1.l23_1 === 0)
               return new Path(0);
-            var size = this.y2b_1.l23_1;
+            var size = this.k2c_1.l23_1;
             var list = ArrayList_init_$Create$_0(size);
             var inductionVariable = 0;
             if (inductionVariable < size)
               do {
                 var index = inductionVariable;
                 inductionVariable = inductionVariable + 1 | 0;
-                list.k(new LatLon(this.y2b_1.o23(index) * 57.29577951308232, this.y2b_1.p23(index) * 57.29577951308232));
+                list.k(new LatLon(this.k2c_1.o23(index) * 57.29577951308232, this.k2c_1.p23(index) * 57.29577951308232));
               }
                while (inductionVariable < size);
             var coords = list;
             this.g7_1 = 1;
-            suspendResult = this.z2b_1.e16(coords, VOID, this);
+            suspendResult = this.l2c_1.e16(coords, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5247,7 +5370,7 @@
             continue $sm;
           case 1:
             var corrected = suspendResult;
-            var out = copyAllSlots(this.x2b_1, this.y2b_1);
+            var out = copyAllSlots(this.j2c_1, this.k2c_1);
             var inductionVariable_0 = 0;
             var last = out.l23_1;
             if (inductionVariable_0 < last)
@@ -5257,7 +5380,7 @@
                 out.k24(i, corrected.p(i).e11());
               }
                while (inductionVariable_0 < last);
-            out.e25();
+            out.f25();
             return out;
           case 2:
             throw this.j7_1;
@@ -5274,15 +5397,15 @@
      while (true);
   };
   function ElevationStep() {
-    this.a2c_1 = 150.0;
+    this.m2c_1 = 150.0;
   }
-  protoOf(ElevationStep).b2c = function (source, provider, $completion) {
+  protoOf(ElevationStep).n2c = function (source, provider, $completion) {
     var tmp = new $fixElevationCOROUTINE$(this, source, provider, $completion);
     tmp.i7_1 = Unit_instance;
     tmp.j7_1 = null;
     return tmp.o7();
   };
-  protoOf(ElevationStep).c2c = function (source, windowM) {
+  protoOf(ElevationStep).o2c = function (source, windowM) {
     if (source.l23_1 === 0)
       return new Path(0);
     // Inline function 'kotlin.collections.List' call
@@ -5295,7 +5418,7 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$4 = source.d2c(index);
+        var tmp$ret$4 = source.p2c(index);
         list.k(tmp$ret$4);
       }
        while (inductionVariable < size);
@@ -5308,13 +5431,14 @@
       do {
         var i = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        if (isNaN_0(out.e2b(i))) {
-          out.e2c(i, source.q23(i));
+        if (isNaN_0(out.q2b(i))) {
+          out.q2c(i, source.q23(i));
         }
         out.k24(i, smoothed.p(i).e11());
       }
        while (inductionVariable_0 < last);
-    out.e25();
+    out.f25();
+    out.c25_1 = source.c25_1;
     return out;
   };
   var ElevationStep_instance;
@@ -5323,21 +5447,21 @@
   }
   function FieldInterpolation() {
     FieldInterpolation_instance = this;
-    this.f2c_1 = 6.283185307179586;
-    this.g2c_1 = setOf([PointField_LONGITUDE_getInstance(), PointField_SOURCE_LONGITUDE_getInstance(), PointField_BEARING_getInstance(), PointField_WIND_BEARING_getInstance(), PointField_WIND_DIRECTION_getInstance(), PointField_WIND_ALPHA_getInstance()]);
+    this.r2c_1 = 6.283185307179586;
+    this.s2c_1 = setOf([PointField_LONGITUDE_getInstance(), PointField_SOURCE_LONGITUDE_getInstance(), PointField_BEARING_getInstance(), PointField_WIND_BEARING_getInstance(), PointField_WIND_DIRECTION_getInstance(), PointField_WIND_ALPHA_getInstance()]);
   }
-  protoOf(FieldInterpolation).h2c = function (src, i1, i2, coef, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_2().l();
+  protoOf(FieldInterpolation).t2c = function (src, i1, i2, coef, dst, dstIdx) {
+    var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.o2b(dstIdx, field, this.i2c(field, src.n26(i1, field), src.n26(i2, field), coef));
+      dst.a2c(dstIdx, field, this.u2c(field, src.o26(i1, field), src.o26(i2, field), coef));
     }
   };
-  protoOf(FieldInterpolation).i2c = function (field, v1, v2, coef) {
+  protoOf(FieldInterpolation).u2c = function (field, v1, v2, coef) {
     if (isNaN_0(v1) || isNaN_0(v2))
       return NaN;
     var delta = v2 - v1;
-    if (!this.g2c_1.i1(field) || (delta >= -3.141592653589793 && delta <= 3.141592653589793))
+    if (!this.s2c_1.i1(field) || (delta >= -3.141592653589793 && delta <= 3.141592653589793))
       return v1 + delta * coef;
     var arc = delta > 3.141592653589793 ? delta - 6.283185307179586 : delta + 6.283185307179586;
     var v = v1 + arc * coef;
@@ -5373,10 +5497,10 @@
       }
        while (inductionVariable < last);
   }
-  protoOf(GeneratedPath).n26 = function (i, field) {
+  protoOf(GeneratedPath).o26 = function (i, field) {
     return this.m23_1[imul(i, 44) + field.v1_1 | 0];
   };
-  protoOf(GeneratedPath).o2b = function (i, field, v) {
+  protoOf(GeneratedPath).a2c = function (i, field, v) {
     this.m23_1[imul(i, 44) + field.v1_1 | 0] = v;
   };
   protoOf(GeneratedPath).o23 = function (i) {
@@ -5391,13 +5515,13 @@
   protoOf(GeneratedPath).j24 = function (i, v) {
     this.m23_1[imul(i, 44) + 1 | 0] = v;
   };
-  protoOf(GeneratedPath).d2b = function (i) {
+  protoOf(GeneratedPath).p2b = function (i) {
     return this.m23_1[imul(i, 44) + 2 | 0];
   };
-  protoOf(GeneratedPath).j2c = function (i, v) {
+  protoOf(GeneratedPath).v2c = function (i, v) {
     this.m23_1[imul(i, 44) + 2 | 0] = v;
   };
-  protoOf(GeneratedPath).k2c = function (i, v) {
+  protoOf(GeneratedPath).w2c = function (i, v) {
     this.m23_1[imul(i, 44) + 3 | 0] = v;
   };
   protoOf(GeneratedPath).n23 = function (i) {
@@ -5406,22 +5530,22 @@
   protoOf(GeneratedPath).l24 = function (i, v) {
     this.m23_1[imul(i, 44) + 4 | 0] = v;
   };
-  protoOf(GeneratedPath).l2c = function (i) {
+  protoOf(GeneratedPath).x2c = function (i) {
     return this.m23_1[imul(i, 44) + 5 | 0];
   };
-  protoOf(GeneratedPath).m2c = function (i, v) {
+  protoOf(GeneratedPath).y2c = function (i, v) {
     this.m23_1[imul(i, 44) + 5 | 0] = v;
   };
-  protoOf(GeneratedPath).n2c = function (i) {
+  protoOf(GeneratedPath).z2c = function (i) {
     return this.m23_1[imul(i, 44) + 6 | 0];
   };
-  protoOf(GeneratedPath).o2c = function (i, v) {
+  protoOf(GeneratedPath).a2d = function (i, v) {
     this.m23_1[imul(i, 44) + 6 | 0] = v;
   };
-  protoOf(GeneratedPath).p2c = function (i) {
+  protoOf(GeneratedPath).b2d = function (i) {
     return this.m23_1[imul(i, 44) + 7 | 0];
   };
-  protoOf(GeneratedPath).q2c = function (i, v) {
+  protoOf(GeneratedPath).c2d = function (i, v) {
     this.m23_1[imul(i, 44) + 7 | 0] = v;
   };
   protoOf(GeneratedPath).q23 = function (i) {
@@ -5430,40 +5554,40 @@
   protoOf(GeneratedPath).k24 = function (i, v) {
     this.m23_1[imul(i, 44) + 8 | 0] = v;
   };
-  protoOf(GeneratedPath).r2c = function (i) {
+  protoOf(GeneratedPath).d2d = function (i) {
     return this.m23_1[imul(i, 44) + 9 | 0];
   };
-  protoOf(GeneratedPath).s2c = function (i, v) {
+  protoOf(GeneratedPath).e2d = function (i, v) {
     this.m23_1[imul(i, 44) + 9 | 0] = v;
   };
-  protoOf(GeneratedPath).t2c = function (i) {
+  protoOf(GeneratedPath).f2d = function (i) {
     return this.m23_1[imul(i, 44) + 10 | 0];
   };
-  protoOf(GeneratedPath).u2c = function (i, v) {
+  protoOf(GeneratedPath).g2d = function (i, v) {
     this.m23_1[imul(i, 44) + 10 | 0] = v;
   };
-  protoOf(GeneratedPath).v2c = function (i, v) {
+  protoOf(GeneratedPath).h2d = function (i, v) {
     this.m23_1[imul(i, 44) + 11 | 0] = v;
   };
-  protoOf(GeneratedPath).w2c = function (i, v) {
+  protoOf(GeneratedPath).i2d = function (i, v) {
     this.m23_1[imul(i, 44) + 12 | 0] = v;
   };
-  protoOf(GeneratedPath).x2c = function (i) {
+  protoOf(GeneratedPath).j2d = function (i) {
     return this.m23_1[imul(i, 44) + 13 | 0];
   };
-  protoOf(GeneratedPath).y2c = function (i, v) {
+  protoOf(GeneratedPath).k2d = function (i, v) {
     this.m23_1[imul(i, 44) + 13 | 0] = v;
   };
-  protoOf(GeneratedPath).z2c = function (i, v) {
+  protoOf(GeneratedPath).l2d = function (i, v) {
     this.m23_1[imul(i, 44) + 14 | 0] = v;
   };
-  protoOf(GeneratedPath).a2d = function (i, v) {
+  protoOf(GeneratedPath).m2d = function (i, v) {
     this.m23_1[imul(i, 44) + 15 | 0] = v;
   };
-  protoOf(GeneratedPath).b2d = function (i, v) {
+  protoOf(GeneratedPath).n2d = function (i, v) {
     this.m23_1[imul(i, 44) + 16 | 0] = v;
   };
-  protoOf(GeneratedPath).c2d = function (i, v) {
+  protoOf(GeneratedPath).o2d = function (i, v) {
     this.m23_1[imul(i, 44) + 17 | 0] = v;
   };
   protoOf(GeneratedPath).u23 = function (i) {
@@ -5472,49 +5596,49 @@
   protoOf(GeneratedPath).m24 = function (i, v) {
     this.m23_1[imul(i, 44) + 18 | 0] = v;
   };
-  protoOf(GeneratedPath).d2d = function (i, v) {
+  protoOf(GeneratedPath).p2d = function (i, v) {
     this.m23_1[imul(i, 44) + 19 | 0] = v;
   };
-  protoOf(GeneratedPath).e2d = function (i, v) {
+  protoOf(GeneratedPath).q2d = function (i, v) {
     this.m23_1[imul(i, 44) + 20 | 0] = v;
   };
-  protoOf(GeneratedPath).f2d = function (i, v) {
+  protoOf(GeneratedPath).r2d = function (i, v) {
     this.m23_1[imul(i, 44) + 21 | 0] = v;
   };
-  protoOf(GeneratedPath).g2d = function (i, v) {
+  protoOf(GeneratedPath).s2d = function (i, v) {
     this.m23_1[imul(i, 44) + 22 | 0] = v;
   };
-  protoOf(GeneratedPath).h2d = function (i, v) {
+  protoOf(GeneratedPath).t2d = function (i, v) {
     this.m23_1[imul(i, 44) + 23 | 0] = v;
   };
-  protoOf(GeneratedPath).i2d = function (i, v) {
+  protoOf(GeneratedPath).u2d = function (i, v) {
     this.m23_1[imul(i, 44) + 24 | 0] = v;
   };
-  protoOf(GeneratedPath).j2d = function (i, v) {
+  protoOf(GeneratedPath).v2d = function (i, v) {
     this.m23_1[imul(i, 44) + 25 | 0] = v;
   };
   protoOf(GeneratedPath).v23 = function (i) {
     return this.m23_1[imul(i, 44) + 26 | 0];
   };
-  protoOf(GeneratedPath).k2d = function (i, v) {
+  protoOf(GeneratedPath).w2d = function (i, v) {
     this.m23_1[imul(i, 44) + 26 | 0] = v;
   };
-  protoOf(GeneratedPath).l2d = function (i) {
+  protoOf(GeneratedPath).x2d = function (i) {
     return this.m23_1[imul(i, 44) + 27 | 0];
   };
-  protoOf(GeneratedPath).m2d = function (i, v) {
+  protoOf(GeneratedPath).y2d = function (i, v) {
     this.m23_1[imul(i, 44) + 27 | 0] = v;
   };
-  protoOf(GeneratedPath).n2d = function (i) {
+  protoOf(GeneratedPath).z2d = function (i) {
     return this.m23_1[imul(i, 44) + 28 | 0];
   };
-  protoOf(GeneratedPath).o2d = function (i, v) {
+  protoOf(GeneratedPath).a2e = function (i, v) {
     this.m23_1[imul(i, 44) + 28 | 0] = v;
   };
-  protoOf(GeneratedPath).p2d = function (i, v) {
+  protoOf(GeneratedPath).b2e = function (i, v) {
     this.m23_1[imul(i, 44) + 29 | 0] = v;
   };
-  protoOf(GeneratedPath).q2d = function (i, v) {
+  protoOf(GeneratedPath).c2e = function (i, v) {
     this.m23_1[imul(i, 44) + 30 | 0] = v;
   };
   protoOf(GeneratedPath).t23 = function (i) {
@@ -5523,13 +5647,13 @@
   protoOf(GeneratedPath).p24 = function (i, v) {
     this.m23_1[imul(i, 44) + 31 | 0] = v;
   };
-  protoOf(GeneratedPath).r2d = function (i) {
+  protoOf(GeneratedPath).d2e = function (i) {
     return this.m23_1[imul(i, 44) + 32 | 0];
   };
-  protoOf(GeneratedPath).s2d = function (i, v) {
+  protoOf(GeneratedPath).e2e = function (i, v) {
     this.m23_1[imul(i, 44) + 32 | 0] = v;
   };
-  protoOf(GeneratedPath).t2d = function (i, v) {
+  protoOf(GeneratedPath).f2e = function (i, v) {
     this.m23_1[imul(i, 44) + 33 | 0] = v;
   };
   protoOf(GeneratedPath).r23 = function (i) {
@@ -5544,64 +5668,64 @@
   protoOf(GeneratedPath).o24 = function (i, v) {
     this.m23_1[imul(i, 44) + 35 | 0] = v;
   };
-  protoOf(GeneratedPath).u2d = function (i, v) {
+  protoOf(GeneratedPath).g2e = function (i, v) {
     this.m23_1[imul(i, 44) + 36 | 0] = v;
   };
-  protoOf(GeneratedPath).v2d = function (i, v) {
+  protoOf(GeneratedPath).h2e = function (i, v) {
     this.m23_1[imul(i, 44) + 37 | 0] = v;
   };
-  protoOf(GeneratedPath).w2d = function (i) {
+  protoOf(GeneratedPath).i2e = function (i) {
     return this.m23_1[imul(i, 44) + 38 | 0];
   };
-  protoOf(GeneratedPath).x2d = function (i, v) {
+  protoOf(GeneratedPath).j2e = function (i, v) {
     this.m23_1[imul(i, 44) + 38 | 0] = v;
   };
-  protoOf(GeneratedPath).y2d = function (i) {
+  protoOf(GeneratedPath).k2e = function (i) {
     return this.m23_1[imul(i, 44) + 39 | 0];
   };
   protoOf(GeneratedPath).s24 = function (i, v) {
     this.m23_1[imul(i, 44) + 39 | 0] = v;
   };
-  protoOf(GeneratedPath).z2d = function (i, v) {
+  protoOf(GeneratedPath).l2e = function (i, v) {
     this.m23_1[imul(i, 44) + 40 | 0] = v;
   };
-  protoOf(GeneratedPath).a2e = function (i, v) {
+  protoOf(GeneratedPath).m2e = function (i, v) {
     this.m23_1[imul(i, 44) + 41 | 0] = v;
   };
-  protoOf(GeneratedPath).b2e = function (i, v) {
+  protoOf(GeneratedPath).n2e = function (i, v) {
     this.m23_1[imul(i, 44) + 42 | 0] = v;
   };
-  protoOf(GeneratedPath).e2b = function (i) {
+  protoOf(GeneratedPath).q2b = function (i) {
     return this.m23_1[imul(i, 44) + 43 | 0];
   };
-  protoOf(GeneratedPath).e2c = function (i, v) {
+  protoOf(GeneratedPath).q2c = function (i, v) {
     this.m23_1[imul(i, 44) + 43 | 0] = v;
   };
-  function Companion_6() {
-    Companion_instance_7 = this;
-    this.c2e_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
+  function Companion_7() {
+    Companion_instance_8 = this;
+    this.o2e_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
   }
-  var Companion_instance_7;
+  var Companion_instance_8;
   function Companion_getInstance_7() {
-    if (Companion_instance_7 == null)
-      new Companion_6();
-    return Companion_instance_7;
+    if (Companion_instance_8 == null)
+      new Companion_7();
+    return Companion_instance_8;
   }
   function BoundsRad(minLat, maxLat, minLon, maxLon) {
     Companion_getInstance_7();
-    this.d2e_1 = minLat;
-    this.e2e_1 = maxLat;
-    this.f2e_1 = minLon;
-    this.g2e_1 = maxLon;
+    this.p2e_1 = minLat;
+    this.q2e_1 = maxLat;
+    this.r2e_1 = minLon;
+    this.s2e_1 = maxLon;
   }
   protoOf(BoundsRad).toString = function () {
-    return 'BoundsRad(minLat=' + this.d2e_1 + ', maxLat=' + this.e2e_1 + ', minLon=' + this.f2e_1 + ', maxLon=' + this.g2e_1 + ')';
+    return 'BoundsRad(minLat=' + this.p2e_1 + ', maxLat=' + this.q2e_1 + ', minLon=' + this.r2e_1 + ', maxLon=' + this.s2e_1 + ')';
   };
   protoOf(BoundsRad).hashCode = function () {
-    var result = getNumberHashCode(this.d2e_1);
-    result = imul(result, 31) + getNumberHashCode(this.e2e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f2e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g2e_1) | 0;
+    var result = getNumberHashCode(this.p2e_1);
+    result = imul(result, 31) + getNumberHashCode(this.q2e_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.r2e_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s2e_1) | 0;
     return result;
   };
   protoOf(BoundsRad).equals = function (other) {
@@ -5609,13 +5733,13 @@
       return true;
     if (!(other instanceof BoundsRad))
       return false;
-    if (!equals(this.d2e_1, other.d2e_1))
+    if (!equals(this.p2e_1, other.p2e_1))
       return false;
-    if (!equals(this.e2e_1, other.e2e_1))
+    if (!equals(this.q2e_1, other.q2e_1))
       return false;
-    if (!equals(this.f2e_1, other.f2e_1))
+    if (!equals(this.r2e_1, other.r2e_1))
       return false;
-    if (!equals(this.g2e_1, other.g2e_1))
+    if (!equals(this.s2e_1, other.s2e_1))
       return false;
     return true;
   };
@@ -5629,6 +5753,7 @@
     $this.b25_1 = other.b25_1;
     $this.c25_1 = other.c25_1;
     $this.d25_1 = other.d25_1;
+    $this.e25_1 = other.e25_1;
   }
   function resetStats($this) {
     $this.v24_1 = 0.0;
@@ -5638,8 +5763,8 @@
     $this.z24_1 = 0.0;
     $this.a25_1 = NaN;
     $this.b25_1 = NaN;
-    $this.c25_1 = 0.0;
-    $this.d25_1 = Companion_getInstance_7().c2e_1;
+    $this.d25_1 = 0.0;
+    $this.e25_1 = Companion_getInstance_7().o2e_1;
   }
   function computeBearing($this, from, to) {
     var lat1 = $this.o23(from);
@@ -5659,11 +5784,11 @@
     var y = -dy;
     return Math.atan2(y, dx);
   }
-  function Companion_7() {
+  function Companion_8() {
   }
-  var Companion_instance_8;
+  var Companion_instance_9;
   function Companion_getInstance_8() {
-    return Companion_instance_8;
+    return Companion_instance_9;
   }
   function Path(size) {
     GeneratedPath.call(this, size);
@@ -5674,28 +5799,29 @@
     this.z24_1 = 0.0;
     this.a25_1 = NaN;
     this.b25_1 = NaN;
-    this.c25_1 = 0.0;
-    this.d25_1 = Companion_getInstance_7().c2e_1;
+    this.c25_1 = null;
+    this.d25_1 = 0.0;
+    this.e25_1 = Companion_getInstance_7().o2e_1;
   }
-  protoOf(Path).h2e = function () {
+  protoOf(Path).t2e = function () {
     return isNaN_0(this.a25_1) ? this.y24_1 : this.a25_1;
   };
-  protoOf(Path).i2e = function () {
+  protoOf(Path).u2e = function () {
     return isNaN_0(this.b25_1) ? this.z24_1 : this.b25_1;
   };
-  protoOf(Path).j2e = function () {
+  protoOf(Path).v2e = function () {
     return until(0, this.l23_1);
   };
-  protoOf(Path).k2e = function (i) {
+  protoOf(Path).w2e = function (i) {
     return this.o23(i) * 57.29577951308232;
   };
-  protoOf(Path).l2e = function (i) {
+  protoOf(Path).x2e = function (i) {
     return this.p23(i) * 57.29577951308232;
   };
-  protoOf(Path).d2c = function (i) {
-    return new LatLonElevation(this.k2e(i), this.l2e(i), this.q23(i));
+  protoOf(Path).p2c = function (i) {
+    return new LatLonElevation(this.w2e(i), this.x2e(i), this.q23(i));
   };
-  protoOf(Path).m2e = function () {
+  protoOf(Path).y2e = function () {
     var out = new Path(this.l23_1);
     var tmp0 = this.m23_1;
     var tmp2 = out.m23_1;
@@ -5710,7 +5836,7 @@
     copyStatsFrom(out, this);
     return out;
   };
-  protoOf(Path).e25 = function () {
+  protoOf(Path).f25 = function () {
     resetStats(this);
     if (this.l23_1 === 0)
       return Unit_instance;
@@ -5752,8 +5878,8 @@
         var a_4 = maxEle;
         maxEle = Math.max(a_4, ele);
         if (i > 0) {
-          var prevCoord = new LatLon(this.k2e(i - 1 | 0), this.l2e(i - 1 | 0));
-          var curCoord = new LatLon(this.k2e(i), this.l2e(i));
+          var prevCoord = new LatLon(this.w2e(i - 1 | 0), this.x2e(i - 1 | 0));
+          var curCoord = new LatLon(this.w2e(i), this.x2e(i));
           cumDist = cumDist + Distance_instance.z10(prevCoord, curCoord);
           var dEle = ele - this.q23(i - 1 | 0);
           if (dEle > 0)
@@ -5761,7 +5887,7 @@
           else
             loss = loss + dEle;
         }
-        this.j2c(i, cumDist);
+        this.v2c(i, cumDist);
       }
        while (inductionVariable < last);
     this.v24_1 = cumDist;
@@ -5769,15 +5895,15 @@
     this.x24_1 = maxEle === -Infinity ? 0.0 : maxEle;
     this.y24_1 = gain;
     this.z24_1 = loss;
-    this.d25_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
-    this.c25_1 = this.l23_1 >= 2 ? this.n23(this.l23_1 - 1 | 0) - timeStart : 0.0;
+    this.e25_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
+    this.d25_1 = this.l23_1 >= 2 ? this.n23(this.l23_1 - 1 | 0) - timeStart : 0.0;
     var inductionVariable_0 = 0;
     var last_0 = this.l23_1;
     if (inductionVariable_0 < last_0)
       $l$loop: do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        this.m2c(i_0, (this.n23(i_0) - timeStart) / 1000.0);
+        this.y2c(i_0, (this.n23(i_0) - timeStart) / 1000.0);
         if (this.l23_1 <= 1)
           continue $l$loop;
         // Inline function 'kotlin.math.max' call
@@ -5787,23 +5913,23 @@
         // Inline function 'kotlin.math.min' call
         var b_0 = i_0 + 1 | 0;
         var ip1 = Math.min(tmp0, b_0);
-        this.q2c(i_0, computeBearing(this, im1, ip1));
-        var dDist = (this.d2b(ip1) - this.d2b(im1)) / 2.0;
+        this.c2d(i_0, computeBearing(this, im1, ip1));
+        var dDist = (this.p2b(ip1) - this.p2b(im1)) / 2.0;
         var dEle_0 = (this.q23(ip1) - this.q23(im1)) / 2.0;
         var grade = dDist === 0.0 ? 0.0 : dEle_0 / dDist;
-        this.s2c(i_0, grade);
+        this.e2d(i_0, grade);
         var dTime = (this.n23(ip1) - this.n23(im1)) / 2000.0;
-        this.k2c(i_0, dDist);
-        this.o2c(i_0, dTime);
-        this.m2d(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
+        this.w2c(i_0, dDist);
+        this.a2d(i_0, dTime);
+        this.y2d(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
       }
        while (inductionVariable_0 < last_0);
   };
   function PathSimplifier() {
   }
-  protoOf(PathSimplifier).n2e = function (path, toleranceM, zExaggeration) {
+  protoOf(PathSimplifier).z2e = function (path, toleranceM, zExaggeration) {
     if (path.l23_1 <= 2)
-      return path.m2e();
+      return path.y2e();
     var coords = ArrayList_init_$Create$_0(path.l23_1);
     var inductionVariable = 0;
     var last = path.l23_1;
@@ -5842,26 +5968,27 @@
       var dstIdx = index;
       index = index + 1 | 0;
       var srcIdx = iterator.n();
-      var _iterator__ex2g4s_0 = get_entries_2().l();
+      var _iterator__ex2g4s_0 = get_entries_3().l();
       while (_iterator__ex2g4s_0.m()) {
         var field = _iterator__ex2g4s_0.n();
-        out.o2b(dstIdx, field, path.n26(srcIdx, field));
+        out.a2c(dstIdx, field, path.o26(srcIdx, field));
       }
     }
-    out.e25();
+    out.f25();
     out.a25_1 = path.a25_1;
     out.b25_1 = path.b25_1;
+    out.c25_1 = path.c25_1;
     return out;
   };
   var PathSimplifier_instance;
   function PathSimplifier_getInstance() {
     return PathSimplifier_instance;
   }
-  var static_init_called_3;
-  function static_init_3() {
-    if (static_init_called_3)
+  var static_init_called_4;
+  function static_init_4() {
+    if (static_init_called_4)
       return Unit_instance;
-    static_init_called_3 = true;
+    static_init_called_4 = true;
     PointField_LATITUDE_instance = new PointField('LATITUDE', 0, 'latitude', 'radians', 'Latitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
     PointField_LONGITUDE_instance = new PointField('LONGITUDE', 1, 'longitude', 'radians', 'Longitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
     PointField_DISTANCE_instance = new PointField('DISTANCE', 2, 'distance', 'meters', 'Distance (meters)', PointFieldCategory_COORDINATES_getInstance());
@@ -5906,9 +6033,9 @@
     PointField_SOURCE_LATITUDE_instance = new PointField('SOURCE_LATITUDE', 41, 'sourceLatitude', 'radians', 'Original latitude before the racing line (radians)', PointFieldCategory_ROAD_getInstance(), true, true, true);
     PointField_SOURCE_LONGITUDE_instance = new PointField('SOURCE_LONGITUDE', 42, 'sourceLongitude', 'radians', 'Original longitude before the racing line (radians)', PointFieldCategory_ROAD_getInstance(), true, true, true);
     PointField_SOURCE_ELEVATION_instance = new PointField('SOURCE_ELEVATION', 43, 'sourceElevation', 'meters', 'Original elevation before smoothing (m)', PointFieldCategory_ELEVATION_getInstance(), true, VOID, true);
-    if (Companion_instance_9 == null) {
+    if (Companion_instance_10 == null) {
       Companion_instance;
-      new Companion_8();
+      new Companion_9();
     }
   }
   var PointField_LATITUDE_instance;
@@ -5955,236 +6082,236 @@
   var PointField_SOURCE_LATITUDE_instance;
   var PointField_SOURCE_LONGITUDE_instance;
   var PointField_SOURCE_ELEVATION_instance;
-  function Companion_8() {
-    Companion_instance_9 = this;
-    this.o2e_1 = 44;
+  function Companion_9() {
+    Companion_instance_10 = this;
+    this.a2f_1 = 44;
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
-    var this_0 = get_entries_2();
+    var this_0 = get_entries_3();
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination = LinkedHashMap_init_$Create$(capacity);
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
-      var tmp$ret$2 = element.f26_1;
+      var tmp$ret$2 = element.g26_1;
       destination.s3(tmp$ret$2, element);
     }
-    tmp.p2e_1 = destination;
+    tmp.b2f_1 = destination;
   }
-  protoOf(Companion_8).q2e = function (prop) {
-    return this.p2e_1.q1(prop);
+  protoOf(Companion_9).c2f = function (prop) {
+    return this.b2f_1.q1(prop);
   };
-  var Companion_instance_9;
+  var Companion_instance_10;
   function Companion_getInstance_9() {
-    static_init_3();
-    return Companion_instance_9;
+    static_init_4();
+    return Companion_instance_10;
   }
-  function values_2() {
-    static_init_3();
+  function values_3() {
+    static_init_4();
     return [PointField_LATITUDE_getInstance(), PointField_LONGITUDE_getInstance(), PointField_DISTANCE_getInstance(), PointField_DX_getInstance(), PointField_TIME_getInstance(), PointField_ELAPSED_getInstance(), PointField_DT_getInstance(), PointField_BEARING_getInstance(), PointField_ELEVATION_getInstance(), PointField_GRADE_getInstance(), PointField_RADIUS_getInstance(), PointField_AERO_COEF_getInstance(), PointField_WIND_BEARING_getInstance(), PointField_WIND_ALPHA_getInstance(), PointField_P_AERO_getInstance(), PointField_P_GRAVITY_getInstance(), PointField_P_ROLLING_RESISTANCE_getInstance(), PointField_P_WHEEL_BEARINGS_getInstance(), PointField_P_INPUT_POWER_getInstance(), PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_getInstance(), PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_getInstance(), PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_getInstance(), PointField_P_CYCLIST_PROVIDED_MUSCULAR_getInstance(), PointField_P_CYCLIST_PROVIDED_WHEEL_getInstance(), PointField_P_COMPUTED_TOTAL_POWER_getInstance(), PointField_P_COMPUTED_WHEEL_POWER_getInstance(), PointField_POWER_getInstance(), PointField_SPEED_getInstance(), PointField_SPEED_MAX_getInstance(), PointField_SPEED_MAX_INCLINE_getInstance(), PointField_VIRT_SPEED_CURRENT_getInstance(), PointField_TEMPERATURE_getInstance(), PointField_WIND_SPEED_getInstance(), PointField_WIND_DIRECTION_getInstance(), PointField_HEART_RATE_getInstance(), PointField_CADENCE_getInstance(), PointField_W_PRIME_BALANCE_getInstance(), PointField_P_BRAKE_getInstance(), PointField_TRAJECTORY_CURVATURE_getInstance(), PointField_ROAD_WIDTH_getInstance(), PointField_LATERAL_OFFSET_getInstance(), PointField_SOURCE_LATITUDE_getInstance(), PointField_SOURCE_LONGITUDE_getInstance(), PointField_SOURCE_ELEVATION_getInstance()];
   }
-  function get_entries_2() {
-    static_init_3();
-    if ($ENTRIES_2 == null)
-      $ENTRIES_2 = enumEntries(values_2());
-    return $ENTRIES_2;
+  function get_entries_3() {
+    static_init_4();
+    if ($ENTRIES_3 == null)
+      $ENTRIES_3 = enumEntries(values_3());
+    return $ENTRIES_3;
   }
-  var $ENTRIES_2;
+  var $ENTRIES_3;
   function PointField(name, ordinal, prop, unit, shortDescription, category, notSelectable, anglesInRadians, nanDefault) {
     notSelectable = notSelectable === VOID ? false : notSelectable;
     anglesInRadians = anglesInRadians === VOID ? false : anglesInRadians;
     nanDefault = nanDefault === VOID ? false : nanDefault;
     Enum.call(this, name, ordinal);
-    this.f26_1 = prop;
-    this.g26_1 = unit;
-    this.h26_1 = shortDescription;
-    this.i26_1 = category;
-    this.j26_1 = notSelectable;
-    this.k26_1 = anglesInRadians;
-    this.l26_1 = nanDefault;
+    this.g26_1 = prop;
+    this.h26_1 = unit;
+    this.i26_1 = shortDescription;
+    this.j26_1 = category;
+    this.k26_1 = notSelectable;
+    this.l26_1 = anglesInRadians;
+    this.m26_1 = nanDefault;
   }
   function PointField_LATITUDE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_LATITUDE_instance;
   }
   function PointField_LONGITUDE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_LONGITUDE_instance;
   }
   function PointField_DISTANCE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_DISTANCE_instance;
   }
   function PointField_DX_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_DX_instance;
   }
   function PointField_TIME_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_TIME_instance;
   }
   function PointField_ELAPSED_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_ELAPSED_instance;
   }
   function PointField_DT_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_DT_instance;
   }
   function PointField_BEARING_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_BEARING_instance;
   }
   function PointField_ELEVATION_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_ELEVATION_instance;
   }
   function PointField_GRADE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_GRADE_instance;
   }
   function PointField_RADIUS_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_RADIUS_instance;
   }
   function PointField_AERO_COEF_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_AERO_COEF_instance;
   }
   function PointField_WIND_BEARING_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_WIND_BEARING_instance;
   }
   function PointField_WIND_ALPHA_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_WIND_ALPHA_instance;
   }
   function PointField_P_AERO_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_AERO_instance;
   }
   function PointField_P_GRAVITY_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_GRAVITY_instance;
   }
   function PointField_P_ROLLING_RESISTANCE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_ROLLING_RESISTANCE_instance;
   }
   function PointField_P_WHEEL_BEARINGS_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_WHEEL_BEARINGS_instance;
   }
   function PointField_P_INPUT_POWER_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_INPUT_POWER_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_MUSCULAR_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_CYCLIST_PROVIDED_MUSCULAR_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_WHEEL_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_CYCLIST_PROVIDED_WHEEL_instance;
   }
   function PointField_P_COMPUTED_TOTAL_POWER_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_COMPUTED_TOTAL_POWER_instance;
   }
   function PointField_P_COMPUTED_WHEEL_POWER_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_COMPUTED_WHEEL_POWER_instance;
   }
   function PointField_POWER_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_POWER_instance;
   }
   function PointField_SPEED_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SPEED_instance;
   }
   function PointField_SPEED_MAX_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SPEED_MAX_instance;
   }
   function PointField_SPEED_MAX_INCLINE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SPEED_MAX_INCLINE_instance;
   }
   function PointField_VIRT_SPEED_CURRENT_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_VIRT_SPEED_CURRENT_instance;
   }
   function PointField_TEMPERATURE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_TEMPERATURE_instance;
   }
   function PointField_WIND_SPEED_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_WIND_SPEED_instance;
   }
   function PointField_WIND_DIRECTION_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_WIND_DIRECTION_instance;
   }
   function PointField_HEART_RATE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_HEART_RATE_instance;
   }
   function PointField_CADENCE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_CADENCE_instance;
   }
   function PointField_W_PRIME_BALANCE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_W_PRIME_BALANCE_instance;
   }
   function PointField_P_BRAKE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_P_BRAKE_instance;
   }
   function PointField_TRAJECTORY_CURVATURE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_TRAJECTORY_CURVATURE_instance;
   }
   function PointField_ROAD_WIDTH_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_ROAD_WIDTH_instance;
   }
   function PointField_LATERAL_OFFSET_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_LATERAL_OFFSET_instance;
   }
   function PointField_SOURCE_LATITUDE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SOURCE_LATITUDE_instance;
   }
   function PointField_SOURCE_LONGITUDE_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SOURCE_LONGITUDE_instance;
   }
   function PointField_SOURCE_ELEVATION_getInstance() {
-    static_init_3();
+    static_init_4();
     return PointField_SOURCE_ELEVATION_instance;
   }
-  var static_init_called_4;
-  function static_init_4() {
-    if (static_init_called_4)
+  var static_init_called_5;
+  function static_init_5() {
+    if (static_init_called_5)
       return Unit_instance;
-    static_init_called_4 = true;
+    static_init_called_5 = true;
     PointFieldCategory_COORDINATES_instance = new PointFieldCategory('COORDINATES', 0, 'coordinates', 'Coordinates');
     PointFieldCategory_TEMPORAL_instance = new PointFieldCategory('TEMPORAL', 1, 'temporal', 'Temporal');
     PointFieldCategory_ANGLES_instance = new PointFieldCategory('ANGLES', 2, 'angles', 'Angles');
@@ -6218,99 +6345,99 @@
   var PointFieldCategory_ROAD_instance;
   function PointFieldCategory(name, ordinal, id, displayName) {
     Enum.call(this, name, ordinal);
-    this.t2e_1 = id;
-    this.u2e_1 = displayName;
+    this.f2f_1 = id;
+    this.g2f_1 = displayName;
   }
   function PointFieldCategory_COORDINATES_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_COORDINATES_instance;
   }
   function PointFieldCategory_TEMPORAL_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_TEMPORAL_instance;
   }
   function PointFieldCategory_ANGLES_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_ANGLES_instance;
   }
   function PointFieldCategory_ELEVATION_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_ELEVATION_instance;
   }
   function PointFieldCategory_GRADE_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_GRADE_instance;
   }
   function PointFieldCategory_RADIUS_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_RADIUS_instance;
   }
   function PointFieldCategory_AERO_COEF_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_AERO_COEF_instance;
   }
   function PointFieldCategory_CYCLIST_WIND_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_CYCLIST_WIND_instance;
   }
   function PointFieldCategory_POWER_PHYSICS_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_POWER_PHYSICS_instance;
   }
   function PointFieldCategory_POWER_CYCLIST_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_POWER_CYCLIST_instance;
   }
   function PointFieldCategory_POWER_POST_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_POWER_POST_instance;
   }
   function PointFieldCategory_SPEED_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_SPEED_instance;
   }
   function PointFieldCategory_ENVIRONMENTAL_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_ENVIRONMENTAL_instance;
   }
   function PointFieldCategory_PHYSIOLOGICAL_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_PHYSIOLOGICAL_instance;
   }
   function PointFieldCategory_ROAD_getInstance() {
-    static_init_4();
+    static_init_5();
     return PointFieldCategory_ROAD_instance;
   }
   function Copy(sourceIndex) {
-    this.v2e_1 = sourceIndex;
+    this.h2f_1 = sourceIndex;
   }
   protoOf(Copy).toString = function () {
-    return 'Copy(sourceIndex=' + this.v2e_1 + ')';
+    return 'Copy(sourceIndex=' + this.h2f_1 + ')';
   };
   protoOf(Copy).hashCode = function () {
-    return this.v2e_1;
+    return this.h2f_1;
   };
   protoOf(Copy).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy))
       return false;
-    if (!(this.v2e_1 === other.v2e_1))
+    if (!(this.h2f_1 === other.h2f_1))
       return false;
     return true;
   };
   function Interpolate(from, to, coef) {
-    this.w2e_1 = from;
-    this.x2e_1 = to;
-    this.y2e_1 = coef;
+    this.i2f_1 = from;
+    this.j2f_1 = to;
+    this.k2f_1 = coef;
   }
   protoOf(Interpolate).toString = function () {
-    return 'Interpolate(from=' + this.w2e_1 + ', to=' + this.x2e_1 + ', coef=' + this.y2e_1 + ')';
+    return 'Interpolate(from=' + this.i2f_1 + ', to=' + this.j2f_1 + ', coef=' + this.k2f_1 + ')';
   };
   protoOf(Interpolate).hashCode = function () {
-    var result = this.w2e_1;
-    result = imul(result, 31) + this.x2e_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y2e_1) | 0;
+    var result = this.i2f_1;
+    result = imul(result, 31) + this.j2f_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k2f_1) | 0;
     return result;
   };
   protoOf(Interpolate).equals = function (other) {
@@ -6318,11 +6445,11 @@
       return true;
     if (!(other instanceof Interpolate))
       return false;
-    if (!(this.w2e_1 === other.w2e_1))
+    if (!(this.i2f_1 === other.i2f_1))
       return false;
-    if (!(this.x2e_1 === other.x2e_1))
+    if (!(this.j2f_1 === other.j2f_1))
       return false;
-    if (!equals(this.y2e_1, other.y2e_1))
+    if (!equals(this.k2f_1, other.k2f_1))
       return false;
     return true;
   };
@@ -6332,14 +6459,14 @@
     // Inline function 'kotlin.collections.plusAssign' call
     var element = new Copy(0);
     plan.k(element);
-    var lastAddedDistance = source.d2b(0);
+    var lastAddedDistance = source.p2b(0);
     var lastAddedIndex = 0;
     var inductionVariable = 1;
     if (inductionVariable < n)
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var curDist = source.d2b(i);
+        var curDist = source.p2b(i);
         var gap = curDist - lastAddedDistance;
         if (gap < minDistanceM)
           continue $l$loop;
@@ -6362,11 +6489,11 @@
               var j = inductionVariable_0;
               inductionVariable_0 = inductionVariable_0 + 1 | 0;
               var targetDistance = lastAddedDistance + j * spacing;
-              while (index1 < (i - 1 | 0) && source.d2b(index1 + 1 | 0) < targetDistance) {
+              while (index1 < (i - 1 | 0) && source.p2b(index1 + 1 | 0) < targetDistance) {
                 index1 = index1 + 1 | 0;
               }
-              var dist1 = source.d2b(index1);
-              var dist2 = source.d2b(index1 + 1 | 0);
+              var dist1 = source.p2b(index1);
+              var dist2 = source.p2b(index1 + 1 | 0);
               var coef = (targetDistance - dist1) / (dist2 - dist1);
               // Inline function 'kotlin.collections.plusAssign' call
               var element_1 = new Interpolate(index1, index1 + 1 | 0, coef);
@@ -6392,31 +6519,31 @@
       index = index + 1 | 0;
       var op = iterator.n();
       if (op instanceof Copy) {
-        copyFields($this, source, op.v2e_1, out, dstIdx);
+        copyFields($this, source, op.h2f_1, out, dstIdx);
       } else {
         if (op instanceof Interpolate) {
-          FieldInterpolation_getInstance().h2c(source, op.w2e_1, op.x2e_1, op.y2e_1, out, dstIdx);
+          FieldInterpolation_getInstance().t2c(source, op.i2f_1, op.j2f_1, op.k2f_1, out, dstIdx);
         } else {
           noWhenBranchMatchedException();
         }
       }
     }
-    out.e25();
+    out.f25();
     return out;
   }
   function copyFields($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_2().l();
+    var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.o2b(dstIdx, field, src.n26(srcIdx, field));
+      dst.a2c(dstIdx, field, src.o26(srcIdx, field));
     }
   }
   function PointPerDistance() {
   }
-  protoOf(PointPerDistance).z2e = function (source, minDistanceM, maxDistanceM) {
-    return this.a2f(source, minDistanceM, maxDistanceM);
+  protoOf(PointPerDistance).l2f = function (source, minDistanceM, maxDistanceM) {
+    return this.m2f(source, minDistanceM, maxDistanceM);
   };
-  protoOf(PointPerDistance).a2f = function (source, minDistanceM, maxDistanceM) {
+  protoOf(PointPerDistance).m2f = function (source, minDistanceM, maxDistanceM) {
     // Inline function 'kotlin.require' call
     if (!(maxDistanceM > 0.0)) {
       var message = 'maxDistanceM must be > 0, got ' + maxDistanceM;
@@ -6427,7 +6554,7 @@
     if (source.l23_1 === 1) {
       var out = new Path(1);
       copyFields(this, source, 0, out, 0);
-      out.e25();
+      out.f25();
       return out;
     }
     var plan = buildPlan(this, source, minDistanceM, maxDistanceM);
@@ -6438,35 +6565,35 @@
     return PointPerDistance_instance;
   }
   function Copy_0(sourceIndex) {
-    this.b2f_1 = sourceIndex;
+    this.n2f_1 = sourceIndex;
   }
   protoOf(Copy_0).toString = function () {
-    return 'Copy(sourceIndex=' + this.b2f_1 + ')';
+    return 'Copy(sourceIndex=' + this.n2f_1 + ')';
   };
   protoOf(Copy_0).hashCode = function () {
-    return this.b2f_1;
+    return this.n2f_1;
   };
   protoOf(Copy_0).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy_0))
       return false;
-    if (!(this.b2f_1 === other.b2f_1))
+    if (!(this.n2f_1 === other.n2f_1))
       return false;
     return true;
   };
   function Interpolate_0(from, to, coef) {
-    this.c2f_1 = from;
-    this.d2f_1 = to;
-    this.e2f_1 = coef;
+    this.o2f_1 = from;
+    this.p2f_1 = to;
+    this.q2f_1 = coef;
   }
   protoOf(Interpolate_0).toString = function () {
-    return 'Interpolate(from=' + this.c2f_1 + ', to=' + this.d2f_1 + ', coef=' + this.e2f_1 + ')';
+    return 'Interpolate(from=' + this.o2f_1 + ', to=' + this.p2f_1 + ', coef=' + this.q2f_1 + ')';
   };
   protoOf(Interpolate_0).hashCode = function () {
-    var result = this.c2f_1;
-    result = imul(result, 31) + this.d2f_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e2f_1) | 0;
+    var result = this.o2f_1;
+    result = imul(result, 31) + this.p2f_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.q2f_1) | 0;
     return result;
   };
   protoOf(Interpolate_0).equals = function (other) {
@@ -6474,11 +6601,11 @@
       return true;
     if (!(other instanceof Interpolate_0))
       return false;
-    if (!(this.c2f_1 === other.c2f_1))
+    if (!(this.o2f_1 === other.o2f_1))
       return false;
-    if (!(this.d2f_1 === other.d2f_1))
+    if (!(this.p2f_1 === other.p2f_1))
       return false;
-    if (!equals(this.e2f_1, other.e2f_1))
+    if (!equals(this.q2f_1, other.q2f_1))
       return false;
     return true;
   };
@@ -6556,29 +6683,29 @@
       }
       var data = tmp;
       if (data instanceof Copy_0) {
-        copyFields_0($this, source, data.b2f_1, out, idx);
+        copyFields_0($this, source, data.n2f_1, out, idx);
       } else {
         if (data instanceof Interpolate_0) {
-          FieldInterpolation_getInstance().h2c(source, data.c2f_1, data.d2f_1, data.e2f_1, out, idx);
+          FieldInterpolation_getInstance().t2c(source, data.o2f_1, data.p2f_1, data.q2f_1, out, idx);
         } else {
           noWhenBranchMatchedException();
         }
       }
       out.l24(idx, toNumber(multiply(epoch, new Long(1000, 0))));
     }
-    out.e25();
+    out.f25();
     return out;
   }
   function copyFields_0($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_2().l();
+    var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.o2b(dstIdx, field, src.n26(srcIdx, field));
+      dst.a2c(dstIdx, field, src.o26(srcIdx, field));
     }
   }
   function PointPerSecond() {
   }
-  protoOf(PointPerSecond).f2f = function (source) {
+  protoOf(PointPerSecond).r2f = function (source) {
     if (source.l23_1 === 0)
       return new Path(0);
     var plan = buildPlan_0(this, source);
@@ -6589,33 +6716,33 @@
     return PointPerSecond_instance;
   }
   function TunnelSpan(first, last, chordGrade, heightM, riseGrade, fallGrade, straightness, stepM) {
-    this.g2f_1 = first;
-    this.h2f_1 = last;
-    this.i2f_1 = chordGrade;
-    this.j2f_1 = heightM;
-    this.k2f_1 = riseGrade;
-    this.l2f_1 = fallGrade;
-    this.m2f_1 = straightness;
-    this.n2f_1 = stepM;
+    this.s2f_1 = first;
+    this.t2f_1 = last;
+    this.u2f_1 = chordGrade;
+    this.v2f_1 = heightM;
+    this.w2f_1 = riseGrade;
+    this.x2f_1 = fallGrade;
+    this.y2f_1 = straightness;
+    this.z2f_1 = stepM;
   }
-  protoOf(TunnelSpan).o2f = function () {
-    return this.g2f_1 * this.n2f_1;
+  protoOf(TunnelSpan).a2g = function () {
+    return this.s2f_1 * this.z2f_1;
   };
-  protoOf(TunnelSpan).p2f = function () {
-    return this.h2f_1 * this.n2f_1;
+  protoOf(TunnelSpan).b2g = function () {
+    return this.t2f_1 * this.z2f_1;
   };
   protoOf(TunnelSpan).toString = function () {
-    return 'TunnelSpan(first=' + this.g2f_1 + ', last=' + this.h2f_1 + ', chordGrade=' + this.i2f_1 + ', heightM=' + this.j2f_1 + ', riseGrade=' + this.k2f_1 + ', fallGrade=' + this.l2f_1 + ', straightness=' + this.m2f_1 + ', stepM=' + this.n2f_1 + ')';
+    return 'TunnelSpan(first=' + this.s2f_1 + ', last=' + this.t2f_1 + ', chordGrade=' + this.u2f_1 + ', heightM=' + this.v2f_1 + ', riseGrade=' + this.w2f_1 + ', fallGrade=' + this.x2f_1 + ', straightness=' + this.y2f_1 + ', stepM=' + this.z2f_1 + ')';
   };
   protoOf(TunnelSpan).hashCode = function () {
-    var result = this.g2f_1;
-    result = imul(result, 31) + this.h2f_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.j2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.k2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.l2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.m2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.n2f_1) | 0;
+    var result = this.s2f_1;
+    result = imul(result, 31) + this.t2f_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.v2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.w2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.x2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.y2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z2f_1) | 0;
     return result;
   };
   protoOf(TunnelSpan).equals = function (other) {
@@ -6623,46 +6750,46 @@
       return true;
     if (!(other instanceof TunnelSpan))
       return false;
-    if (!(this.g2f_1 === other.g2f_1))
+    if (!(this.s2f_1 === other.s2f_1))
       return false;
-    if (!(this.h2f_1 === other.h2f_1))
+    if (!(this.t2f_1 === other.t2f_1))
       return false;
-    if (!equals(this.i2f_1, other.i2f_1))
+    if (!equals(this.u2f_1, other.u2f_1))
       return false;
-    if (!equals(this.j2f_1, other.j2f_1))
+    if (!equals(this.v2f_1, other.v2f_1))
       return false;
-    if (!equals(this.k2f_1, other.k2f_1))
+    if (!equals(this.w2f_1, other.w2f_1))
       return false;
-    if (!equals(this.l2f_1, other.l2f_1))
+    if (!equals(this.x2f_1, other.x2f_1))
       return false;
-    if (!equals(this.m2f_1, other.m2f_1))
+    if (!equals(this.y2f_1, other.y2f_1))
       return false;
-    if (!equals(this.n2f_1, other.n2f_1))
+    if (!equals(this.z2f_1, other.z2f_1))
       return false;
     return true;
   };
   function Stations(options) {
-    this.q2f_1 = options.j2g();
-    this.r2f_1 = options.k2g();
-    this.s2f_1 = options.l2g();
-    this.t2f_1 = options.m2g();
+    this.c2g_1 = options.v2g();
+    this.d2g_1 = options.w2g();
+    this.e2g_1 = options.x2g();
+    this.f2g_1 = options.y2g();
   }
   function grade($this, z, i, j, stepM) {
     return i < 0 || j >= z.length ? NaN : (z[j] - z[i]) / ((j - i | 0) * stepM);
   }
   function judge($this, profile, a, b, entries, exits, options, stations) {
-    var w = stations.r2f_1;
-    var z = profile.n2g_1;
+    var w = stations.d2g_1;
+    var z = profile.z2g_1;
     var n = z.length;
-    var step = options.u2f_1;
+    var step = options.g2g_1;
     var length = (b - a | 0) * step;
-    if (length < options.g2g_1 - 1.0E-9)
+    if (length < options.s2g_1 - 1.0E-9)
       return null;
-    var chord = Distance_instance.z10(new LatLon(profile.o2g_1[a], profile.p2g_1[a]), new LatLon(profile.o2g_1[b], profile.p2g_1[b]));
+    var chord = Distance_instance.z10(new LatLon(profile.a2h_1[a], profile.b2h_1[a]), new LatLon(profile.a2h_1[b], profile.b2h_1[b]));
     var straightness = chord / length;
-    if (!(straightness >= options.i2g_1))
+    if (!(straightness >= options.u2g_1))
       return null;
-    var w0 = stations.r2f_1;
+    var w0 = stations.d2g_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - w0 | 0;
     var inductionVariable = Math.max(0, b_0);
@@ -6693,7 +6820,7 @@
        while (!(k_0 === last));
     var c = (z[b] - z[a]) / length;
     // Inline function 'kotlin.math.abs' call
-    if (!(Math.abs(c) <= options.b2g_1))
+    if (!(Math.abs(c) <= options.n2g_1))
       return null;
     var height = -Infinity;
     var inductionVariable_1 = a;
@@ -6702,15 +6829,15 @@
         var k_1 = inductionVariable_1;
         inductionVariable_1 = inductionVariable_1 + 1 | 0;
         var h = z[k_1] - (z[a] + c * (k_1 - a | 0) * step);
-        if (isNaN_0(h) || h < -options.e2g_1)
+        if (isNaN_0(h) || h < -options.q2g_1)
           return null;
         if (h > height)
           height = h;
       }
        while (!(k_1 === b));
-    if (height < options.c2g_1)
+    if (height < options.o2g_1)
       return null;
-    var f = stations.t2f_1;
+    var f = stations.f2g_1;
     var nearEntry = -Infinity;
     var inductionVariable_2 = a;
     // Inline function 'kotlin.comparisons.minOf' call
@@ -6740,9 +6867,9 @@
         nearExit = Math.max(tmp0_1, b_5);
       }
        while (!(k_3 === b));
-    if (nearEntry < options.c2g_1 || nearExit < options.c2g_1)
+    if (nearEntry < options.o2g_1 || nearExit < options.o2g_1)
       return null;
-    var s = stations.s2f_1;
+    var s = stations.e2g_1;
     var rise = -Infinity;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_6 = a - (w / 2 | 0) | 0;
@@ -6774,7 +6901,7 @@
           fall = g_0;
       }
        while (!(k_5 === last_2));
-    if (rise < options.z2f_1 || fall > -options.z2f_1)
+    if (rise < options.l2g_1 || fall > -options.l2g_1)
       return null;
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
@@ -6811,7 +6938,7 @@
           do {
             var k_6 = inductionVariable_6;
             inductionVariable_6 = inductionVariable_6 + 1 | 0;
-            if (z[k_6] - (z[a] + c * (k_6 - a | 0) * step) < options.f2g_1)
+            if (z[k_6] - (z[a] + c * (k_6 - a | 0) * step) < options.r2g_1)
               return null;
           }
            while (!(k_6 === y));
@@ -6820,15 +6947,15 @@
     return new TunnelSpan(a, b, c, height, rise, fall, straightness, step);
   }
   function TunnelDetector() {
-    this.q2g_1 = 1.0E-6;
+    this.c2h_1 = 1.0E-6;
   }
-  protoOf(TunnelDetector).r2g = function (profile, options) {
-    var z = profile.n2g_1;
+  protoOf(TunnelDetector).d2h = function (profile, options) {
+    var z = profile.z2g_1;
     if (z.length < 2)
       return emptyList();
     var stations = new Stations(options);
-    var entries = this.s2g(z, options, true, stations);
-    var exits = this.s2g(z, options, false, stations);
+    var entries = this.e2h(z, options, true, stations);
+    var exits = this.e2h(z, options, false, stations);
     var out = ArrayList_init_$Create$();
     var next = -1;
     var _iterator__ex2g4s = entries.l();
@@ -6842,7 +6969,7 @@
         var b = _iterator__ex2g4s_0.n();
         if (b <= a)
           continue $l$loop_2;
-        if ((b - a | 0) * options.u2f_1 > options.h2g_1 + 1.0E-9)
+        if ((b - a | 0) * options.g2g_1 > options.t2g_1 + 1.0E-9)
           break $l$loop_2;
         var tmp0_elvis_lhs = judge(this, profile, a, b, entries, exits, options, stations);
         var tmp;
@@ -6852,23 +6979,23 @@
           tmp = tmp0_elvis_lhs;
         }
         var span = tmp;
-        if (best == null || span.j2f_1 > best.j2f_1 + 1.0E-9)
+        if (best == null || span.v2f_1 > best.v2f_1 + 1.0E-9)
           best = span;
       }
       if (!(best == null)) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element = best;
         out.k(element);
-        next = best.h2f_1;
+        next = best.t2f_1;
       }
     }
     return out;
   };
-  protoOf(TunnelDetector).s2g = function (z, options, entry, stations) {
+  protoOf(TunnelDetector).e2h = function (z, options, entry, stations) {
     var n = z.length;
-    var m = stations.q2f_1;
-    var w = stations.r2f_1;
-    var step = options.u2f_1;
+    var m = stations.c2g_1;
+    var w = stations.d2g_1;
+    var step = options.g2g_1;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
     while (tmp < n) {
@@ -6891,14 +7018,14 @@
           var tmp_2;
           var tmp_3;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(back) <= options.x2f_1) {
+          if (Math.abs(back) <= options.j2g_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_3 = Math.abs(outer) <= options.x2f_1;
+            tmp_3 = Math.abs(outer) <= options.j2g_1;
           } else {
             tmp_3 = false;
           }
           if (tmp_3) {
-            tmp_2 = ahead >= options.y2f_1;
+            tmp_2 = ahead >= options.k2g_1;
           } else {
             tmp_2 = false;
           }
@@ -6908,14 +7035,14 @@
           var tmp_4;
           var tmp_5;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(ahead) <= options.x2f_1) {
+          if (Math.abs(ahead) <= options.j2g_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_5 = Math.abs(outer_0) <= options.x2f_1;
+            tmp_5 = Math.abs(outer_0) <= options.j2g_1;
           } else {
             tmp_5 = false;
           }
           if (tmp_5) {
-            tmp_4 = back <= -options.y2f_1;
+            tmp_4 = back <= -options.k2g_1;
           } else {
             tmp_4 = false;
           }
@@ -6991,36 +7118,36 @@
     return TunnelDetector_instance;
   }
   function TunnelProfile(terrainM, latDeg, lonDeg) {
-    this.n2g_1 = terrainM;
-    this.o2g_1 = latDeg;
-    this.p2g_1 = lonDeg;
+    this.z2g_1 = terrainM;
+    this.a2h_1 = latDeg;
+    this.b2h_1 = lonDeg;
     // Inline function 'kotlin.require' call
-    if (!(this.n2g_1.length === this.o2g_1.length && this.o2g_1.length === this.p2g_1.length)) {
-      var message = 'terrain, latitude and longitude must have one sample per station: ' + this.n2g_1.length + ', ' + this.o2g_1.length + ', ' + this.p2g_1.length;
+    if (!(this.z2g_1.length === this.a2h_1.length && this.a2h_1.length === this.b2h_1.length)) {
+      var message = 'terrain, latitude and longitude must have one sample per station: ' + this.z2g_1.length + ', ' + this.a2h_1.length + ', ' + this.b2h_1.length;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   function stations_0($this, metres, name) {
-    var r = metres / $this.u2f_1;
+    var r = metres / $this.g2g_1;
     var k = roundToInt(r);
     // Inline function 'kotlin.math.abs' call
     var x = r - k;
     // Inline function 'kotlin.require' call
     if (!(Math.abs(x) < 1.0E-9)) {
-      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.u2f_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.g2g_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
-  function Companion_9() {
-    Companion_instance_10 = this;
-    this.t2g_1 = new TunnelDetectorOptions();
+  function Companion_10() {
+    Companion_instance_11 = this;
+    this.f2h_1 = new TunnelDetectorOptions();
   }
-  var Companion_instance_10;
+  var Companion_instance_11;
   function Companion_getInstance_10() {
-    if (Companion_instance_10 == null)
-      new Companion_9();
-    return Companion_instance_10;
+    if (Companion_instance_11 == null)
+      new Companion_10();
+    return Companion_instance_11;
   }
   function TunnelDetectorOptions(stepM, footWindowM, steepWindowM, maxRoadGrade, minPortalGrade, minSideGrade, sideSearchM, maxChordGrade, minHeightM, faceReachM, maxBelowChordM, minValleyHeightM, minLengthM, maxLengthM, minStraightness) {
     Companion_getInstance_10();
@@ -7039,96 +7166,96 @@
     minLengthM = minLengthM === VOID ? 50.0 : minLengthM;
     maxLengthM = maxLengthM === VOID ? 3000.0 : maxLengthM;
     minStraightness = minStraightness === VOID ? 0.8 : minStraightness;
-    this.u2f_1 = stepM;
-    this.v2f_1 = footWindowM;
-    this.w2f_1 = steepWindowM;
-    this.x2f_1 = maxRoadGrade;
-    this.y2f_1 = minPortalGrade;
-    this.z2f_1 = minSideGrade;
-    this.a2g_1 = sideSearchM;
-    this.b2g_1 = maxChordGrade;
-    this.c2g_1 = minHeightM;
-    this.d2g_1 = faceReachM;
-    this.e2g_1 = maxBelowChordM;
-    this.f2g_1 = minValleyHeightM;
-    this.g2g_1 = minLengthM;
-    this.h2g_1 = maxLengthM;
-    this.i2g_1 = minStraightness;
+    this.g2g_1 = stepM;
+    this.h2g_1 = footWindowM;
+    this.i2g_1 = steepWindowM;
+    this.j2g_1 = maxRoadGrade;
+    this.k2g_1 = minPortalGrade;
+    this.l2g_1 = minSideGrade;
+    this.m2g_1 = sideSearchM;
+    this.n2g_1 = maxChordGrade;
+    this.o2g_1 = minHeightM;
+    this.p2g_1 = faceReachM;
+    this.q2g_1 = maxBelowChordM;
+    this.r2g_1 = minValleyHeightM;
+    this.s2g_1 = minLengthM;
+    this.t2g_1 = maxLengthM;
+    this.u2g_1 = minStraightness;
     // Inline function 'kotlin.require' call
-    if (!(this.u2f_1 > 0.0)) {
-      var message = 'stepM must be positive, got ' + this.u2f_1;
+    if (!(this.g2g_1 > 0.0)) {
+      var message = 'stepM must be positive, got ' + this.g2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.j2g() >= 1 && this.k2g() >= 1)) {
+    if (!(this.v2g() >= 1 && this.w2g() >= 1)) {
       var message_0 = 'grade windows must cover a station';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_0));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.l2g() >= 0)) {
+    if (!(this.x2g() >= 0)) {
       var message_1 = 'negative sideSearchM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.m2g() >= 1)) {
+    if (!(this.y2g() >= 1)) {
       var message_2 = 'faceReachM must cover a station';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_2));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.x2f_1 >= 0.0 && this.y2f_1 > 0.0 && this.z2f_1 > 0.0)) {
+    if (!(this.j2g_1 >= 0.0 && this.k2g_1 > 0.0 && this.l2g_1 > 0.0)) {
       var message_3 = 'grades must be positive';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_3));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.b2g_1 >= 0.0 && this.c2g_1 > 0.0 && this.e2g_1 >= 0.0)) {
+    if (!(this.n2g_1 >= 0.0 && this.o2g_1 > 0.0 && this.q2g_1 >= 0.0)) {
       var message_4 = 'negative threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_4));
     }
-    var containsUpper = this.h2g_1;
-    var containsArg = this.g2g_1;
+    var containsUpper = this.t2g_1;
+    var containsArg = this.s2g_1;
     // Inline function 'kotlin.require' call
     if (!(0.0 <= containsArg ? containsArg <= containsUpper : false)) {
       var message_5 = 'minLengthM must be in 0..maxLengthM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_5));
     }
-    var containsArg_0 = this.i2g_1;
+    var containsArg_0 = this.u2g_1;
     // Inline function 'kotlin.require' call
     if (!(0.0 <= containsArg_0 ? containsArg_0 <= 1.0 : false)) {
-      var message_6 = 'minStraightness must be in 0..1, got ' + this.i2g_1;
+      var message_6 = 'minStraightness must be in 0..1, got ' + this.u2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
   }
-  protoOf(TunnelDetectorOptions).j2g = function () {
-    return stations_0(this, this.v2f_1, 'footWindowM');
+  protoOf(TunnelDetectorOptions).v2g = function () {
+    return stations_0(this, this.h2g_1, 'footWindowM');
   };
-  protoOf(TunnelDetectorOptions).k2g = function () {
-    return stations_0(this, this.w2f_1, 'steepWindowM');
+  protoOf(TunnelDetectorOptions).w2g = function () {
+    return stations_0(this, this.i2g_1, 'steepWindowM');
   };
-  protoOf(TunnelDetectorOptions).l2g = function () {
-    return stations_0(this, this.a2g_1, 'sideSearchM');
+  protoOf(TunnelDetectorOptions).x2g = function () {
+    return stations_0(this, this.m2g_1, 'sideSearchM');
   };
-  protoOf(TunnelDetectorOptions).m2g = function () {
-    return stations_0(this, this.d2g_1, 'faceReachM');
+  protoOf(TunnelDetectorOptions).y2g = function () {
+    return stations_0(this, this.p2g_1, 'faceReachM');
   };
   protoOf(TunnelDetectorOptions).toString = function () {
-    return 'TunnelDetectorOptions(stepM=' + this.u2f_1 + ', footWindowM=' + this.v2f_1 + ', steepWindowM=' + this.w2f_1 + ', maxRoadGrade=' + this.x2f_1 + ', minPortalGrade=' + this.y2f_1 + ', minSideGrade=' + this.z2f_1 + ', sideSearchM=' + this.a2g_1 + ', maxChordGrade=' + this.b2g_1 + ', minHeightM=' + this.c2g_1 + ', faceReachM=' + this.d2g_1 + ', maxBelowChordM=' + this.e2g_1 + ', minValleyHeightM=' + this.f2g_1 + ', minLengthM=' + this.g2g_1 + ', maxLengthM=' + this.h2g_1 + ', minStraightness=' + this.i2g_1 + ')';
+    return 'TunnelDetectorOptions(stepM=' + this.g2g_1 + ', footWindowM=' + this.h2g_1 + ', steepWindowM=' + this.i2g_1 + ', maxRoadGrade=' + this.j2g_1 + ', minPortalGrade=' + this.k2g_1 + ', minSideGrade=' + this.l2g_1 + ', sideSearchM=' + this.m2g_1 + ', maxChordGrade=' + this.n2g_1 + ', minHeightM=' + this.o2g_1 + ', faceReachM=' + this.p2g_1 + ', maxBelowChordM=' + this.q2g_1 + ', minValleyHeightM=' + this.r2g_1 + ', minLengthM=' + this.s2g_1 + ', maxLengthM=' + this.t2g_1 + ', minStraightness=' + this.u2g_1 + ')';
   };
   protoOf(TunnelDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.u2f_1);
-    result = imul(result, 31) + getNumberHashCode(this.v2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.a2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.b2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.c2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g2g_1) | 0;
+    var result = getNumberHashCode(this.g2g_1);
     result = imul(result, 31) + getNumberHashCode(this.h2g_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.i2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.l2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.m2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.o2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.p2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.q2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.r2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.t2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u2g_1) | 0;
     return result;
   };
   protoOf(TunnelDetectorOptions).equals = function (other) {
@@ -7136,35 +7263,35 @@
       return true;
     if (!(other instanceof TunnelDetectorOptions))
       return false;
-    if (!equals(this.u2f_1, other.u2f_1))
+    if (!equals(this.g2g_1, other.g2g_1))
       return false;
-    if (!equals(this.v2f_1, other.v2f_1))
+    if (!equals(this.h2g_1, other.h2g_1))
       return false;
-    if (!equals(this.w2f_1, other.w2f_1))
+    if (!equals(this.i2g_1, other.i2g_1))
       return false;
-    if (!equals(this.x2f_1, other.x2f_1))
+    if (!equals(this.j2g_1, other.j2g_1))
       return false;
-    if (!equals(this.y2f_1, other.y2f_1))
+    if (!equals(this.k2g_1, other.k2g_1))
       return false;
-    if (!equals(this.z2f_1, other.z2f_1))
+    if (!equals(this.l2g_1, other.l2g_1))
       return false;
-    if (!equals(this.a2g_1, other.a2g_1))
+    if (!equals(this.m2g_1, other.m2g_1))
       return false;
-    if (!equals(this.b2g_1, other.b2g_1))
+    if (!equals(this.n2g_1, other.n2g_1))
       return false;
-    if (!equals(this.c2g_1, other.c2g_1))
+    if (!equals(this.o2g_1, other.o2g_1))
       return false;
-    if (!equals(this.d2g_1, other.d2g_1))
+    if (!equals(this.p2g_1, other.p2g_1))
       return false;
-    if (!equals(this.e2g_1, other.e2g_1))
+    if (!equals(this.q2g_1, other.q2g_1))
       return false;
-    if (!equals(this.f2g_1, other.f2g_1))
+    if (!equals(this.r2g_1, other.r2g_1))
       return false;
-    if (!equals(this.g2g_1, other.g2g_1))
+    if (!equals(this.s2g_1, other.s2g_1))
       return false;
-    if (!equals(this.h2g_1, other.h2g_1))
+    if (!equals(this.t2g_1, other.t2g_1))
       return false;
-    if (!equals(this.i2g_1, other.i2g_1))
+    if (!equals(this.u2g_1, other.u2g_1))
       return false;
     return true;
   };
@@ -7177,11 +7304,11 @@
   Companion_instance_2 = new Companion_1();
   DeckDetector_instance = new DeckDetector();
   DeckProfileBuilder_instance = new DeckProfileBuilder();
-  Companion_instance_4 = new Companion_3();
-  ElevationGain_instance = new ElevationGain();
   Companion_instance_5 = new Companion_4();
+  ElevationGain_instance = new ElevationGain();
+  Companion_instance_6 = new Companion_5();
   ElevationStep_instance = new ElevationStep();
-  Companion_instance_8 = new Companion_7();
+  Companion_instance_9 = new Companion_8();
   PathSimplifier_instance = new PathSimplifier();
   PointPerDistance_instance = new PointPerDistance();
   PointPerSecond_instance = new PointPerSecond();
@@ -7191,38 +7318,45 @@
   _.$_$ = _.$_$ || {};
   _.$_$.a = GpxPathKind_ROUTE_getInstance;
   _.$_$.b = GpxPathKind_TRACK_getInstance;
-  _.$_$.c = ElevationGainPreset_DEM_getInstance;
-  _.$_$.d = PointField_TEMPERATURE_getInstance;
-  _.$_$.e = GpxParser_instance;
-  _.$_$.f = Companion_getInstance_1;
-  _.$_$.g = GpxWriter_instance;
-  _.$_$.h = CsvWriter_instance;
-  _.$_$.i = JsonWriter_instance;
-  _.$_$.j = Companion_getInstance_3;
-  _.$_$.k = DeckDetector_instance;
-  _.$_$.l = Companion_instance_2;
-  _.$_$.m = DeckProfileBuilder_instance;
-  _.$_$.n = Companion_instance_5;
-  _.$_$.o = ElevationGain_instance;
-  _.$_$.p = ElevationStep_instance;
-  _.$_$.q = PathSimplifier_instance;
-  _.$_$.r = Companion_getInstance_9;
-  _.$_$.s = PointPerDistance_instance;
-  _.$_$.t = PointPerSecond_instance;
-  _.$_$.u = Companion_getInstance_10;
-  _.$_$.v = TunnelDetector_instance;
-  _.$_$.w = GpxWaypoint;
-  _.$_$.x = firstTrackAsPath;
-  _.$_$.y = pathsToGpxDocument;
-  _.$_$.z = segmentsAsPaths;
-  _.$_$.a1 = toGpxDocument;
-  _.$_$.b1 = tracksAsPaths;
-  _.$_$.c1 = CsvOptions;
-  _.$_$.d1 = JsonOptions;
-  _.$_$.e1 = ElevationGainOptions;
-  _.$_$.f1 = Path;
-  _.$_$.g1 = get_entries_2;
-  _.$_$.h1 = TunnelProfile;
+  _.$_$.c = ElevationCorrectionStatus_APPLIED_getInstance;
+  _.$_$.d = ElevationCorrectionStatus_FETCH_FAILED_getInstance;
+  _.$_$.e = ElevationCorrectionStatus_NONE_FOUND_getInstance;
+  _.$_$.f = ElevationCorrectionStatus_NOT_RUN_getInstance;
+  _.$_$.g = ElevationCorrectionStatus_NO_COVERAGE_getInstance;
+  _.$_$.h = ElevationCorrectionStatus_UNAVAILABLE_getInstance;
+  _.$_$.i = ElevationGainPreset_DEM_getInstance;
+  _.$_$.j = PointField_TEMPERATURE_getInstance;
+  _.$_$.k = GpxParser_instance;
+  _.$_$.l = Companion_getInstance_1;
+  _.$_$.m = GpxWriter_instance;
+  _.$_$.n = CsvWriter_instance;
+  _.$_$.o = JsonWriter_instance;
+  _.$_$.p = Companion_getInstance_3;
+  _.$_$.q = DeckDetector_instance;
+  _.$_$.r = Companion_instance_2;
+  _.$_$.s = DeckProfileBuilder_instance;
+  _.$_$.t = Companion_instance_6;
+  _.$_$.u = ElevationGain_instance;
+  _.$_$.v = ElevationStep_instance;
+  _.$_$.w = PathSimplifier_instance;
+  _.$_$.x = Companion_getInstance_9;
+  _.$_$.y = PointPerDistance_instance;
+  _.$_$.z = PointPerSecond_instance;
+  _.$_$.a1 = Companion_getInstance_10;
+  _.$_$.b1 = TunnelDetector_instance;
+  _.$_$.c1 = GpxWaypoint;
+  _.$_$.d1 = firstTrackAsPath;
+  _.$_$.e1 = pathsToGpxDocument;
+  _.$_$.f1 = segmentsAsPaths;
+  _.$_$.g1 = toGpxDocument;
+  _.$_$.h1 = tracksAsPaths;
+  _.$_$.i1 = CsvOptions;
+  _.$_$.j1 = JsonOptions;
+  _.$_$.k1 = ElevationCorrections;
+  _.$_$.l1 = ElevationGainOptions;
+  _.$_$.m1 = Path;
+  _.$_$.n1 = get_entries_3;
+  _.$_$.o1 = TunnelProfile;
   //endregion
   return _;
 }));