@glandais/vcyclist-engine 6.2.0 → 6.3.0

package/vcyclist-gpx.js

@@ -279,27 +279,27 @@
     symbol = symbol === VOID ? null : symbol;
     type = type === VOID ? null : type;
     timeEpochMs = timeEpochMs === VOID ? null : timeEpochMs;
-    this.s21_1 = latitudeDeg;
-    this.t21_1 = longitudeDeg;
-    this.u21_1 = elevationM;
-    this.v21_1 = name;
-    this.w21_1 = description;
-    this.x21_1 = symbol;
-    this.y21_1 = type;
-    this.z21_1 = timeEpochMs;
+    this.u21_1 = latitudeDeg;
+    this.v21_1 = longitudeDeg;
+    this.w21_1 = elevationM;
+    this.x21_1 = name;
+    this.y21_1 = description;
+    this.z21_1 = symbol;
+    this.a22_1 = type;
+    this.b22_1 = timeEpochMs;
   }
   protoOf(GpxWaypoint).toString = function () {
-    return 'GpxWaypoint(latitudeDeg=' + this.s21_1 + ', longitudeDeg=' + this.t21_1 + ', elevationM=' + this.u21_1 + ', name=' + this.v21_1 + ', description=' + this.w21_1 + ', symbol=' + this.x21_1 + ', type=' + this.y21_1 + ', timeEpochMs=' + toString(this.z21_1) + ')';
+    return 'GpxWaypoint(latitudeDeg=' + this.u21_1 + ', longitudeDeg=' + this.v21_1 + ', elevationM=' + this.w21_1 + ', name=' + this.x21_1 + ', description=' + this.y21_1 + ', symbol=' + this.z21_1 + ', type=' + this.a22_1 + ', timeEpochMs=' + toString(this.b22_1) + ')';
   };
   protoOf(GpxWaypoint).hashCode = function () {
-    var result = getNumberHashCode(this.s21_1);
-    result = imul(result, 31) + getNumberHashCode(this.t21_1) | 0;
-    result = imul(result, 31) + (this.u21_1 == null ? 0 : getNumberHashCode(this.u21_1)) | 0;
-    result = imul(result, 31) + (this.v21_1 == null ? 0 : getStringHashCode(this.v21_1)) | 0;
-    result = imul(result, 31) + (this.w21_1 == null ? 0 : getStringHashCode(this.w21_1)) | 0;
+    var result = getNumberHashCode(this.u21_1);
+    result = imul(result, 31) + getNumberHashCode(this.v21_1) | 0;
+    result = imul(result, 31) + (this.w21_1 == null ? 0 : getNumberHashCode(this.w21_1)) | 0;
     result = imul(result, 31) + (this.x21_1 == null ? 0 : getStringHashCode(this.x21_1)) | 0;
     result = imul(result, 31) + (this.y21_1 == null ? 0 : getStringHashCode(this.y21_1)) | 0;
-    result = imul(result, 31) + (this.z21_1 == null ? 0 : this.z21_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.z21_1 == null ? 0 : getStringHashCode(this.z21_1)) | 0;
+    result = imul(result, 31) + (this.a22_1 == null ? 0 : getStringHashCode(this.a22_1)) | 0;
+    result = imul(result, 31) + (this.b22_1 == null ? 0 : this.b22_1.hashCode()) | 0;
     return result;
   };
   protoOf(GpxWaypoint).equals = function (other) {
@@ -307,38 +307,38 @@
       return true;
     if (!(other instanceof GpxWaypoint))
       return false;
-    if (!equals(this.s21_1, other.s21_1))
-      return false;
-    if (!equals(this.t21_1, other.t21_1))
-      return false;
     if (!equals(this.u21_1, other.u21_1))
       return false;
-    if (!(this.v21_1 == other.v21_1))
+    if (!equals(this.v21_1, other.v21_1))
       return false;
-    if (!(this.w21_1 == other.w21_1))
+    if (!equals(this.w21_1, other.w21_1))
       return false;
     if (!(this.x21_1 == other.x21_1))
       return false;
     if (!(this.y21_1 == other.y21_1))
       return false;
-    if (!equals(this.z21_1, other.z21_1))
+    if (!(this.z21_1 == other.z21_1))
+      return false;
+    if (!(this.a22_1 == other.a22_1))
+      return false;
+    if (!equals(this.b22_1, other.b22_1))
       return false;
     return true;
   };
   function GpxDocument(name, tracks, waypoints) {
     name = name === VOID ? 'noname' : name;
     waypoints = waypoints === VOID ? emptyList() : waypoints;
-    this.a22_1 = name;
-    this.b22_1 = tracks;
-    this.c22_1 = waypoints;
+    this.c22_1 = name;
+    this.d22_1 = tracks;
+    this.e22_1 = waypoints;
   }
   protoOf(GpxDocument).toString = function () {
-    return 'GpxDocument(name=' + this.a22_1 + ', tracks=' + toString_0(this.b22_1) + ', waypoints=' + toString_0(this.c22_1) + ')';
+    return 'GpxDocument(name=' + this.c22_1 + ', tracks=' + toString_0(this.d22_1) + ', waypoints=' + toString_0(this.e22_1) + ')';
   };
   protoOf(GpxDocument).hashCode = function () {
-    var result = getStringHashCode(this.a22_1);
-    result = imul(result, 31) + hashCode(this.b22_1) | 0;
-    result = imul(result, 31) + hashCode(this.c22_1) | 0;
+    var result = getStringHashCode(this.c22_1);
+    result = imul(result, 31) + hashCode(this.d22_1) | 0;
+    result = imul(result, 31) + hashCode(this.e22_1) | 0;
     return result;
   };
   protoOf(GpxDocument).equals = function (other) {
@@ -346,24 +346,24 @@
       return true;
     if (!(other instanceof GpxDocument))
       return false;
-    if (!(this.a22_1 === other.a22_1))
+    if (!(this.c22_1 === other.c22_1))
       return false;
-    if (!equals(this.b22_1, other.b22_1))
+    if (!equals(this.d22_1, other.d22_1))
       return false;
-    if (!equals(this.c22_1, other.c22_1))
+    if (!equals(this.e22_1, other.e22_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).d22 = function (name, type, points, kind) {
+  protoOf(Companion).f22 = function (name, type, points, kind) {
     return new GpxTrack(name, type, listOf(new GpxSegment(points)), kind);
   };
-  protoOf(Companion).e22 = function (name, type, points, kind, $super) {
+  protoOf(Companion).g22 = function (name, type, points, kind, $super) {
     name = name === VOID ? null : name;
     type = type === VOID ? null : type;
     kind = kind === VOID ? GpxPathKind_TRACK_getInstance() : kind;
-    return $super === VOID ? this.d22(name, type, points, kind) : $super.d22.call(this, name, type, points, kind);
+    return $super === VOID ? this.f22(name, type, points, kind) : $super.f22.call(this, name, type, points, kind);
   };
   var Companion_instance_0;
   function Companion_getInstance_0() {
@@ -372,13 +372,13 @@
   function GpxTrack$points$delegate$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.collections.flatMap' call
-      var tmp0 = this$0.h22_1;
+      var tmp0 = this$0.j22_1;
       // Inline function 'kotlin.collections.flatMapTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        var list = element.m22_1;
+        var list = element.o22_1;
         addAll(destination, list);
       }
       return destination;
@@ -386,7 +386,7 @@
   }
   function GpxTrack$_get_points_$ref_4x48pr() {
     return constructCallableReference(function (p0) {
-      return p0.n22();
+      return p0.p22();
     }, 1, 0, 7);
   }
   function GpxTrack(name, type, segments, kind, roadWidthM, highway) {
@@ -395,32 +395,32 @@
     kind = kind === VOID ? GpxPathKind_TRACK_getInstance() : kind;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.f22_1 = name;
-    this.g22_1 = type;
-    this.h22_1 = segments;
-    this.i22_1 = kind;
-    this.j22_1 = roadWidthM;
-    this.k22_1 = highway;
+    this.h22_1 = name;
+    this.i22_1 = type;
+    this.j22_1 = segments;
+    this.k22_1 = kind;
+    this.l22_1 = roadWidthM;
+    this.m22_1 = highway;
     var tmp = this;
-    tmp.l22_1 = lazy(GpxTrack$points$delegate$lambda(this));
+    tmp.n22_1 = lazy(GpxTrack$points$delegate$lambda(this));
   }
-  protoOf(GpxTrack).n22 = function () {
-    var tmp0 = this.l22_1;
+  protoOf(GpxTrack).p22 = function () {
+    var tmp0 = this.n22_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('points', 1, tmp, GpxTrack$_get_points_$ref_4x48pr(), null);
     return tmp0.n1();
   };
   protoOf(GpxTrack).toString = function () {
-    return 'GpxTrack(name=' + this.f22_1 + ', type=' + this.g22_1 + ', segments=' + toString_0(this.h22_1) + ', kind=' + this.i22_1.toString() + ', roadWidthM=' + this.j22_1 + ', highway=' + this.k22_1 + ')';
+    return 'GpxTrack(name=' + this.h22_1 + ', type=' + this.i22_1 + ', segments=' + toString_0(this.j22_1) + ', kind=' + this.k22_1.toString() + ', roadWidthM=' + this.l22_1 + ', highway=' + this.m22_1 + ')';
   };
   protoOf(GpxTrack).hashCode = function () {
-    var result = this.f22_1 == null ? 0 : getStringHashCode(this.f22_1);
-    result = imul(result, 31) + (this.g22_1 == null ? 0 : getStringHashCode(this.g22_1)) | 0;
-    result = imul(result, 31) + hashCode(this.h22_1) | 0;
-    result = imul(result, 31) + this.i22_1.hashCode() | 0;
-    result = imul(result, 31) + (this.j22_1 == null ? 0 : getNumberHashCode(this.j22_1)) | 0;
-    result = imul(result, 31) + (this.k22_1 == null ? 0 : getStringHashCode(this.k22_1)) | 0;
+    var result = this.h22_1 == null ? 0 : getStringHashCode(this.h22_1);
+    result = imul(result, 31) + (this.i22_1 == null ? 0 : getStringHashCode(this.i22_1)) | 0;
+    result = imul(result, 31) + hashCode(this.j22_1) | 0;
+    result = imul(result, 31) + this.k22_1.hashCode() | 0;
+    result = imul(result, 31) + (this.l22_1 == null ? 0 : getNumberHashCode(this.l22_1)) | 0;
+    result = imul(result, 31) + (this.m22_1 == null ? 0 : getStringHashCode(this.m22_1)) | 0;
     return result;
   };
   protoOf(GpxTrack).equals = function (other) {
@@ -428,35 +428,35 @@
       return true;
     if (!(other instanceof GpxTrack))
       return false;
-    if (!(this.f22_1 == other.f22_1))
+    if (!(this.h22_1 == other.h22_1))
       return false;
-    if (!(this.g22_1 == other.g22_1))
+    if (!(this.i22_1 == other.i22_1))
       return false;
-    if (!equals(this.h22_1, other.h22_1))
+    if (!equals(this.j22_1, other.j22_1))
       return false;
-    if (!this.i22_1.equals(other.i22_1))
+    if (!this.k22_1.equals(other.k22_1))
       return false;
-    if (!equals(this.j22_1, other.j22_1))
+    if (!equals(this.l22_1, other.l22_1))
       return false;
-    if (!(this.k22_1 == other.k22_1))
+    if (!(this.m22_1 == other.m22_1))
       return false;
     return true;
   };
   function GpxSegment(points) {
-    this.m22_1 = points;
+    this.o22_1 = points;
   }
   protoOf(GpxSegment).toString = function () {
-    return 'GpxSegment(points=' + toString_0(this.m22_1) + ')';
+    return 'GpxSegment(points=' + toString_0(this.o22_1) + ')';
   };
   protoOf(GpxSegment).hashCode = function () {
-    return hashCode(this.m22_1);
+    return hashCode(this.o22_1);
   };
   protoOf(GpxSegment).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof GpxSegment))
       return false;
-    if (!equals(this.m22_1, other.m22_1))
+    if (!equals(this.o22_1, other.o22_1))
       return false;
     return true;
   };
@@ -469,31 +469,31 @@
     powerW = powerW === VOID ? null : powerW;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.o22_1 = latitudeDeg;
-    this.p22_1 = longitudeDeg;
-    this.q22_1 = elevationM;
-    this.r22_1 = timeEpochMs;
-    this.s22_1 = heartRate;
-    this.t22_1 = cadence;
-    this.u22_1 = temperatureC;
-    this.v22_1 = powerW;
-    this.w22_1 = roadWidthM;
-    this.x22_1 = highway;
+    this.q22_1 = latitudeDeg;
+    this.r22_1 = longitudeDeg;
+    this.s22_1 = elevationM;
+    this.t22_1 = timeEpochMs;
+    this.u22_1 = heartRate;
+    this.v22_1 = cadence;
+    this.w22_1 = temperatureC;
+    this.x22_1 = powerW;
+    this.y22_1 = roadWidthM;
+    this.z22_1 = highway;
   }
   protoOf(GpxTrackPoint).toString = function () {
-    return 'GpxTrackPoint(latitudeDeg=' + this.o22_1 + ', longitudeDeg=' + this.p22_1 + ', elevationM=' + this.q22_1 + ', timeEpochMs=' + toString(this.r22_1) + ', heartRate=' + this.s22_1 + ', cadence=' + this.t22_1 + ', temperatureC=' + this.u22_1 + ', powerW=' + this.v22_1 + ', roadWidthM=' + this.w22_1 + ', highway=' + this.x22_1 + ')';
+    return 'GpxTrackPoint(latitudeDeg=' + this.q22_1 + ', longitudeDeg=' + this.r22_1 + ', elevationM=' + this.s22_1 + ', timeEpochMs=' + toString(this.t22_1) + ', heartRate=' + this.u22_1 + ', cadence=' + this.v22_1 + ', temperatureC=' + this.w22_1 + ', powerW=' + this.x22_1 + ', roadWidthM=' + this.y22_1 + ', highway=' + this.z22_1 + ')';
   };
   protoOf(GpxTrackPoint).hashCode = function () {
-    var result = getNumberHashCode(this.o22_1);
-    result = imul(result, 31) + getNumberHashCode(this.p22_1) | 0;
-    result = imul(result, 31) + (this.q22_1 == null ? 0 : getNumberHashCode(this.q22_1)) | 0;
-    result = imul(result, 31) + (this.r22_1 == null ? 0 : this.r22_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.s22_1 == null ? 0 : this.s22_1) | 0;
-    result = imul(result, 31) + (this.t22_1 == null ? 0 : this.t22_1) | 0;
-    result = imul(result, 31) + (this.u22_1 == null ? 0 : getNumberHashCode(this.u22_1)) | 0;
-    result = imul(result, 31) + (this.v22_1 == null ? 0 : getNumberHashCode(this.v22_1)) | 0;
+    var result = getNumberHashCode(this.q22_1);
+    result = imul(result, 31) + getNumberHashCode(this.r22_1) | 0;
+    result = imul(result, 31) + (this.s22_1 == null ? 0 : getNumberHashCode(this.s22_1)) | 0;
+    result = imul(result, 31) + (this.t22_1 == null ? 0 : this.t22_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.u22_1 == null ? 0 : this.u22_1) | 0;
+    result = imul(result, 31) + (this.v22_1 == null ? 0 : this.v22_1) | 0;
     result = imul(result, 31) + (this.w22_1 == null ? 0 : getNumberHashCode(this.w22_1)) | 0;
-    result = imul(result, 31) + (this.x22_1 == null ? 0 : getStringHashCode(this.x22_1)) | 0;
+    result = imul(result, 31) + (this.x22_1 == null ? 0 : getNumberHashCode(this.x22_1)) | 0;
+    result = imul(result, 31) + (this.y22_1 == null ? 0 : getNumberHashCode(this.y22_1)) | 0;
+    result = imul(result, 31) + (this.z22_1 == null ? 0 : getStringHashCode(this.z22_1)) | 0;
     return result;
   };
   protoOf(GpxTrackPoint).equals = function (other) {
@@ -501,25 +501,25 @@
       return true;
     if (!(other instanceof GpxTrackPoint))
       return false;
-    if (!equals(this.o22_1, other.o22_1))
-      return false;
-    if (!equals(this.p22_1, other.p22_1))
-      return false;
     if (!equals(this.q22_1, other.q22_1))
       return false;
     if (!equals(this.r22_1, other.r22_1))
       return false;
-    if (!(this.s22_1 == other.s22_1))
+    if (!equals(this.s22_1, other.s22_1))
       return false;
-    if (!(this.t22_1 == other.t22_1))
+    if (!equals(this.t22_1, other.t22_1))
       return false;
-    if (!equals(this.u22_1, other.u22_1))
+    if (!(this.u22_1 == other.u22_1))
       return false;
-    if (!equals(this.v22_1, other.v22_1))
+    if (!(this.v22_1 == other.v22_1))
       return false;
     if (!equals(this.w22_1, other.w22_1))
       return false;
-    if (!(this.x22_1 == other.x22_1))
+    if (!equals(this.x22_1, other.x22_1))
+      return false;
+    if (!equals(this.y22_1, other.y22_1))
+      return false;
+    if (!(this.z22_1 == other.z22_1))
       return false;
     return true;
   };
@@ -551,11 +551,11 @@
     var scale = point - digits.length | 0;
     var tmp;
     if (0 <= scale ? scale <= 22 : false) {
-      tmp = toNumber(significand) * $this.b23_1[scale];
+      tmp = toNumber(significand) * $this.d23_1[scale];
     } else {
       var containsArg = -scale | 0;
       if (1 <= containsArg ? containsArg <= 22 : false) {
-        tmp = toNumber(significand) / $this.b23_1[-scale | 0];
+        tmp = toNumber(significand) / $this.d23_1[-scale | 0];
       } else {
         tmp = null;
       }
@@ -583,14 +583,14 @@
   }
   function GpxDecimal() {
     GpxDecimal_instance = this;
-    this.y22_1 = 18;
-    this.z22_1 = new Long(0, 2097152);
-    this.a23_1 = 22;
+    this.a23_1 = 18;
+    this.b23_1 = new Long(0, 2097152);
+    this.c23_1 = 22;
     var tmp = this;
     // Inline function 'kotlin.doubleArrayOf' call
-    tmp.b23_1 = new Float64Array([1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 1.0E7, 1.0E8, 1.0E9, 1.0E10, 1.0E11, 1.0E12, 1.0E13, 1.0E14, 1.0E15, 1.0E16, 1.0E17, 1.0E18, 1.0E19, 1.0E20, 1.0E21, 1.0E22]);
+    tmp.d23_1 = new Float64Array([1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 1.0E7, 1.0E8, 1.0E9, 1.0E10, 1.0E11, 1.0E12, 1.0E13, 1.0E14, 1.0E15, 1.0E16, 1.0E17, 1.0E18, 1.0E19, 1.0E20, 1.0E21, 1.0E22]);
   }
-  protoOf(GpxDecimal).c23 = function (value) {
+  protoOf(GpxDecimal).e23 = function (value) {
     if (!isFinite(value))
       return value.toString();
     var text = value.toString();
@@ -734,9 +734,9 @@
   var GpxPowerSource_COMPUTED_OR_INPUT_instance;
   function Companion_0() {
     Companion_instance_1 = this;
-    this.d23_1 = GpxPowerSource_INPUT_getInstance();
+    this.f23_1 = GpxPowerSource_INPUT_getInstance();
   }
-  protoOf(Companion_0).e23 = function (value) {
+  protoOf(Companion_0).g23 = function (value) {
     var tmp0 = get_entries_0();
     var tmp$ret$0;
     $l$block: {
@@ -744,7 +744,7 @@
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (element.h23() === value) {
+        if (element.j23() === value) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -753,7 +753,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_0).i23 = function () {
+  protoOf(Companion_0).k23 = function () {
     // Inline function 'kotlin.collections.map' call
     var this_0 = get_entries_0();
     // Inline function 'kotlin.collections.mapTo' call
@@ -761,7 +761,7 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = item.h23();
+      var tmp$ret$2 = item.j23();
       destination.k(tmp$ret$2);
     }
     return destination;
@@ -785,7 +785,7 @@
   function GpxPowerSource(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  protoOf(GpxPowerSource).h23 = function () {
+  protoOf(GpxPowerSource).j23 = function () {
     var tmp;
     switch (this.v1_1) {
       case 0:
@@ -816,9 +816,10 @@
     startTime = startTime === VOID ? null : startTime;
     powerSource = powerSource === VOID ? GpxPowerSource_INPUT_getInstance() : powerSource;
     var startTimeMs = startTime == null ? null : startTime.hg();
+    var t0 = _this__u8e3s4.l23_1 === 0 || isNaN_0(_this__u8e3s4.n23(0)) ? 0.0 : _this__u8e3s4.n23(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = _this__u8e3s4.j23_1;
+    var size = _this__u8e3s4.l23_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -826,10 +827,10 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp = _this__u8e3s4.l23(index) * 57.29577951308232;
-        var tmp_0 = _this__u8e3s4.m23(index) * 57.29577951308232;
+        var tmp = _this__u8e3s4.o23(index) * 57.29577951308232;
+        var tmp_0 = _this__u8e3s4.p23(index) * 57.29577951308232;
         // Inline function 'kotlin.takeUnless' call
-        var this_0 = _this__u8e3s4.n23(index);
+        var this_0 = _this__u8e3s4.q23(index);
         var tmp_1;
         if (!isNaN_0(this_0)) {
           tmp_1 = this_0;
@@ -838,13 +839,13 @@
         }
         var tmp_2 = tmp_1;
         var tmp_3;
-        if (isNaN_0(_this__u8e3s4.o23(index))) {
+        if (isNaN_0(_this__u8e3s4.n23(index))) {
           tmp_3 = null;
         } else if (!(startTimeMs == null)) {
-          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.o23(index)));
+          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.n23(index) - t0));
         } else {
           // Inline function 'kotlin.takeIf' call
-          var this_1 = numberToLong(_this__u8e3s4.o23(index));
+          var this_1 = numberToLong(_this__u8e3s4.n23(index));
           var tmp_4;
           if (compare(this_1, new Long(0, 0)) > 0) {
             tmp_4 = this_1;
@@ -855,7 +856,7 @@
         }
         var tmp_5 = tmp_3;
         // Inline function 'kotlin.takeUnless' call
-        var this_2 = _this__u8e3s4.p23(index);
+        var this_2 = _this__u8e3s4.r23(index);
         var tmp_6;
         if (!isNaN_0(this_2)) {
           tmp_6 = this_2;
@@ -865,7 +866,7 @@
         var tmp0_safe_receiver = tmp_6;
         var tmp_7 = tmp0_safe_receiver == null ? null : roundToInt(tmp0_safe_receiver);
         // Inline function 'kotlin.takeUnless' call
-        var this_3 = _this__u8e3s4.q23(index);
+        var this_3 = _this__u8e3s4.s23(index);
         var tmp_8;
         if (!isNaN_0(this_3)) {
           tmp_8 = this_3;
@@ -875,7 +876,7 @@
         var tmp1_safe_receiver = tmp_8;
         var tmp_9 = tmp1_safe_receiver == null ? null : roundToInt(tmp1_safe_receiver);
         // Inline function 'kotlin.takeUnless' call
-        var this_4 = _this__u8e3s4.r23(index);
+        var this_4 = _this__u8e3s4.t23(index);
         var tmp_10;
         if (!isNaN_0(this_4)) {
           tmp_10 = this_4;
@@ -888,11 +889,11 @@
       }
        while (inductionVariable < size);
     var points = list;
-    return Companion_instance_0.e22(name, type, points);
+    return Companion_instance_0.g22(name, type, points);
   }
   function powerAt(_this__u8e3s4, i, source) {
     // Inline function 'kotlin.takeUnless' call
-    var this_0 = _this__u8e3s4.s23(i);
+    var this_0 = _this__u8e3s4.u23(i);
     var tmp;
     if (!isNaN_0(this_0)) {
       tmp = this_0;
@@ -901,7 +902,7 @@
     }
     var input = tmp;
     // Inline function 'kotlin.takeUnless' call
-    var this_1 = _this__u8e3s4.t23(i);
+    var this_1 = _this__u8e3s4.v23(i);
     var tmp_0;
     if (!(isNaN_0(this_1) || this_1 === 0.0)) {
       tmp_0 = this_1;
@@ -941,7 +942,7 @@
   function parseOnce($this, xml) {
     var tmp;
     try {
-      tmp = get_xmlStreaming().r1k(xml);
+      tmp = get_xmlStreaming().t1k(xml);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof IllegalArgumentException) {
@@ -975,7 +976,7 @@
       }
     }
     finally {
-      reader.z1j();
+      reader.b1k();
     }
     return tmp_1;
   }
@@ -983,8 +984,8 @@
     while (reader.m()) {
       var ev = reader.n();
       if (ev.equals(EventType_START_ELEMENT_getInstance())) {
-        if (!(reader.m1j() === 'gpx')) {
-          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.m1j() + ')');
+        if (!(reader.o1j() === 'gpx')) {
+          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.o1j() + ')');
         }
         return parseGpxRoot($this, reader);
       }
@@ -1001,7 +1002,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          switch (reader.m1j()) {
+          switch (reader.o1j()) {
             case 'metadata':
               var metaName = parseMetadataName($this, reader);
               if (!(metaName == null))
@@ -1036,7 +1037,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          if (reader.m1j() === 'name' && name == null) {
+          if (reader.o1j() === 'name' && name == null) {
             // Inline function 'kotlin.text.trim' call
             var this_0 = readElementText($this, reader);
             // Inline function 'kotlin.text.ifEmpty' call
@@ -1072,7 +1073,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          switch (reader.m1j()) {
+          switch (reader.o1j()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -1122,12 +1123,12 @@
 
           break;
         case 2:
-          return new GpxTrack(name, type, segments, VOID, trackExt.y23_1);
+          return new GpxTrack(name, type, segments, VOID, trackExt.a24_1);
         default:
           break;
       }
     }
-    return new GpxTrack(name, type, segments, VOID, trackExt.y23_1);
+    return new GpxTrack(name, type, segments, VOID, trackExt.a24_1);
   }
   function parseRoute($this, reader) {
     var name = null;
@@ -1138,7 +1139,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          switch (reader.m1j()) {
+          switch (reader.o1j()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -1199,7 +1200,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          if (reader.m1j() === 'trkpt') {
+          if (reader.o1j() === 'trkpt') {
             points.k(parseTrackPoint($this, reader));
           } else {
             skipElement($this, reader);
@@ -1215,8 +1216,8 @@
     return new GpxSegment(points);
   }
   function parseTrackPoint($this, reader) {
-    var latStr = reader.x1j(null, 'lat');
-    var lonStr = reader.x1j(null, 'lon');
+    var latStr = reader.z1j(null, 'lat');
+    var lonStr = reader.z1j(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -1251,7 +1252,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          switch (reader.m1j()) {
+          switch (reader.o1j()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -1285,16 +1286,16 @@
 
           break;
         case 2:
-          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.u23_1, ext.v23_1, ext.w23_1, ext.x23_1, ext.y23_1, ext.z23_1);
+          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.w23_1, ext.x23_1, ext.y23_1, ext.z23_1, ext.a24_1, ext.b24_1);
         default:
           break;
       }
     }
-    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.u23_1, ext.v23_1, ext.w23_1, ext.x23_1, ext.y23_1, ext.z23_1);
+    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.w23_1, ext.x23_1, ext.y23_1, ext.z23_1, ext.a24_1, ext.b24_1);
   }
   function parseWaypoint($this, reader) {
-    var latStr = reader.x1j(null, 'lat');
-    var lonStr = reader.x1j(null, 'lon');
+    var latStr = reader.z1j(null, 'lat');
+    var lonStr = reader.z1j(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -1332,7 +1333,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          switch (reader.m1j()) {
+          switch (reader.o1j()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -1447,7 +1448,7 @@
       var ev = reader.n();
       switch (ev.v1_1) {
         case 1:
-          var ln = reader.m1j();
+          var ln = reader.o1j();
           // Inline function 'kotlin.text.lowercase' call
 
           // Inline function 'kotlin.js.asDynamic' call
@@ -1460,8 +1461,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp = ext;
-                var tmp0_elvis_lhs = ext.x23_1;
-                tmp.x23_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
+                var tmp0_elvis_lhs = ext.z23_1;
+                tmp.z23_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
               }
 
               break;
@@ -1472,8 +1473,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.u23_1 == null)
-                  ext.u23_1 = numberToInt(tmp3_safe_receiver);
+                if (ext.w23_1 == null)
+                  ext.w23_1 = numberToInt(tmp3_safe_receiver);
               }
 
               break;
@@ -1484,8 +1485,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.v23_1 == null)
-                  ext.v23_1 = numberToInt(tmp4_safe_receiver);
+                if (ext.x23_1 == null)
+                  ext.x23_1 = numberToInt(tmp4_safe_receiver);
               }
 
               break;
@@ -1498,8 +1499,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_0 = ext;
-                var tmp0_elvis_lhs_0 = ext.w23_1;
-                tmp_0.w23_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
+                var tmp0_elvis_lhs_0 = ext.y23_1;
+                tmp_0.y23_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
               }
 
               break;
@@ -1510,8 +1511,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_1 = ext;
-                var tmp0_elvis_lhs_1 = ext.y23_1;
-                tmp_1.y23_1 = tmp0_elvis_lhs_1 == null ? tmp6_safe_receiver : tmp0_elvis_lhs_1;
+                var tmp0_elvis_lhs_1 = ext.a24_1;
+                tmp_1.a24_1 = tmp0_elvis_lhs_1 == null ? tmp6_safe_receiver : tmp0_elvis_lhs_1;
               }
 
               break;
@@ -1524,13 +1525,13 @@
               // Inline function 'kotlin.text.isNotEmpty' call
 
               if (charSequenceLength(text) > 0) {
-                tmp_2 = ext.z23_1 == null;
+                tmp_2 = ext.b24_1 == null;
               } else {
                 tmp_2 = false;
               }
 
               if (tmp_2)
-                ext.z23_1 = text;
+                ext.b24_1 = text;
               break;
             default:
               parseExtensions($this, reader, ext);
@@ -1554,7 +1555,7 @@
         case 5:
         case 9:
         case 8:
-          sb.u6(reader.r1j());
+          sb.u6(reader.t1j());
           break;
         case 1:
           skipElement($this, reader);
@@ -1616,16 +1617,16 @@
     powerW = powerW === VOID ? null : powerW;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.u23_1 = heartRate;
-    this.v23_1 = cadence;
-    this.w23_1 = temperatureC;
-    this.x23_1 = powerW;
-    this.y23_1 = roadWidthM;
-    this.z23_1 = highway;
+    this.w23_1 = heartRate;
+    this.x23_1 = cadence;
+    this.y23_1 = temperatureC;
+    this.z23_1 = powerW;
+    this.a24_1 = roadWidthM;
+    this.b24_1 = highway;
   }
   function GpxParser() {
   }
-  protoOf(GpxParser).a24 = function (xml, repairOnFailure) {
+  protoOf(GpxParser).c24 = function (xml, repairOnFailure) {
     var tmp;
     try {
       tmp = parseOnce(this, xml);
@@ -1635,7 +1636,7 @@
         var firstFailure = $p;
         if (!repairOnFailure)
           throw firstFailure;
-        var repaired = GpxXmlRepair_getInstance().e24(xml);
+        var repaired = GpxXmlRepair_getInstance().g24(xml);
         var tmp_1;
         try {
           tmp_1 = parseOnce(this, repaired);
@@ -1656,9 +1657,9 @@
     }
     return tmp;
   };
-  protoOf(GpxParser).f24 = function (xml, repairOnFailure, $super) {
+  protoOf(GpxParser).h24 = function (xml, repairOnFailure, $super) {
     repairOnFailure = repairOnFailure === VOID ? true : repairOnFailure;
-    return $super === VOID ? this.a24(xml, repairOnFailure) : $super.a24.call(this, xml, repairOnFailure);
+    return $super === VOID ? this.c24(xml, repairOnFailure) : $super.c24.call(this, xml, repairOnFailure);
   };
   var GpxParser_instance;
   function GpxParser_getInstance() {
@@ -1676,7 +1677,7 @@
   var PLAUSIBLE_ROAD_WIDTH_M;
   function firstTrackAsPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.b22_1);
+    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.d22_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -1692,16 +1693,16 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.b22_1;
+    var tmp0 = _this__u8e3s4.d22_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
       var tmp;
-      if (kinds.i1(element.i22_1)) {
+      if (kinds.i1(element.k22_1)) {
         // Inline function 'kotlin.collections.isNotEmpty' call
-        tmp = !element.n22().q();
+        tmp = !element.p22().q();
       } else {
         tmp = false;
       }
@@ -1724,13 +1725,13 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.b22_1;
+    var tmp0 = _this__u8e3s4.d22_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
-      if (kinds.i1(element.i22_1)) {
+      if (kinds.i1(element.k22_1)) {
         destination.k(element);
       }
     }
@@ -1741,13 +1742,13 @@
     while (_iterator__ex2g4s_0.m()) {
       var element_0 = _iterator__ex2g4s_0.n();
       // Inline function 'kotlin.collections.map' call
-      var this_0 = element_0.h22_1;
+      var this_0 = element_0.j22_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination_1 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
       var _iterator__ex2g4s_1 = this_0.l();
       while (_iterator__ex2g4s_1.m()) {
         var item = _iterator__ex2g4s_1.n();
-        var tmp$ret$8 = to(element_0.j22_1, item);
+        var tmp$ret$8 = to(element_0.l22_1, item);
         destination_1.k(tmp$ret$8);
       }
       var list = destination_1;
@@ -1760,7 +1761,7 @@
     while (_iterator__ex2g4s_2.m()) {
       var element_1 = _iterator__ex2g4s_2.n();
       // Inline function 'kotlin.collections.isNotEmpty' call
-      if (!element_1.jc_1.m22_1.q()) {
+      if (!element_1.jc_1.o22_1.q()) {
         destination_2.k(element_1);
       }
     }
@@ -1779,11 +1780,11 @@
   }
   function toPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.n22(), _this__u8e3s4.j22_1);
+    return pointsToPath(_this__u8e3s4.p22(), _this__u8e3s4.l22_1);
   }
   function toPath_0(_this__u8e3s4, trackRoadWidthM) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.m22_1, trackRoadWidthM);
+    return pointsToPath(_this__u8e3s4.o22_1, trackRoadWidthM);
   }
   function pointsToPath(points, trackRoadWidthM) {
     trackRoadWidthM = trackRoadWidthM === VOID ? null : trackRoadWidthM;
@@ -1795,28 +1796,28 @@
       var i = index;
       index = index + 1 | 0;
       var p = iterator.n();
-      path.g24(i, p.o22_1 * 0.017453292519943295);
-      path.h24(i, p.p22_1 * 0.017453292519943295);
-      var tmp0_elvis_lhs = p.q22_1;
-      path.i24(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
-      var tmp1_elvis_lhs = p.r22_1;
-      path.j24(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
-      var tmp2_elvis_lhs = p.v22_1;
-      path.k24(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
-      var tmp3_safe_receiver = p.s22_1;
+      path.i24(i, p.q22_1 * 0.017453292519943295);
+      path.j24(i, p.r22_1 * 0.017453292519943295);
+      var tmp0_elvis_lhs = p.s22_1;
+      path.k24(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
+      var tmp1_elvis_lhs = p.t22_1;
+      path.l24(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
+      var tmp2_elvis_lhs = p.x22_1;
+      path.m24(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
+      var tmp3_safe_receiver = p.u22_1;
       var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : tmp3_safe_receiver;
-      path.l24(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
-      var tmp5_safe_receiver = p.t22_1;
+      path.n24(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
+      var tmp5_safe_receiver = p.v22_1;
       var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : tmp5_safe_receiver;
-      path.m24(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
-      var tmp7_elvis_lhs = p.u22_1;
-      path.n24(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
-      var tmp8_elvis_lhs = p.w22_1;
+      path.o24(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
+      var tmp7_elvis_lhs = p.w22_1;
+      path.p24(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
+      var tmp8_elvis_lhs = p.y22_1;
       var tmp9_elvis_lhs = tmp8_elvis_lhs == null ? trackRoadWidthM : tmp8_elvis_lhs;
-      var width = tmp9_elvis_lhs == null ? OsmHighway_getInstance().p24(p.x22_1) : tmp9_elvis_lhs;
-      path.q24(i, !(width == null) && get_PLAUSIBLE_ROAD_WIDTH_M().u(width) ? width : NaN);
+      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.c25();
+    path.e25();
     return path;
   }
   var properties_initialized_GpxToPath_kt_83hcm9;
@@ -1828,14 +1829,14 @@
     }
   }
   function writeDocument($this, w, document, writeExtensions) {
-    w.r1l('', 'http://www.topografix.com/GPX/1/1');
-    w.r1l('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.t1l('', 'http://www.topografix.com/GPX/1/1');
+    w.t1l('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.r1l('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.t1l('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
     var tmp;
     if (writeExtensions) {
-      var tmp0 = document.b22_1;
+      var tmp0 = document.d22_1;
       var tmp$ret$0;
       $l$block_2: {
         // Inline function 'kotlin.collections.any' call
@@ -1853,10 +1854,10 @@
         while (_iterator__ex2g4s.m()) {
           var element = _iterator__ex2g4s.n();
           var tmp_1;
-          if (element.i22_1.equals(GpxPathKind_TRACK_getInstance()) && !(element.j22_1 == null)) {
+          if (element.k22_1.equals(GpxPathKind_TRACK_getInstance()) && !(element.l22_1 == null)) {
             tmp_1 = true;
           } else {
-            var tmp0_0 = element.n22();
+            var tmp0_0 = element.p22();
             var tmp$ret$2;
             $l$block_1: {
               // Inline function 'kotlin.collections.any' call
@@ -1873,7 +1874,7 @@
               var _iterator__ex2g4s_0 = tmp0_0.l();
               while (_iterator__ex2g4s_0.m()) {
                 var element_0 = _iterator__ex2g4s_0.n();
-                if (!(element_0.w22_1 == null)) {
+                if (!(element_0.y22_1 == null)) {
                   tmp$ret$2 = true;
                   break $l$block_1;
                 }
@@ -1895,30 +1896,30 @@
     }
     var hasRoadWidth = tmp;
     if (hasRoadWidth) {
-      w.r1l('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
+      w.t1l('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
     }
-    w.t1l('http://www.topografix.com/GPX/1/1', 'gpx', '');
-    w.v1l(null, 'version', null, '1.1');
-    w.v1l(null, 'creator', null, '@glandais/vcyclist');
-    w.s1l('', 'http://www.topografix.com/GPX/1/1');
-    w.s1l('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.v1l('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.x1l(null, 'version', null, '1.1');
+    w.x1l(null, 'creator', null, '@glandais/vcyclist');
+    w.u1l('', 'http://www.topografix.com/GPX/1/1');
+    w.u1l('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.s1l('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.u1l('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
     if (hasRoadWidth) {
-      w.s1l('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
+      w.u1l('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
     }
-    w.v1l('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation', 'xsi', 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd');
-    writeMetadata($this, w, document.a22_1);
-    var _iterator__ex2g4s_1 = document.c22_1.l();
+    w.x1l('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation', 'xsi', 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd');
+    writeMetadata($this, w, document.c22_1);
+    var _iterator__ex2g4s_1 = document.e22_1.l();
     while (_iterator__ex2g4s_1.m()) {
       var waypoint = _iterator__ex2g4s_1.n();
       writeWaypoint($this, w, waypoint);
     }
-    var _iterator__ex2g4s_2 = document.b22_1.l();
+    var _iterator__ex2g4s_2 = document.d22_1.l();
     while (_iterator__ex2g4s_2.m()) {
       var track = _iterator__ex2g4s_2.n();
-      switch (track.i22_1.v1_1) {
+      switch (track.k22_1.v1_1) {
         case 1:
           writeRoute($this, w, track, writeExtensions);
           break;
@@ -1930,150 +1931,150 @@
           break;
       }
     }
-    w.y1l('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.a1m('http://www.topografix.com/GPX/1/1', 'gpx', '');
   }
   function writeWaypoint($this, w, waypoint) {
-    w.t1l('http://www.topografix.com/GPX/1/1', 'wpt', '');
-    w.v1l(null, 'lat', null, GpxDecimal_getInstance().c23(waypoint.s21_1));
-    w.v1l(null, 'lon', null, GpxDecimal_getInstance().c23(waypoint.t21_1));
-    var tmp0_safe_receiver = waypoint.u21_1;
+    w.v1l('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.x1l(null, 'lat', null, GpxDecimal_getInstance().e23(waypoint.u21_1));
+    w.x1l(null, 'lon', null, GpxDecimal_getInstance().e23(waypoint.v21_1));
+    var tmp0_safe_receiver = waypoint.w21_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().c23(tmp0_safe_receiver));
+      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().e23(tmp0_safe_receiver));
     }
-    var tmp1_safe_receiver = waypoint.z21_1;
+    var tmp1_safe_receiver = waypoint.b22_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().zf(tmp1_safe_receiver).toString());
     }
-    var tmp2_safe_receiver = waypoint.v21_1;
+    var tmp2_safe_receiver = waypoint.x21_1;
     if (tmp2_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'name', tmp2_safe_receiver);
     }
-    var tmp3_safe_receiver = waypoint.w21_1;
+    var tmp3_safe_receiver = waypoint.y21_1;
     if (tmp3_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'desc', tmp3_safe_receiver);
     }
-    var tmp4_safe_receiver = waypoint.x21_1;
+    var tmp4_safe_receiver = waypoint.z21_1;
     if (tmp4_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'sym', tmp4_safe_receiver);
     }
-    var tmp5_safe_receiver = waypoint.y21_1;
+    var tmp5_safe_receiver = waypoint.a22_1;
     if (tmp5_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp5_safe_receiver);
     }
-    w.y1l('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.a1m('http://www.topografix.com/GPX/1/1', 'wpt', '');
   }
   function writeMetadata($this, w, name) {
-    w.t1l('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.v1l('http://www.topografix.com/GPX/1/1', 'metadata', '');
     writeSimpleText($this, w, 'name', name);
-    w.y1l('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.a1m('http://www.topografix.com/GPX/1/1', 'metadata', '');
   }
   function writeTrack($this, w, track, writeExtensions) {
-    w.t1l('http://www.topografix.com/GPX/1/1', 'trk', '');
-    var tmp0_safe_receiver = track.f22_1;
+    w.v1l('http://www.topografix.com/GPX/1/1', 'trk', '');
+    var tmp0_safe_receiver = track.h22_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'name', tmp0_safe_receiver);
     }
-    var tmp1_safe_receiver = track.g22_1;
+    var tmp1_safe_receiver = track.i22_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp1_safe_receiver);
     }
-    if (writeExtensions && !(track.j22_1 == null)) {
-      w.t1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
-      writeRoadWidth($this, w, track.j22_1);
-      w.y1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
+    if (writeExtensions && !(track.l22_1 == null)) {
+      w.v1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      writeRoadWidth($this, w, track.l22_1);
+      w.a1m('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    var _iterator__ex2g4s = track.h22_1.l();
+    var _iterator__ex2g4s = track.j22_1.l();
     while (_iterator__ex2g4s.m()) {
       var segment = _iterator__ex2g4s.n();
-      w.t1l('http://www.topografix.com/GPX/1/1', 'trkseg', '');
-      var _iterator__ex2g4s_0 = segment.m22_1.l();
+      w.v1l('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      var _iterator__ex2g4s_0 = segment.o22_1.l();
       while (_iterator__ex2g4s_0.m()) {
         var p = _iterator__ex2g4s_0.n();
         writeTrackPoint($this, w, p, writeExtensions);
       }
-      w.y1l('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      w.a1m('http://www.topografix.com/GPX/1/1', 'trkseg', '');
     }
-    w.y1l('http://www.topografix.com/GPX/1/1', 'trk', '');
+    w.a1m('http://www.topografix.com/GPX/1/1', 'trk', '');
   }
   function writeRoute($this, w, route, writeExtensions) {
-    w.t1l('http://www.topografix.com/GPX/1/1', 'rte', '');
-    var tmp0_safe_receiver = route.f22_1;
+    w.v1l('http://www.topografix.com/GPX/1/1', 'rte', '');
+    var tmp0_safe_receiver = route.h22_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'name', tmp0_safe_receiver);
     }
-    var tmp1_safe_receiver = route.g22_1;
+    var tmp1_safe_receiver = route.i22_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp1_safe_receiver);
     }
-    var _iterator__ex2g4s = route.n22().l();
+    var _iterator__ex2g4s = route.p22().l();
     while (_iterator__ex2g4s.m()) {
       var p = _iterator__ex2g4s.n();
       writeTrackPoint($this, w, p, writeExtensions, 'rtept');
     }
-    w.y1l('http://www.topografix.com/GPX/1/1', 'rte', '');
+    w.a1m('http://www.topografix.com/GPX/1/1', 'rte', '');
   }
   function writeTrackPoint($this, w, p, writeExtensions, localName) {
     localName = localName === VOID ? 'trkpt' : localName;
-    w.t1l('http://www.topografix.com/GPX/1/1', localName, '');
-    w.v1l(null, 'lat', null, GpxDecimal_getInstance().c23(p.o22_1));
-    w.v1l(null, 'lon', null, GpxDecimal_getInstance().c23(p.p22_1));
-    var tmp0_safe_receiver = p.q22_1;
+    w.v1l('http://www.topografix.com/GPX/1/1', localName, '');
+    w.x1l(null, 'lat', null, GpxDecimal_getInstance().e23(p.q22_1));
+    w.x1l(null, 'lon', null, GpxDecimal_getInstance().e23(p.r22_1));
+    var tmp0_safe_receiver = p.s22_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().c23(tmp0_safe_receiver));
+      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().e23(tmp0_safe_receiver));
     }
-    var tmp1_safe_receiver = p.r22_1;
+    var tmp1_safe_receiver = p.t22_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().zf(tmp1_safe_receiver).toString());
     }
-    var hasGarminExt = !(p.s22_1 == null) || !(p.t22_1 == null) || !(p.u22_1 == null);
-    var hasPower = !(p.v22_1 == null);
-    var hasRoadWidth = !(p.w22_1 == null);
+    var hasGarminExt = !(p.u22_1 == null) || !(p.v22_1 == null) || !(p.w22_1 == null);
+    var hasPower = !(p.x22_1 == null);
+    var hasRoadWidth = !(p.y22_1 == null);
     if (writeExtensions && (hasGarminExt || hasPower || hasRoadWidth)) {
-      w.t1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
-      var tmp2_safe_receiver = p.v22_1;
+      w.v1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      var tmp2_safe_receiver = p.x22_1;
       if (tmp2_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        writeSimpleText(GpxWriter_instance, w, 'power', GpxDecimal_getInstance().c23(tmp2_safe_receiver));
+        writeSimpleText(GpxWriter_instance, w, 'power', GpxDecimal_getInstance().e23(tmp2_safe_receiver));
       }
-      var tmp3_safe_receiver = p.w22_1;
+      var tmp3_safe_receiver = p.y22_1;
       if (tmp3_safe_receiver == null)
         null;
       else {
@@ -2081,66 +2082,66 @@
         writeRoadWidth(GpxWriter_instance, w, tmp3_safe_receiver);
       }
       if (hasGarminExt) {
-        w.t1l('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
-        var tmp4_safe_receiver = p.s22_1;
+        w.v1l('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        var tmp4_safe_receiver = p.u22_1;
         if (tmp4_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'hr', 'gpxtpx', tmp4_safe_receiver.toString());
         }
-        var tmp5_safe_receiver = p.t22_1;
+        var tmp5_safe_receiver = p.v22_1;
         if (tmp5_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'cad', 'gpxtpx', tmp5_safe_receiver.toString());
         }
-        var tmp6_safe_receiver = p.u22_1;
+        var tmp6_safe_receiver = p.w22_1;
         if (tmp6_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
-          writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'atemp', 'gpxtpx', GpxDecimal_getInstance().c23(tmp6_safe_receiver));
+          writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'atemp', 'gpxtpx', GpxDecimal_getInstance().e23(tmp6_safe_receiver));
         }
-        w.y1l('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        w.a1m('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
       }
-      w.y1l('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.a1m('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    w.y1l('http://www.topografix.com/GPX/1/1', localName, '');
+    w.a1m('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeRoadWidth($this, w, widthM) {
-    return writeNamespaced($this, w, 'https://github.com/glandais/vcyclist/xmlschemas/v1', 'roadWidth', 'vc', GpxDecimal_getInstance().c23(widthM));
+    return writeNamespaced($this, w, 'https://github.com/glandais/vcyclist/xmlschemas/v1', 'roadWidth', 'vc', GpxDecimal_getInstance().e23(widthM));
   }
   function writeSimpleText($this, w, localName, text) {
-    w.t1l('http://www.topografix.com/GPX/1/1', localName, '');
-    w.u1l(text);
-    w.y1l('http://www.topografix.com/GPX/1/1', localName, '');
+    w.v1l('http://www.topografix.com/GPX/1/1', localName, '');
+    w.w1l(text);
+    w.a1m('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeNamespaced($this, w, namespace, localName, prefix, text) {
-    w.t1l(namespace, localName, prefix);
-    w.u1l(text);
-    w.y1l(namespace, localName, prefix);
+    w.v1l(namespace, localName, prefix);
+    w.w1l(text);
+    w.a1m(namespace, localName, prefix);
   }
   function GpxWriter() {
-    this.d25_1 = 'http://www.topografix.com/GPX/1/1';
-    this.e25_1 = 'http://www.w3.org/2001/XMLSchema-instance';
-    this.f25_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
-    this.g25_1 = 'https://github.com/glandais/vcyclist/xmlschemas/v1';
-    this.h25_1 = 'vc';
-    this.i25_1 = 'xsi';
-    this.j25_1 = 'gpxtpx';
-    this.k25_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
-    this.l25_1 = '@glandais/vcyclist';
-  }
-  protoOf(GpxWriter).m25 = function (document, writeExtensions) {
+    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) {
     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());
     try {
       writeDocument(this, writer, document, writeExtensions);
     }finally {
-      writer.z1j();
+      writer.b1k();
     }
     return out.toString();
   };
@@ -2251,11 +2252,11 @@
     while (i < refs.o()) {
       var high = refs.p(i);
       var low = getOrNull(refs, i + 1 | 0);
-      if (!(low == null) && high.o25_1 === low.n25_1 && isHighSurrogate_0($this, high.p25_1) && isLowSurrogate_0($this, low.p25_1)) {
-        sb.y9(xml, copiedUpTo, high.n25_1);
-        var codePoint = (65536 + imul(high.p25_1 - 55296 | 0, 1024) | 0) + (low.p25_1 - 56320 | 0) | 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;
         sb.u6('&#').aa(codePoint).v6(_Char___init__impl__6a9atx(59));
-        copiedUpTo = low.o25_1;
+        copiedUpTo = low.q25_1;
         count = count + 1 | 0;
         i = i + 2 | 0;
       } else {
@@ -2268,17 +2269,17 @@
     return new Pair(sb.toString(), count);
   }
   function NumericRef(start, end, value) {
-    this.n25_1 = start;
-    this.o25_1 = end;
-    this.p25_1 = value;
+    this.p25_1 = start;
+    this.q25_1 = end;
+    this.r25_1 = value;
   }
   protoOf(NumericRef).toString = function () {
-    return 'NumericRef(start=' + this.n25_1 + ', end=' + this.o25_1 + ', value=' + this.p25_1 + ')';
+    return 'NumericRef(start=' + this.p25_1 + ', end=' + this.q25_1 + ', value=' + this.r25_1 + ')';
   };
   protoOf(NumericRef).hashCode = function () {
-    var result = this.n25_1;
-    result = imul(result, 31) + this.o25_1 | 0;
-    result = imul(result, 31) + this.p25_1 | 0;
+    var result = this.p25_1;
+    result = imul(result, 31) + this.q25_1 | 0;
+    result = imul(result, 31) + this.r25_1 | 0;
     return result;
   };
   protoOf(NumericRef).equals = function (other) {
@@ -2286,11 +2287,11 @@
       return true;
     if (!(other instanceof NumericRef))
       return false;
-    if (!(this.n25_1 === other.n25_1))
+    if (!(this.p25_1 === other.p25_1))
       return false;
-    if (!(this.o25_1 === other.o25_1))
+    if (!(this.q25_1 === other.q25_1))
       return false;
-    if (!(this.p25_1 === other.p25_1))
+    if (!(this.r25_1 === other.r25_1))
       return false;
     return true;
   };
@@ -2323,7 +2324,7 @@
   function verbatimSpanEnd($this, xml, start) {
     if (!(charCodeAt(xml, start) === _Char___init__impl__6a9atx(60)))
       return -1;
-    var _iterator__ex2g4s = $this.c24_1.l();
+    var _iterator__ex2g4s = $this.e24_1.l();
     while (_iterator__ex2g4s.m()) {
       var _destruct__k2r9zo = _iterator__ex2g4s.n();
       var open = _destruct__k2r9zo.kc();
@@ -2397,21 +2398,21 @@
     }
     if (j >= n || !(charCodeAt(xml, j) === _Char___init__impl__6a9atx(59)))
       return -1;
-    return $this.b24_1.i1(substring(xml, nameStart, j)) ? j : -1;
+    return $this.d24_1.i1(substring(xml, nameStart, j)) ? j : -1;
   }
   function isHexDigit($this, $receiver) {
     return isDigit($receiver) || (_Char___init__impl__6a9atx(97) <= $receiver ? $receiver <= _Char___init__impl__6a9atx(102) : false) || (_Char___init__impl__6a9atx(65) <= $receiver ? $receiver <= _Char___init__impl__6a9atx(70) : false);
   }
   function GpxXmlRepair() {
     GpxXmlRepair_instance = this;
-    this.b24_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
-    this.c24_1 = listOf_0([to('<![CDATA[', ']]>'), to('<!--', '-->'), to('<?', '?>')]);
-    this.d24_1 = 20;
+    this.d24_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
+    this.e24_1 = listOf_0([to('<![CDATA[', ']]>'), to('<!--', '-->'), to('<?', '?>')]);
+    this.f24_1 = 20;
   }
-  protoOf(GpxXmlRepair).e24 = function (xml) {
-    return this.s25(xml).q25_1;
+  protoOf(GpxXmlRepair).g24 = function (xml) {
+    return this.u25(xml).s25_1;
   };
-  protoOf(GpxXmlRepair).s25 = function (xml) {
+  protoOf(GpxXmlRepair).u25 = function (xml) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var repairs = ArrayList_init_$Create$();
     var current = xml;
@@ -2470,15 +2471,15 @@
     return GpxXmlRepair_instance;
   }
   function RepairResult(xml, repairs) {
-    this.q25_1 = xml;
-    this.r25_1 = repairs;
+    this.s25_1 = xml;
+    this.t25_1 = repairs;
   }
   protoOf(RepairResult).toString = function () {
-    return 'RepairResult(xml=' + this.q25_1 + ', repairs=' + toString_0(this.r25_1) + ')';
+    return 'RepairResult(xml=' + this.s25_1 + ', repairs=' + toString_0(this.t25_1) + ')';
   };
   protoOf(RepairResult).hashCode = function () {
-    var result = getStringHashCode(this.q25_1);
-    result = imul(result, 31) + hashCode(this.r25_1) | 0;
+    var result = getStringHashCode(this.s25_1);
+    result = imul(result, 31) + hashCode(this.t25_1) | 0;
     return result;
   };
   protoOf(RepairResult).equals = function (other) {
@@ -2486,17 +2487,17 @@
       return true;
     if (!(other instanceof RepairResult))
       return false;
-    if (!(this.q25_1 === other.q25_1))
+    if (!(this.s25_1 === other.s25_1))
       return false;
-    if (!equals(this.r25_1, other.r25_1))
+    if (!equals(this.t25_1, other.t25_1))
       return false;
     return true;
   };
   function OsmHighway() {
     OsmHighway_instance = this;
-    this.o24_1 = mapOf([to('motorway', 7.5), to('motorway_link', 6.0), to('trunk', 7.0), to('trunk_link', 6.0), to('primary', 6.5), to('primary_link', 5.5), to('secondary', 6.0), to('secondary_link', 5.0), to('tertiary', 5.5), to('tertiary_link', 5.0), to('unclassified', 4.5), to('residential', 5.0), to('living_street', 4.0), to('service', 3.5), to('road', 5.0), to('track', 3.0), to('cycleway', 2.5), to('path', 2.5), to('bridleway', 2.5), to('footway', 2.5), to('pedestrian', 3.0), to('steps', 2.5)]);
+    this.q24_1 = mapOf([to('motorway', 7.5), to('motorway_link', 6.0), to('trunk', 7.0), to('trunk_link', 6.0), to('primary', 6.5), to('primary_link', 5.5), to('secondary', 6.0), to('secondary_link', 5.0), to('tertiary', 5.5), to('tertiary_link', 5.0), to('unclassified', 4.5), to('residential', 5.0), to('living_street', 4.0), to('service', 3.5), to('road', 5.0), to('track', 3.0), to('cycleway', 2.5), to('path', 2.5), to('bridleway', 2.5), to('footway', 2.5), to('pedestrian', 3.0), to('steps', 2.5)]);
   }
-  protoOf(OsmHighway).p24 = function (highway) {
+  protoOf(OsmHighway).r24 = function (highway) {
     var tmp;
     if (highway == null) {
       tmp = null;
@@ -2517,7 +2518,7 @@
     // Inline function 'kotlin.text.isNullOrEmpty' call
     if (key == null || charSequenceLength(key) === 0)
       return null;
-    return this.o24_1.q1(key);
+    return this.q24_1.q1(key);
   };
   var OsmHighway_instance;
   function OsmHighway_getInstance() {
@@ -2542,9 +2543,9 @@
     var negative = value < 0.0;
     // Inline function 'kotlin.math.abs' call
     var absValue = Math.abs(value);
-    var scale = toNumber($this.u25_1[decimals]);
+    var scale = toNumber($this.w25_1[decimals]);
     var scaledLong = numberToLong(round(absValue * scale));
-    var whole = $this.u25_1[decimals];
+    var whole = $this.w25_1[decimals];
     var intPart = divide(scaledLong, whole);
     var sign = negative && !equalsLong(scaledLong, new Long(0, 0)) ? '-' : '';
     var tmp;
@@ -2558,7 +2559,7 @@
   }
   function CsvNumberFormat() {
     CsvNumberFormat_instance = this;
-    this.t25_1 = 12;
+    this.v25_1 = 12;
     var tmp = this;
     // Inline function 'kotlin.also' call
     var this_0 = longArray(13);
@@ -2573,9 +2574,9 @@
         p = multiply(p, new Long(10, 0));
       }
        while (inductionVariable <= last);
-    tmp.u25_1 = this_0;
+    tmp.w25_1 = this_0;
   }
-  protoOf(CsvNumberFormat).v25 = function (value, decimals) {
+  protoOf(CsvNumberFormat).x25 = function (value, decimals) {
     if (isNaN_0(value))
       return '';
     if (isInfinite(value))
@@ -2605,21 +2606,21 @@
     unitsInHeader = unitsInHeader === VOID ? true : unitsInHeader;
     decimals = decimals === VOID ? null : decimals;
     lineSeparator = lineSeparator === VOID ? '\n' : lineSeparator;
-    this.w25_1 = fields;
-    this.x25_1 = separator;
-    this.y25_1 = unitsInHeader;
-    this.z25_1 = decimals;
-    this.a26_1 = lineSeparator;
+    this.y25_1 = fields;
+    this.z25_1 = separator;
+    this.a26_1 = unitsInHeader;
+    this.b26_1 = decimals;
+    this.c26_1 = lineSeparator;
   }
   protoOf(CsvOptions).toString = function () {
-    return 'CsvOptions(fields=' + toString(this.w25_1) + ', separator=' + toString_1(this.x25_1) + ', unitsInHeader=' + this.y25_1 + ', decimals=' + this.z25_1 + ', lineSeparator=' + this.a26_1 + ')';
+    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 + ')';
   };
   protoOf(CsvOptions).hashCode = function () {
-    var result = this.w25_1 == null ? 0 : hashCode(this.w25_1);
-    result = imul(result, 31) + Char__hashCode_impl_otmys(this.x25_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.y25_1) | 0;
-    result = imul(result, 31) + (this.z25_1 == null ? 0 : this.z25_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.a26_1) | 0;
+    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;
     return result;
   };
   protoOf(CsvOptions).equals = function (other) {
@@ -2627,20 +2628,20 @@
       return true;
     if (!(other instanceof CsvOptions))
       return false;
-    if (!equals(this.w25_1, other.w25_1))
+    if (!equals(this.y25_1, other.y25_1))
       return false;
-    if (!(this.x25_1 === other.x25_1))
+    if (!(this.z25_1 === other.z25_1))
       return false;
-    if (!(this.y25_1 === other.y25_1))
+    if (!(this.a26_1 === other.a26_1))
       return false;
-    if (!(this.z25_1 == other.z25_1))
+    if (!(this.b26_1 == other.b26_1))
       return false;
-    if (!(this.a26_1 === other.a26_1))
+    if (!(this.c26_1 === other.c26_1))
       return false;
     return true;
   };
   function headerFor($this, field, unitsInHeader) {
-    return unitsInHeader ? field.d26_1 + ' (' + field.e26_1 + ')' : field.d26_1;
+    return unitsInHeader ? field.f26_1 + ' (' + field.g26_1 + ')' : field.f26_1;
   }
   function appendRow($this, sb, cells, options) {
     var iterator = cells.l();
@@ -2650,9 +2651,9 @@
       index = index + 1 | 0;
       var cell = iterator.n();
       if (i > 0) {
-        sb.v6(options.x25_1);
+        sb.v6(options.z25_1);
       }
-      sb.u6(escapeCsvCell($this, cell, options.x25_1));
+      sb.u6(escapeCsvCell($this, cell, options.z25_1));
     }
   }
   function escapeCsvCell($this, cell, separator) {
@@ -2681,8 +2682,8 @@
   }
   function CsvWriter() {
   }
-  protoOf(CsvWriter).k26 = function (path, options) {
-    var tmp0_elvis_lhs = options.w25_1;
+  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;
     var sb = StringBuilder_init_$Create$();
     // Inline function 'kotlin.collections.map' call
@@ -2691,24 +2692,24 @@
     var _iterator__ex2g4s = fields.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.y25_1);
+      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.a26_1);
       destination.k(tmp$ret$2);
     }
     appendRow(this, sb, destination, options);
     var inductionVariable = 0;
-    var last = path.j23_1;
+    var last = path.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        sb.u6(options.a26_1);
+        sb.u6(options.c26_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().v25(path.l26(i, item_0), options.z25_1);
+          var tmp$ret$5 = CsvNumberFormat_getInstance().x25(path.n26(i, item_0), options.b26_1);
           destination_0.k(tmp$ret$5);
         }
         appendRow(this, sb, destination_0, options);
@@ -2725,19 +2726,19 @@
     pretty = pretty === VOID ? false : pretty;
     decimals = decimals === VOID ? null : decimals;
     includeMeta = includeMeta === VOID ? true : includeMeta;
-    this.m26_1 = fields;
-    this.n26_1 = pretty;
-    this.o26_1 = decimals;
-    this.p26_1 = includeMeta;
+    this.o26_1 = fields;
+    this.p26_1 = pretty;
+    this.q26_1 = decimals;
+    this.r26_1 = includeMeta;
   }
   protoOf(JsonOptions).toString = function () {
-    return 'JsonOptions(fields=' + toString(this.m26_1) + ', pretty=' + this.n26_1 + ', decimals=' + this.o26_1 + ', includeMeta=' + this.p26_1 + ')';
+    return 'JsonOptions(fields=' + toString(this.o26_1) + ', pretty=' + this.p26_1 + ', decimals=' + this.q26_1 + ', includeMeta=' + this.r26_1 + ')';
   };
   protoOf(JsonOptions).hashCode = function () {
-    var result = this.m26_1 == null ? 0 : hashCode(this.m26_1);
-    result = imul(result, 31) + getBooleanHashCode(this.n26_1) | 0;
-    result = imul(result, 31) + (this.o26_1 == null ? 0 : this.o26_1) | 0;
+    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;
     return result;
   };
   protoOf(JsonOptions).equals = function (other) {
@@ -2745,13 +2746,13 @@
       return true;
     if (!(other instanceof JsonOptions))
       return false;
-    if (!equals(this.m26_1, other.m26_1))
+    if (!equals(this.o26_1, other.o26_1))
       return false;
-    if (!(this.n26_1 === other.n26_1))
+    if (!(this.p26_1 === other.p26_1))
       return false;
-    if (!(this.o26_1 == other.o26_1))
+    if (!(this.q26_1 == other.q26_1))
       return false;
-    if (!(this.p26_1 === other.p26_1))
+    if (!(this.r26_1 === other.r26_1))
       return false;
     return true;
   };
@@ -2759,17 +2760,17 @@
     var inner = indent + indent;
     appendKeyRaw($this, sb, indent, 'meta', colon);
     sb.v6(_Char___init__impl__6a9atx(123)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.t24_1, decimals), colon);
+    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.a25_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.c25_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.w24_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.y24_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.x24_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.z24_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationGainFiltered', numberOrNull($this, path.y24_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationGainFiltered', numberOrNull($this, path.a25_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationLossFiltered', numberOrNull($this, path.z24_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationLossFiltered', numberOrNull($this, path.b25_1, decimals), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
     appendKeyRaw($this, sb, inner, 'units', colon);
     sb.v6(_Char___init__impl__6a9atx(123)).u6(nl);
@@ -2780,7 +2781,7 @@
       var i = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyValueRaw($this, sb, innerUnits, $this.q26(field.d26_1), '"' + $this.q26(field.e26_1) + '"', colon);
+      appendKeyValueRaw($this, sb, innerUnits, $this.s26(field.f26_1), '"' + $this.s26(field.g26_1) + '"', colon);
       if (!(i === get_lastIndex(fields))) {
         sb.v6(_Char___init__impl__6a9atx(44));
       }
@@ -2798,10 +2799,10 @@
       var fi = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyRaw($this, sb, inner, $this.q26(field.d26_1), colon);
+      appendKeyRaw($this, sb, inner, $this.s26(field.f26_1), colon);
       sb.v6(_Char___init__impl__6a9atx(91));
       var inductionVariable = 0;
-      var last = path.j23_1;
+      var last = path.l23_1;
       if (inductionVariable < last)
         do {
           var i = inductionVariable;
@@ -2809,7 +2810,7 @@
           if (i > 0) {
             sb.v6(_Char___init__impl__6a9atx(44));
           }
-          sb.u6(numberOrNull($this, path.l26(i, field), options.o26_1));
+          sb.u6(numberOrNull($this, path.n26(i, field), options.q26_1));
         }
          while (inductionVariable < last);
       sb.v6(_Char___init__impl__6a9atx(93));
@@ -2826,7 +2827,7 @@
     if (isNaN_0(value) || isInfinite(value)) {
       tmp = 'null';
     } else {
-      tmp = CsvNumberFormat_getInstance().v25(value, decimals);
+      tmp = CsvNumberFormat_getInstance().x25(value, decimals);
     }
     return tmp;
   }
@@ -2839,18 +2840,18 @@
   }
   function JsonWriter() {
   }
-  protoOf(JsonWriter).r26 = function (path, options) {
-    var tmp0_elvis_lhs = options.m26_1;
+  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;
     var sb = StringBuilder_init_$Create$();
-    var indent = options.n26_1 ? '  ' : '';
-    var nl = options.n26_1 ? '\n' : '';
-    var colon = options.n26_1 ? ': ' : ':';
+    var indent = options.p26_1 ? '  ' : '';
+    var nl = options.p26_1 ? '\n' : '';
+    var colon = options.p26_1 ? ': ' : ':';
     sb.v6(_Char___init__impl__6a9atx(123)).u6(nl);
-    appendKeyValueRaw(this, sb, indent, 'size', path.j23_1.toString(), colon);
+    appendKeyValueRaw(this, sb, indent, 'size', path.l23_1.toString(), colon);
     sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
-    if (options.p26_1) {
-      appendMeta(this, sb, path, fields, options.o26_1, indent, nl, colon);
+    if (options.r26_1) {
+      appendMeta(this, sb, path, fields, options.q26_1, indent, nl, colon);
       sb.v6(_Char___init__impl__6a9atx(44)).u6(nl);
     }
     appendKeyRaw(this, sb, indent, 'fields', colon);
@@ -2858,7 +2859,7 @@
     sb.u6(nl).v6(_Char___init__impl__6a9atx(125));
     return sb.toString();
   };
-  protoOf(JsonWriter).q26 = function (value) {
+  protoOf(JsonWriter).s26 = function (value) {
     var sb = StringBuilder_init_$Create$_0(value.length);
     var inductionVariable = 0;
     var last = value.length;
@@ -2894,17 +2895,17 @@
     return JsonWriter_instance;
   }
   function DeckDetection(accepted, rejected, tallRunsTooShort) {
-    this.s26_1 = accepted;
-    this.t26_1 = rejected;
-    this.u26_1 = tallRunsTooShort;
+    this.u26_1 = accepted;
+    this.v26_1 = rejected;
+    this.w26_1 = tallRunsTooShort;
   }
   protoOf(DeckDetection).toString = function () {
-    return 'DeckDetection(accepted=' + toString_0(this.s26_1) + ', rejected=' + toString_0(this.t26_1) + ', tallRunsTooShort=' + this.u26_1 + ')';
+    return 'DeckDetection(accepted=' + toString_0(this.u26_1) + ', rejected=' + toString_0(this.v26_1) + ', tallRunsTooShort=' + this.w26_1 + ')';
   };
   protoOf(DeckDetection).hashCode = function () {
-    var result = hashCode(this.s26_1);
-    result = imul(result, 31) + hashCode(this.t26_1) | 0;
-    result = imul(result, 31) + this.u26_1 | 0;
+    var result = hashCode(this.u26_1);
+    result = imul(result, 31) + hashCode(this.v26_1) | 0;
+    result = imul(result, 31) + this.w26_1 | 0;
     return result;
   };
   protoOf(DeckDetection).equals = function (other) {
@@ -2912,34 +2913,34 @@
       return true;
     if (!(other instanceof DeckDetection))
       return false;
-    if (!equals(this.s26_1, other.s26_1))
+    if (!equals(this.u26_1, other.u26_1))
       return false;
-    if (!equals(this.t26_1, other.t26_1))
+    if (!equals(this.v26_1, other.v26_1))
       return false;
-    if (!(this.u26_1 === other.u26_1))
+    if (!(this.w26_1 === other.w26_1))
       return false;
     return true;
   };
   function DeckCandidate(first, last, startM, endM, metrics, rejection, deckRanges) {
-    this.v26_1 = first;
-    this.w26_1 = last;
-    this.x26_1 = startM;
-    this.y26_1 = endM;
-    this.z26_1 = metrics;
-    this.a27_1 = rejection;
-    this.b27_1 = 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;
   }
   protoOf(DeckCandidate).toString = function () {
-    return 'DeckCandidate(first=' + this.v26_1 + ', last=' + this.w26_1 + ', startM=' + this.x26_1 + ', endM=' + this.y26_1 + ', metrics=' + toString(this.z26_1) + ', rejection=' + toString(this.a27_1) + ', deckRanges=' + toString_0(this.b27_1) + ')';
+    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) + ')';
   };
   protoOf(DeckCandidate).hashCode = function () {
-    var result = this.v26_1;
-    result = imul(result, 31) + this.w26_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x26_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.y26_1) | 0;
-    result = imul(result, 31) + (this.z26_1 == null ? 0 : this.z26_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.a27_1 == null ? 0 : this.a27_1.hashCode()) | 0;
-    result = imul(result, 31) + hashCode(this.b27_1) | 0;
+    var result = this.x26_1;
+    result = imul(result, 31) + this.y26_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(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) + (this.c27_1 == null ? 0 : this.c27_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.d27_1) | 0;
     return result;
   };
   protoOf(DeckCandidate).equals = function (other) {
@@ -2947,13 +2948,9 @@
       return true;
     if (!(other instanceof DeckCandidate))
       return false;
-    if (!(this.v26_1 === other.v26_1))
+    if (!(this.x26_1 === other.x26_1))
       return false;
-    if (!(this.w26_1 === other.w26_1))
-      return false;
-    if (!equals(this.x26_1, other.x26_1))
-      return false;
-    if (!equals(this.y26_1, other.y26_1))
+    if (!(this.y26_1 === other.y26_1))
       return false;
     if (!equals(this.z26_1, other.z26_1))
       return false;
@@ -2961,11 +2958,15 @@
       return false;
     if (!equals(this.b27_1, other.b27_1))
       return false;
+    if (!equals(this.c27_1, other.c27_1))
+      return false;
+    if (!equals(this.d27_1, other.d27_1))
+      return false;
     return true;
   };
   function Companion_1() {
   }
-  protoOf(Companion_1).c27 = function (mnsM, mntM) {
+  protoOf(Companion_1).e27 = function (mnsM, mntM) {
     // Inline function 'kotlin.require' call
     if (!(mnsM.length === mntM.length)) {
       var message = 'MNS and MNT sizes differ: ' + mnsM.length + ', ' + mntM.length;
@@ -2986,23 +2987,23 @@
     return Companion_instance_2;
   }
   function DeckProfile(mnhM, mnsM, mntM) {
-    this.d27_1 = mnhM;
-    this.e27_1 = mnsM;
-    this.f27_1 = mntM;
+    this.f27_1 = mnhM;
+    this.g27_1 = mnsM;
+    this.h27_1 = mntM;
     // Inline function 'kotlin.require' call
-    if (!(this.d27_1.length === this.e27_1.length && this.e27_1.length === this.f27_1.length)) {
-      var message = 'MNH, MNS and MNT must have one sample per station: ' + this.d27_1.length + ', ' + this.e27_1.length + ', ' + this.f27_1.length;
+    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;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   protoOf(DeckProfile).o = function () {
-    return this.d27_1.length;
+    return this.f27_1.length;
   };
   function SurfaceState(mnh, mf, rough, clean) {
-    this.g27_1 = mnh;
-    this.h27_1 = mf;
-    this.i27_1 = rough;
-    this.j27_1 = clean;
+    this.i27_1 = mnh;
+    this.j27_1 = mf;
+    this.k27_1 = rough;
+    this.l27_1 = clean;
   }
   function roughness($this, mns, mf, half) {
     var tmp = 0;
@@ -3016,7 +3017,7 @@
       tmp = tmp + 1 | 0;
     }
     var sq = tmp_1;
-    var mean = $this.k27(sq, half);
+    var mean = $this.m27(sq, half);
     var tmp_3 = 0;
     var tmp_4 = mns.length;
     var tmp_5 = new Float64Array(tmp_4);
@@ -3061,7 +3062,7 @@
     if (tmp_0) {
       tmp = NaN;
     } else {
-      tmp = $this.l27(values, 0.95);
+      tmp = $this.n27(values, 0.95);
     }
     return tmp;
   }
@@ -3090,16 +3091,16 @@
     return tmp;
   }
   function sam$kotlin_Comparator$0(function_0) {
-    this.m27_1 = function_0;
+    this.o27_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).la = function (a, b) {
-    return this.m27_1(a, b);
+    return this.o27_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.m27_1;
+    return this.o27_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
@@ -3122,8 +3123,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.m28();
-    var h = $options.n28();
+    var short = (b - a | 0) <= $options.o28();
+    var h = $options.p28();
     var tmp;
     if (short) {
       tmp = new Float64Array(0);
@@ -3143,8 +3144,8 @@
       tmp = tmp_2;
     }
     var rawSlopes = tmp;
-    var cleanFraction = short ? NaN : DeckDetector_instance.o28(clean, a, b, h);
-    var cleanSlopes = !short && $options.f28_1 ? DeckDetector_instance.p28(mns, mnh, clean, cleanFraction, a, b, $options) : null;
+    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 slopes = cleanSlopes == null ? rawSlopes : cleanSlopes;
     var slopeP95 = p95OrNaN(DeckDetector_instance, slopes);
     var tmp_4;
@@ -3164,7 +3165,7 @@
       do {
         var element = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        if (mnh[element] > $options.o27_1) {
+        if (mnh[element] > $options.q27_1) {
           destination.k(element);
         }
       }
@@ -3324,7 +3325,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.b28_1) ? DeckRejection_NO_CANYON_getInstance() : short && isNaN_0(roughness) ? DeckRejection_NO_DATA_getInstance() : short ? roughness < $options.a28_1 ? null : DeckRejection_SHORT_ROUGH_getInstance() : isNaN_0(slopeP95) ? DeckRejection_NO_DATA_getInstance() : slopeP95 <= $options.x27_1 && (b - a | 0) * step >= $options.y27_1 ? null : DeckRejection_STEEP_getInstance();
+    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();
     return to(metrics, rejection);
   }
   function DeckDetector$detect$lambda($mf) {
@@ -3334,8 +3335,8 @@
   }
   function DeckDetector$detect$lambda_0(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.v26_1;
-    var tmp$ret$2 = b.v26_1;
+    var tmp = a.x26_1;
+    var tmp$ret$2 = b.x26_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckDetector$detect$lambda_1($this) {
@@ -3346,8 +3347,8 @@
         tmp = previousCompare;
       } else {
         // Inline function 'kotlin.comparisons.compareValuesBy' call
-        var tmp_0 = a.w26_1;
-        var tmp$ret$2 = b.w26_1;
+        var tmp_0 = a.y26_1;
+        var tmp$ret$2 = b.y26_1;
         tmp = compareValues(tmp_0, tmp$ret$2);
       }
       return tmp;
@@ -3366,33 +3367,33 @@
   }
   function DeckDetector() {
   }
-  protoOf(DeckDetector).q28 = function (profile, options) {
+  protoOf(DeckDetector).s28 = function (profile, options) {
     var n = profile.o();
-    var mns = profile.e27_1;
-    var mnt = profile.f27_1;
-    var step = options.n27_1;
+    var mns = profile.g27_1;
+    var mnt = profile.h27_1;
+    var step = options.p27_1;
     if (n === 0)
       return new DeckDetection(emptyList(), emptyList(), 0);
-    var state = this.r28(profile, options);
-    var mnh = state.g27_1;
-    var mf = state.h27_1;
-    var rough = state.i27_1;
+    var state = this.t28(profile, options);
+    var mnh = state.i27_1;
+    var mf = state.j27_1;
+    var rough = state.k27_1;
     var tmp = 0;
     var tmp_0 = booleanArray(n);
     while (tmp < n) {
       var tmp_1 = tmp;
-      tmp_0[tmp_1] = mnh[tmp_1] > options.o27_1;
+      tmp_0[tmp_1] = mnh[tmp_1] > options.q27_1;
       tmp = tmp + 1 | 0;
     }
     var tall = tmp_0;
-    var tallRuns = this.s28(tall);
+    var tallRuns = this.u28(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.t28()) {
+      if (((element.pe_1 - element.oe_1 | 0) + 1 | 0) >= options.v28()) {
         destination.k(element);
       }
     }
@@ -3425,7 +3426,7 @@
           do {
             var element_0 = inductionVariable;
             inductionVariable = inductionVariable + 1 | 0;
-            if (rough[element_0] < options.s27_1) {
+            if (rough[element_0] < options.u27_1) {
               count = count + 1 | 0;
               checkCountOverflow(count);
             }
@@ -3465,11 +3466,11 @@
       }
       var unknown = tmp$ret$6;
       var fraction = smooth / len;
-      if (fraction >= options.t27_1) {
+      if (fraction >= options.v27_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element_2 = to(r, fraction);
         kept.k(element_2);
-      } else if ((smooth + unknown | 0) / len >= options.t27_1) {
+      } else if ((smooth + unknown | 0) / len >= options.v27_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         noDataRuns.k(r);
       } else {
@@ -3477,7 +3478,7 @@
         roughRuns.k(r);
       }
     }
-    var gap = options.u28();
+    var gap = options.w28();
     var merged = ArrayList_init_$Create$();
     var _iterator__ex2g4s_1 = kept.l();
     while (_iterator__ex2g4s_1.m()) {
@@ -3498,15 +3499,15 @@
         merged.k(element_3);
       }
     }
-    var island = options.v28();
+    var island = options.x28();
     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.x28(mnh, r_1.oe_1, -1, options.v27_1, island, options.w28());
-      var b = this.x28(mnh, r_1.pe_1, 1, options.v27_1, island, options.w28());
+      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 prev_0 = lastOrNull(spans);
       if (!(prev_0 == null) && a_0 <= prev_0.ic_1.pe_1) {
         var tmp_6 = spans.o() - 1 | 0;
@@ -3524,16 +3525,16 @@
         spans.k(element_4);
       }
     }
-    var slope = this.y28(mf, options.n28(), step);
-    var clean = state.j27_1;
+    var slope = this.a29(mf, options.p28(), step);
+    var clean = state.l27_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.x28(mnh, r_2.oe_1, -1, options.v27_1, island, options.w28());
-      var b_0 = this.x28(mnh, r_2.pe_1, 1, options.v27_1, island, options.w28());
+      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 prev_1 = lastOrNull(parts);
       if (!(prev_1 == null) && a_3 <= prev_1.ic_1.pe_1) {
         var tmp_8 = parts.o() - 1 | 0;
@@ -3561,7 +3562,7 @@
       var metrics = _destruct__k2r9zo_3.kc();
       var rejection = _destruct__k2r9zo_3.lc();
       var tmp_10;
-      if (options.l28_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
+      if (options.n28_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
         // Inline function 'kotlin.collections.filter' call
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -3601,7 +3602,7 @@
     var tmp_12 = booleanArray(n);
     while (tmp_11 < n) {
       var tmp_13 = tmp_11;
-      tmp_12[tmp_13] = mnh[tmp_13] > options.v27_1;
+      tmp_12[tmp_13] = mnh[tmp_13] > options.x27_1;
       tmp_11 = tmp_11 + 1 | 0;
     }
     var deckMask = tmp_12;
@@ -3611,10 +3612,10 @@
       var span_0 = _destruct__k2r9zo_5.kc();
       var rejection_0 = _destruct__k2r9zo_5.hh();
       if (rejection_0 == null) {
-        this.z28(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
+        this.b29(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
       }
     }
-    var deckRuns = this.s28(deckMask);
+    var deckRuns = this.u28(deckMask);
     var accepted = ArrayList_init_$Create$();
     var rejected = ArrayList_init_$Create$();
     var _iterator__ex2g4s_8 = classified.l();
@@ -3635,7 +3636,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.a29() || (b_1 - a_6 | 0) <= options.b29()) && 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.c29() || (b_1 - a_6 | 0) <= options.d29()) && element_9.oe_1 <= b_1 && element_9.pe_1 >= a_6) {
             destination_1.k(element_9);
           }
         }
@@ -3666,14 +3667,14 @@
         rejected.k(candidate);
       }
     }
-    var _iterator__ex2g4s_11 = this.c29(roughRuns, gap).l();
+    var _iterator__ex2g4s_11 = this.e29(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.c29(noDataRuns, gap).l();
+    var _iterator__ex2g4s_12 = this.e29(noDataRuns, gap).l();
     while (_iterator__ex2g4s_12.m()) {
       var g_0 = _iterator__ex2g4s_12.n();
       // Inline function 'kotlin.collections.plusAssign' call
@@ -3689,40 +3690,40 @@
     sortWith(rejected, tmp$ret$40);
     return new DeckDetection(accepted, rejected, tooShort);
   };
-  protoOf(DeckDetector).r28 = function (profile, options) {
+  protoOf(DeckDetector).t28 = function (profile, options) {
     var n = profile.o();
-    var mns = profile.e27_1;
-    var mnt = profile.f27_1;
+    var mns = profile.g27_1;
+    var mnt = profile.h27_1;
     var tmp;
-    if (options.i28_1) {
-      var tol = options.j28_1;
+    if (options.k28_1) {
+      var tol = options.l28_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.d27_1[tmp_2];
+        tmp_1[tmp_2] = mnt[tmp_2] > mns[tmp_2] + tol ? Infinity : profile.f27_1[tmp_2];
         tmp_0 = tmp_0 + 1 | 0;
       }
       tmp = tmp_1;
     } else {
-      tmp = profile.d27_1;
+      tmp = profile.f27_1;
     }
     var mnh = tmp;
-    var mf = this.e29(mns, options.d29() / 2 | 0);
-    var rough = roughness(this, mns, mf, options.f29() / 2 | 0);
+    var mf = this.g29(mns, options.f29() / 2 | 0);
+    var rough = roughness(this, mns, mf, options.h29() / 2 | 0);
     // Inline function 'kotlin.let' call
-    var m = this.g29(rough, options.f29() / 2 | 0);
+    var m = this.i29(rough, options.h29() / 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.s27_1;
+      tmp_4[tmp_5] = m[tmp_5] < options.u27_1;
       tmp_3 = tmp_3 + 1 | 0;
     }
     var clean = tmp_4;
     return new SurfaceState(mnh, mf, rough, clean);
   };
-  protoOf(DeckDetector).o28 = function (clean, a, b, h) {
+  protoOf(DeckDetector).q28 = function (clean, a, b, h) {
     var tmp;
     if ((b - h | 0) < (a + h | 0)) {
       tmp = NaN;
@@ -3760,9 +3761,9 @@
     }
     return tmp;
   };
-  protoOf(DeckDetector).p28 = function (mns, mnh, clean, cleanFraction, a, b, options) {
+  protoOf(DeckDetector).r28 = function (mns, mnh, clean, cleanFraction, a, b, options) {
     var n = mns.length;
-    var h = options.n28();
+    var h = options.p28();
     if ((b - h | 0) < (a + h | 0))
       return null;
     // Inline function 'kotlin.collections.filter' call
@@ -3781,11 +3782,11 @@
       }
        while (!(element === last));
     var inSpan = destination;
-    if (inSpan.o() < options.h28_1)
+    if (inSpan.o() < options.j28_1)
       return null;
-    if (!(cleanFraction >= options.g28_1))
+    if (!(cleanFraction >= options.i28_1))
       return null;
-    var medianHalf = options.d29() / 2 | 0;
+    var medianHalf = options.f29() / 2 | 0;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - medianHalf | 0;
     var lo = Math.max(0, b_0);
@@ -3822,7 +3823,7 @@
             do {
               var element_0 = inductionVariable_1;
               inductionVariable_1 = inductionVariable_1 + 1 | 0;
-              if (mnh[element_0] <= options.k28_1) {
+              if (mnh[element_0] <= options.m28_1) {
                 tmp$ret$5 = true;
                 break $l$block_0;
               }
@@ -3842,7 +3843,7 @@
            while (inductionVariable_2 < c1);
       }
        while (inductionVariable_0 < last_0);
-    var mfClean = this.e29(x, medianHalf);
+    var mfClean = this.g29(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);
@@ -3850,13 +3851,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.n27_1);
+      var x_0 = (mfClean[(k_0 + h | 0) - lo | 0] - mfClean[(k_0 - h | 0) - lo | 0]) / (imul(2, h) * options.p27_1);
       tmp_2[tmp_3] = Math.abs(x_0);
       tmp_0 = tmp_0 + 1 | 0;
     }
     return tmp_2;
   };
-  protoOf(DeckDetector).x28 = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
+  protoOf(DeckDetector).z28 = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
     var n = mnh.length;
     var ok = DeckDetector$extend$lambda(n, mnh, threshold);
     var k = from;
@@ -3890,7 +3891,7 @@
     }
     return abs(k - from | 0) > maxSteps ? from : k;
   };
-  protoOf(DeckDetector).z28 = function (mask, span, maxHole, fill) {
+  protoOf(DeckDetector).b29 = function (mask, span, maxHole, fill) {
     var k = span.oe_1;
     $l$loop: while (k <= span.pe_1) {
       if (mask[k]) {
@@ -3950,7 +3951,7 @@
       k = end + 1 | 0;
     }
   };
-  protoOf(DeckDetector).e29 = function (x, half) {
+  protoOf(DeckDetector).g29 = function (x, half) {
     var n = x.length;
     var window_0 = new Float64Array(imul(2, half) + 1 | 0);
     var tmp = 0;
@@ -3984,7 +3985,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).k27 = function (x, half) {
+  protoOf(DeckDetector).m27 = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4005,7 +4006,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).g29 = function (x, half) {
+  protoOf(DeckDetector).i29 = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4036,7 +4037,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).y28 = function (x, h, stepM) {
+  protoOf(DeckDetector).a29 = function (x, h, stepM) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4053,7 +4054,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).s28 = function (mask) {
+  protoOf(DeckDetector).u28 = function (mask) {
     var out = ArrayList_init_$Create$();
     var start = -1;
     var inductionVariable = 0;
@@ -4079,7 +4080,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).c29 = function (rs, gapStations) {
+  protoOf(DeckDetector).e29 = function (rs, gapStations) {
     var out = ArrayList_init_$Create$();
     var _iterator__ex2g4s = rs.l();
     while (_iterator__ex2g4s.m()) {
@@ -4099,7 +4100,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).l27 = function (values, q) {
+  protoOf(DeckDetector).n27 = function (values, q) {
     var s = sortedArray(values);
     var rank = (s.length - 1 | 0) * q;
     // Inline function 'kotlin.math.floor' call
@@ -4116,33 +4117,33 @@
     return DeckDetector_instance;
   }
   function DeckMetrics(lengthM, slopeP95, slopeMax, rawSlopeP95, cleanFraction, slopeOnCleanDeck, roughnessM, smoothFraction, canyonM, mntDropM, deckTopM) {
-    this.h29_1 = lengthM;
-    this.i29_1 = slopeP95;
-    this.j29_1 = slopeMax;
-    this.k29_1 = rawSlopeP95;
-    this.l29_1 = cleanFraction;
-    this.m29_1 = slopeOnCleanDeck;
-    this.n29_1 = roughnessM;
-    this.o29_1 = smoothFraction;
-    this.p29_1 = canyonM;
-    this.q29_1 = mntDropM;
-    this.r29_1 = 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;
   }
   protoOf(DeckMetrics).toString = function () {
-    return 'DeckMetrics(lengthM=' + this.h29_1 + ', slopeP95=' + this.i29_1 + ', slopeMax=' + this.j29_1 + ', rawSlopeP95=' + this.k29_1 + ', cleanFraction=' + this.l29_1 + ', slopeOnCleanDeck=' + this.m29_1 + ', roughnessM=' + this.n29_1 + ', smoothFraction=' + this.o29_1 + ', canyonM=' + this.p29_1 + ', mntDropM=' + this.q29_1 + ', deckTopM=' + this.r29_1 + ')';
+    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 + ')';
   };
   protoOf(DeckMetrics).hashCode = function () {
-    var result = getNumberHashCode(this.h29_1);
-    result = imul(result, 31) + getNumberHashCode(this.i29_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.j29_1) | 0;
+    var result = getNumberHashCode(this.j29_1);
     result = imul(result, 31) + getNumberHashCode(this.k29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.l29_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.m29_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.m29_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.n29_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.o29_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.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;
     return result;
   };
   protoOf(DeckMetrics).equals = function (other) {
@@ -4150,21 +4151,17 @@
       return true;
     if (!(other instanceof DeckMetrics))
       return false;
-    if (!equals(this.h29_1, other.h29_1))
-      return false;
-    if (!equals(this.i29_1, other.i29_1))
-      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))
       return false;
-    if (!(this.m29_1 === other.m29_1))
+    if (!equals(this.m29_1, other.m29_1))
       return false;
     if (!equals(this.n29_1, other.n29_1))
       return false;
-    if (!equals(this.o29_1, other.o29_1))
+    if (!(this.o29_1 === other.o29_1))
       return false;
     if (!equals(this.p29_1, other.p29_1))
       return false;
@@ -4172,6 +4169,10 @@
       return false;
     if (!equals(this.r29_1, other.r29_1))
       return false;
+    if (!equals(this.s29_1, other.s29_1))
+      return false;
+    if (!equals(this.t29_1, other.t29_1))
+      return false;
     return true;
   };
   var static_init_called_1;
@@ -4214,21 +4215,21 @@
     return DeckRejection_NO_DATA_instance;
   }
   function stations($this, metres, name) {
-    var r = metres / $this.n27_1;
+    var r = metres / $this.p27_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.n27_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.p27_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
   function Companion_2() {
     Companion_instance_3 = this;
-    this.s29_1 = new DeckDetectorOptions();
-    this.t29_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.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);
   }
   var Companion_instance_3;
   function Companion_getInstance_3() {
@@ -4263,37 +4264,37 @@
     mntAboveMnsToleranceM = mntAboveMnsToleranceM === VOID ? 0.5 : mntAboveMnsToleranceM;
     cleanGapGroundMnhM = cleanGapGroundMnhM === VOID ? 1.0 : cleanGapGroundMnhM;
     splitSteepMerged = splitSteepMerged === VOID ? true : splitSteepMerged;
-    this.n27_1 = stepM;
-    this.o27_1 = tallMnhM;
-    this.p27_1 = minTallRunM;
-    this.q27_1 = surfaceMedianWindowM;
-    this.r27_1 = roughnessWindowM;
-    this.s27_1 = maxRoughnessM;
-    this.t27_1 = minSmoothFraction;
-    this.u27_1 = mergeGapM;
-    this.v27_1 = deckMnhM;
-    this.w27_1 = slopeHalfWindowM;
-    this.x27_1 = maxSlopeP95;
-    this.y27_1 = minLengthM;
-    this.z27_1 = shortSpanM;
-    this.a28_1 = maxShortRoughnessM;
-    this.b28_1 = minCanyonDropM;
-    this.c28_1 = deckMinRunM;
-    this.d28_1 = smallSpanM;
-    this.e28_1 = maxAbutmentM;
-    this.f28_1 = slopeOnCleanDeck;
-    this.g28_1 = minCleanFraction;
-    this.h28_1 = minCleanStationsCount;
-    this.i28_1 = mntAboveMnsAsTall;
-    this.j28_1 = mntAboveMnsToleranceM;
-    this.k28_1 = cleanGapGroundMnhM;
-    this.l28_1 = 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;
     // Inline function 'kotlin.require' call
-    if (!(this.n27_1 > 0.0 && isFinite(this.n27_1))) {
-      var message = 'stepM must be positive, got ' + this.n27_1;
+    if (!(this.p27_1 > 0.0 && isFinite(this.p27_1))) {
+      var message = 'stepM must be positive, got ' + this.p27_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    var thresholds = mapOf([to('tallMnhM', this.o27_1), to('minTallRunM', this.p27_1), to('surfaceMedianWindowM', this.q27_1), to('roughnessWindowM', this.r27_1), to('maxRoughnessM', this.s27_1), to('minSmoothFraction', this.t27_1), to('mergeGapM', this.u27_1), to('deckMnhM', this.v27_1), to('slopeHalfWindowM', this.w27_1), to('maxSlopeP95', this.x27_1), to('minLengthM', this.y27_1), to('shortSpanM', this.z27_1), to('maxShortRoughnessM', this.a28_1), to('minCanyonDropM', this.b28_1), to('deckMinRunM', this.c28_1), to('smallSpanM', this.d28_1), to('maxAbutmentM', this.e28_1), to('minCleanFraction', this.g28_1), to('mntAboveMnsToleranceM', this.j28_1), to('cleanGapGroundMnhM', this.k28_1)]);
+    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)]);
     // Inline function 'kotlin.collections.forEach' call
     // Inline function 'kotlin.collections.iterator' call
     var _iterator__ex2g4s = thresholds.t1().l();
@@ -4310,99 +4311,97 @@
       }
     }
     // Inline function 'kotlin.require' call
-    if (!((this.d29() % 2 | 0) === 1)) {
+    if (!((this.f29() % 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.f29() % 2 | 0) === 1)) {
+    if (!((this.h29() % 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.t28() >= 1)) {
+    if (!(this.v28() >= 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.n28() >= 1)) {
+    if (!(this.p28() >= 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.u28() >= 0 && this.a29() >= 1)) {
+    if (!(this.w28() >= 0 && this.c29() >= 1)) {
       var message_5 = 'negative window';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_5));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.m28() >= 0 && this.b29() >= 0)) {
+    if (!(this.o28() >= 0 && this.d29() >= 0)) {
       var message_6 = 'negative span threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.w28() >= 0)) {
+    if (!(this.y28() >= 0)) {
       var message_7 = 'negative maxAbutmentM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_7));
     }
-    var containsArg = this.g28_1;
+    var containsArg = this.i28_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.g28_1;
+      var message_8 = 'minCleanFraction must be in 0..1, got ' + this.i28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_8));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.j28_1 >= 0.0)) {
-      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.j28_1;
+    if (!(this.l28_1 >= 0.0)) {
+      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.l28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_9));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.h28_1 >= 2)) {
-      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.h28_1;
+    if (!(this.j28_1 >= 2)) {
+      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.j28_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_10));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.m28() >= (imul(2, this.n28()) - 1 | 0))) {
+    if (!(this.o28() >= (imul(2, this.p28()) - 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).t28 = function () {
-    return stations(this, this.p27_1, 'minTallRunM');
-  };
-  protoOf(DeckDetectorOptions).d29 = function () {
-    return stations(this, this.q27_1, 'surfaceMedianWindowM');
+  protoOf(DeckDetectorOptions).v28 = function () {
+    return stations(this, this.r27_1, 'minTallRunM');
   };
   protoOf(DeckDetectorOptions).f29 = function () {
-    return stations(this, this.r27_1, 'roughnessWindowM');
+    return stations(this, this.s27_1, 'surfaceMedianWindowM');
   };
-  protoOf(DeckDetectorOptions).u28 = function () {
-    return stations(this, this.u27_1, 'mergeGapM');
+  protoOf(DeckDetectorOptions).h29 = function () {
+    return stations(this, this.t27_1, 'roughnessWindowM');
   };
-  protoOf(DeckDetectorOptions).n28 = function () {
-    return stations(this, this.w27_1, 'slopeHalfWindowM');
+  protoOf(DeckDetectorOptions).w28 = function () {
+    return stations(this, this.w27_1, 'mergeGapM');
   };
-  protoOf(DeckDetectorOptions).m28 = function () {
-    return stations(this, this.z27_1, 'shortSpanM');
+  protoOf(DeckDetectorOptions).p28 = function () {
+    return stations(this, this.y27_1, 'slopeHalfWindowM');
   };
-  protoOf(DeckDetectorOptions).a29 = function () {
-    return stations(this, this.c28_1, 'deckMinRunM');
+  protoOf(DeckDetectorOptions).o28 = function () {
+    return stations(this, this.b28_1, 'shortSpanM');
   };
-  protoOf(DeckDetectorOptions).w28 = function () {
-    return stations(this, this.e28_1, 'maxAbutmentM');
+  protoOf(DeckDetectorOptions).c29 = function () {
+    return stations(this, this.e28_1, 'deckMinRunM');
   };
-  protoOf(DeckDetectorOptions).v28 = function () {
-    return this.d29() / 2 | 0;
+  protoOf(DeckDetectorOptions).y28 = function () {
+    return stations(this, this.g28_1, 'maxAbutmentM');
   };
-  protoOf(DeckDetectorOptions).b29 = function () {
-    return stations(this, this.d28_1, 'smallSpanM');
+  protoOf(DeckDetectorOptions).x28 = function () {
+    return this.f29() / 2 | 0;
+  };
+  protoOf(DeckDetectorOptions).d29 = function () {
+    return stations(this, this.f28_1, 'smallSpanM');
   };
   protoOf(DeckDetectorOptions).toString = function () {
-    return 'DeckDetectorOptions(stepM=' + this.n27_1 + ', tallMnhM=' + this.o27_1 + ', minTallRunM=' + this.p27_1 + ', surfaceMedianWindowM=' + this.q27_1 + ', roughnessWindowM=' + this.r27_1 + ', maxRoughnessM=' + this.s27_1 + ', minSmoothFraction=' + this.t27_1 + ', mergeGapM=' + this.u27_1 + ', deckMnhM=' + this.v27_1 + ', slopeHalfWindowM=' + this.w27_1 + ', maxSlopeP95=' + this.x27_1 + ', minLengthM=' + this.y27_1 + ', shortSpanM=' + this.z27_1 + ', maxShortRoughnessM=' + this.a28_1 + ', minCanyonDropM=' + this.b28_1 + ', deckMinRunM=' + this.c28_1 + ', smallSpanM=' + this.d28_1 + ', maxAbutmentM=' + this.e28_1 + ', slopeOnCleanDeck=' + this.f28_1 + ', minCleanFraction=' + this.g28_1 + ', minCleanStationsCount=' + this.h28_1 + ', mntAboveMnsAsTall=' + this.i28_1 + ', mntAboveMnsToleranceM=' + this.j28_1 + ', cleanGapGroundMnhM=' + this.k28_1 + ', splitSteepMerged=' + this.l28_1 + ')';
+    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 + ')';
   };
   protoOf(DeckDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.n27_1);
-    result = imul(result, 31) + getNumberHashCode(this.o27_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p27_1) | 0;
+    var result = getNumberHashCode(this.p27_1);
     result = imul(result, 31) + getNumberHashCode(this.q27_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.r27_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.s27_1) | 0;
@@ -4418,13 +4417,15 @@
     result = imul(result, 31) + getNumberHashCode(this.c28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.d28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.e28_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.f28_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.f28_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.g28_1) | 0;
-    result = imul(result, 31) + 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) + getNumberHashCode(this.k28_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.l28_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.m28_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.n28_1) | 0;
     return result;
   };
   protoOf(DeckDetectorOptions).equals = function (other) {
@@ -4432,10 +4433,6 @@
       return true;
     if (!(other instanceof DeckDetectorOptions))
       return false;
-    if (!equals(this.n27_1, other.n27_1))
-      return false;
-    if (!equals(this.o27_1, other.o27_1))
-      return false;
     if (!equals(this.p27_1, other.p27_1))
       return false;
     if (!equals(this.q27_1, other.q27_1))
@@ -4468,83 +4465,87 @@
       return false;
     if (!equals(this.e28_1, other.e28_1))
       return false;
-    if (!(this.f28_1 === other.f28_1))
+    if (!equals(this.f28_1, other.f28_1))
       return false;
     if (!equals(this.g28_1, other.g28_1))
       return false;
     if (!(this.h28_1 === other.h28_1))
       return false;
-    if (!(this.i28_1 === other.i28_1))
+    if (!equals(this.i28_1, other.i28_1))
+      return false;
+    if (!(this.j28_1 === other.j28_1))
+      return false;
+    if (!(this.k28_1 === other.k28_1))
       return false;
-    if (!equals(this.j28_1, other.j28_1))
+    if (!equals(this.l28_1, other.l28_1))
       return false;
-    if (!equals(this.k28_1, other.k28_1))
+    if (!equals(this.m28_1, other.m28_1))
       return false;
-    if (!(this.l28_1 === other.l28_1))
+    if (!(this.n28_1 === other.n28_1))
       return false;
     return true;
   };
   function DeckReplacement(first, last, spanFirst, spanLast, anchorFirst, anchorLast, anchors, elevationM, spans) {
-    this.u29_1 = first;
-    this.v29_1 = last;
-    this.w29_1 = spanFirst;
-    this.x29_1 = spanLast;
-    this.y29_1 = anchorFirst;
-    this.z29_1 = anchorLast;
-    this.a2a_1 = anchors;
-    this.b2a_1 = elevationM;
-    this.c2a_1 = spans;
-  }
-  protoOf(DeckReplacement).d2a = function () {
-    return this.u29_1 < this.w29_1;
-  };
-  protoOf(DeckReplacement).e2a = function () {
-    return this.v29_1 > this.x29_1;
-  };
-  protoOf(DeckReplacement).f2a = function (startM, endM) {
+    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;
+  };
+  protoOf(DeckReplacement).g2a = function () {
+    return this.x29_1 > this.z29_1;
+  };
+  protoOf(DeckReplacement).h2a = function (startM, endM) {
     // Inline function 'kotlin.collections.copyOf' call
     // Inline function 'kotlin.js.asDynamic' call
-    var z = this.b2a_1.slice();
-    if (this.d2a()) {
+    var z = this.d2a_1.slice();
+    if (this.f2a()) {
       z[0] = startM;
     }
-    if (this.e2a()) {
+    if (this.g2a()) {
       z[z.length - 1 | 0] = endM;
     }
     fillLinear(z);
     return z;
   };
   protoOf(DeckReplacement).toString = function () {
-    var tmp = 'DeckReplacement(first=' + this.u29_1 + ', last=' + this.v29_1 + ', span=' + this.w29_1 + '..' + this.x29_1 + ', anchors=' + this.y29_1 + '..' + this.z29_1 + ' ';
-    var tmp_0 = this.a2a_1.length;
+    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;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.c2a_1;
+    var this_0 = this.e2a_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.v26_1, item.w26_1);
+      var tmp$ret$2 = numberRangeToNumber(item.x26_1, item.y26_1);
       destination.k(tmp$ret$2);
     }
     return tmp + ('(' + tmp_0 + '), spans=' + toString_0(destination) + ')');
   };
   function DeckProfiles(replacements, dropped) {
-    this.g2a_1 = replacements;
-    this.h2a_1 = dropped;
+    this.i2a_1 = replacements;
+    this.j2a_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.v26_1 - a.w26_1 | 0) - 1 | 0) >= options.u28())
+    if (((b.x26_1 - a.y26_1 | 0) - 1 | 0) >= options.w28())
       return false;
     if (aAnchors.q() || bAnchors.q())
       return false;
     var c0 = last(aAnchors);
     var c1 = first(bAnchors);
-    var tmp0 = until(a.w26_1 + 1 | 0, b.v26_1);
+    var tmp0 = until(a.y26_1 + 1 | 0, b.x26_1);
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.none' call
@@ -4566,7 +4567,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.b28_1)) {
+          if (!(line - mnt[k] > options.d28_1)) {
             tmp$ret$0 = false;
             break $l$block_0;
           }
@@ -4579,7 +4580,7 @@
   function replacement($this, spans, anchors, mns, n, options) {
     var u = first_0(anchors);
     var v = last_0(anchors);
-    var half = options.d29() / 2 | 0;
+    var half = options.f29() / 2 | 0;
     var tmp = 0;
     var tmp_0 = ((v - u | 0) + 1 | 0) + imul(2, half) | 0;
     var tmp_1 = new Float64Array(tmp_0);
@@ -4606,7 +4607,7 @@
            while (!(k === c1));
       }
        while (inductionVariable < last_2);
-    var median = DeckDetector_instance.e29(x, half);
+    var median = DeckDetector_instance.g29(x, half);
     var tmp_2 = 0;
     var tmp_3 = (v - u | 0) + 1 | 0;
     var tmp_4 = new Float64Array(tmp_3);
@@ -4616,9 +4617,9 @@
       tmp_2 = tmp_2 + 1 | 0;
     }
     var deck = tmp_4;
-    $this.i2a(deck, options.x27_1 * options.n27_1);
-    var spanFirst = first(spans).v26_1;
-    var spanLast = last(spans).w26_1;
+    $this.k2a(deck, options.z27_1 * options.p27_1);
+    var spanFirst = first(spans).x26_1;
+    var spanLast = last(spans).y26_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b = spanFirst - 1 | 0;
     var first_2 = Math.max(0, b);
@@ -4639,16 +4640,16 @@
     return new DeckReplacement(first_2, last_3, spanFirst, spanLast, u, v, anchors, z, spans);
   }
   function sam$kotlin_Comparator$0_0(function_0) {
-    this.j2a_1 = function_0;
+    this.l2a_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0_0).la = function (a, b) {
-    return this.j2a_1(a, b);
+    return this.l2a_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.j2a_1;
+    return this.l2a_1;
   };
   protoOf(sam$kotlin_Comparator$0_0).equals = function (other) {
     var tmp;
@@ -4670,7 +4671,7 @@
   };
   function build$anchorsOf(state, mns, span) {
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp0 = span.b27_1;
+    var tmp0 = span.d27_1;
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.l();
@@ -4687,9 +4688,9 @@
       var element_0 = _iterator__ex2g4s_0.n();
       var tmp;
       var tmp_0;
-      var containsLower = span.v26_1;
-      if (element_0 <= span.w26_1 ? containsLower <= element_0 : false) {
-        tmp_0 = state.j27_1[element_0];
+      var containsLower = span.x26_1;
+      if (element_0 <= span.y26_1 ? containsLower <= element_0 : false) {
+        tmp_0 = state.l27_1[element_0];
       } else {
         tmp_0 = false;
       }
@@ -4706,21 +4707,21 @@
   }
   function DeckProfileBuilder$build$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.v26_1;
-    var tmp$ret$2 = b.v26_1;
+    var tmp = a.x26_1;
+    var tmp$ret$2 = b.x26_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckProfileBuilder() {
   }
-  protoOf(DeckProfileBuilder).k2a = function (profile, detection, options) {
+  protoOf(DeckProfileBuilder).m2a = function (profile, detection, options) {
     var n = profile.o();
-    if (n === 0 || detection.s26_1.q())
+    if (n === 0 || detection.u26_1.q())
       return new DeckProfiles(emptyList(), emptyList());
-    var state = DeckDetector_instance.r28(profile, options);
-    var mns = profile.e27_1;
-    var mnt = profile.f27_1;
+    var state = DeckDetector_instance.t28(profile, options);
+    var mns = profile.g27_1;
+    var mnt = profile.h27_1;
     // Inline function 'kotlin.collections.sortedBy' call
-    var this_0 = detection.s26_1;
+    var this_0 = detection.u26_1;
     // Inline function 'kotlin.comparisons.compareBy' call
     var tmp = DeckProfileBuilder$build$lambda;
     var tmp$ret$1 = new sam$kotlin_Comparator$0_0(tmp);
@@ -4777,7 +4778,7 @@
     }
     return new DeckProfiles(replacements, dropped);
   };
-  protoOf(DeckProfileBuilder).i2a = function (z, maxRise) {
+  protoOf(DeckProfileBuilder).k2a = function (z, maxRise) {
     var inductionVariable = 1;
     var last = z.length;
     if (inductionVariable < last)
@@ -4832,33 +4833,33 @@
   }
   function Companion_3() {
   }
-  protoOf(Companion_3).l2a = function (options) {
-    return new ElevationGainResult(0.0, 0.0, 0.0, 0.0, options.o2a_1, options.p2a_1, 0);
+  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 Companion_getInstance_4() {
     return Companion_instance_4;
   }
   function ElevationGainResult(gainM, lossM, rawGainM, rawLossM, thresholdM, smoothWindowM, legCount) {
-    this.q2a_1 = gainM;
-    this.r2a_1 = lossM;
-    this.s2a_1 = rawGainM;
-    this.t2a_1 = rawLossM;
-    this.u2a_1 = thresholdM;
-    this.v2a_1 = smoothWindowM;
-    this.w2a_1 = 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;
   }
   protoOf(ElevationGainResult).toString = function () {
-    return 'ElevationGainResult(gainM=' + this.q2a_1 + ', lossM=' + this.r2a_1 + ', rawGainM=' + this.s2a_1 + ', rawLossM=' + this.t2a_1 + ', thresholdM=' + this.u2a_1 + ', smoothWindowM=' + this.v2a_1 + ', legCount=' + this.w2a_1 + ')';
+    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 + ')';
   };
   protoOf(ElevationGainResult).hashCode = function () {
-    var result = getNumberHashCode(this.q2a_1);
-    result = imul(result, 31) + getNumberHashCode(this.r2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.s2a_1) | 0;
+    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) + this.w2a_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;
     return result;
   };
   protoOf(ElevationGainResult).equals = function (other) {
@@ -4866,10 +4867,6 @@
       return true;
     if (!(other instanceof ElevationGainResult))
       return false;
-    if (!equals(this.q2a_1, other.q2a_1))
-      return false;
-    if (!equals(this.r2a_1, other.r2a_1))
-      return false;
     if (!equals(this.s2a_1, other.s2a_1))
       return false;
     if (!equals(this.t2a_1, other.t2a_1))
@@ -4878,14 +4875,18 @@
       return false;
     if (!equals(this.v2a_1, other.v2a_1))
       return false;
-    if (!(this.w2a_1 === other.w2a_1))
+    if (!equals(this.w2a_1, other.w2a_1))
+      return false;
+    if (!equals(this.x2a_1, other.x2a_1))
+      return false;
+    if (!(this.y2a_1 === other.y2a_1))
       return false;
     return true;
   };
   function Banked(gainM, lossM, legCount) {
-    this.x2a_1 = gainM;
-    this.y2a_1 = lossM;
-    this.z2a_1 = legCount;
+    this.z2a_1 = gainM;
+    this.a2b_1 = lossM;
+    this.b2b_1 = legCount;
   }
   function accumulate($this, h, threshold) {
     var gain = 0.0;
@@ -4967,45 +4968,45 @@
   }
   function ElevationGain() {
   }
-  protoOf(ElevationGain).a2b = function (path, options) {
-    if (path.j23_1 < 2)
-      return Companion_instance_4.l2a(options);
+  protoOf(ElevationGain).c2b = function (path, options) {
+    if (path.l23_1 < 2)
+      return Companion_instance_4.n2a(options);
     var tmp = 0;
-    var tmp_0 = path.j23_1;
+    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.b2b(tmp_2);
+      tmp_1[tmp_2] = path.d2b(tmp_2);
       tmp = tmp + 1 | 0;
     }
     var distanceM = tmp_1;
     var tmp_3 = 0;
-    var tmp_4 = path.j23_1;
+    var tmp_4 = path.l23_1;
     var tmp_5 = new Float64Array(tmp_4);
     while (tmp_3 < tmp_4) {
       var tmp_6 = tmp_3;
-      var source = path.c2b(tmp_6);
-      tmp_5[tmp_6] = isNaN_0(source) ? path.n23(tmp_6) : source;
+      var source = path.e2b(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.d2b(distanceM, elevationM, options);
+    return this.f2b(distanceM, elevationM, options);
   };
-  protoOf(ElevationGain).e2b = function (path, options) {
-    var result = this.a2b(path, options);
-    path.y24_1 = result.q2a_1;
-    path.z24_1 = result.r2a_1;
+  protoOf(ElevationGain).g2b = function (path, options) {
+    var result = this.c2b(path, options);
+    path.a25_1 = result.s2a_1;
+    path.b25_1 = result.t2a_1;
     return result;
   };
-  protoOf(ElevationGain).d2b = function (distanceM, elevationM, options) {
+  protoOf(ElevationGain).f2b = 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.l2a(options);
-    var profile = ElevationSmoother_instance.i17(distanceM, elevationM, options.p2a_1);
+      return Companion_instance_4.n2a(options);
+    var profile = ElevationSmoother_instance.k17(distanceM, elevationM, options.r2a_1);
     var rawGain = 0.0;
     var rawLoss = 0.0;
     var inductionVariable = 1;
@@ -5021,18 +5022,18 @@
           rawLoss = rawLoss + d;
       }
        while (inductionVariable < last);
-    if (options.o2a_1 <= 0.0) {
-      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.p2a_1, 0);
+    if (options.q2a_1 <= 0.0) {
+      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.r2a_1, 0);
     }
-    var banked = accumulate(this, profile, options.o2a_1);
-    return new ElevationGainResult(banked.x2a_1, banked.y2a_1, rawGain, rawLoss, options.o2a_1, options.p2a_1, banked.z2a_1);
+    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 ElevationGain_instance;
   function ElevationGain_getInstance() {
     return ElevationGain_instance;
   }
   function ElevationGainPreset$Companion$byId$lambda(it) {
-    return it.j2b();
+    return it.l2b();
   }
   var static_init_called_2;
   function static_init_2() {
@@ -5054,7 +5055,7 @@
   var ElevationGainPreset_GPS_instance;
   function Companion_4() {
   }
-  protoOf(Companion_4).o17 = function (name) {
+  protoOf(Companion_4).q17 = function (name) {
     var tmp0 = get_entries_1();
     var tmp$ret$0;
     $l$block: {
@@ -5062,7 +5063,7 @@
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (equals_0(element.j2b(), name, true) || equals_0(element.u1_1, name, true)) {
+        if (equals_0(element.l2b(), name, true) || equals_0(element.u1_1, name, true)) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -5096,10 +5097,10 @@
   var $ENTRIES_1;
   function ElevationGainPreset(name, ordinal, thresholdM, smoothWindowM) {
     Enum.call(this, name, ordinal);
-    this.h2b_1 = thresholdM;
-    this.i2b_1 = smoothWindowM;
+    this.j2b_1 = thresholdM;
+    this.k2b_1 = smoothWindowM;
   }
-  protoOf(ElevationGainPreset).j2b = function () {
+  protoOf(ElevationGainPreset).l2b = function () {
     var tmp;
     switch (this.v1_1) {
       case 0:
@@ -5122,8 +5123,8 @@
   };
   function Companion_5() {
     Companion_instance_6 = this;
-    this.k2b_1 = new ElevationGainOptions();
-    this.l2b_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
+    this.m2b_1 = new ElevationGainOptions();
+    this.n2b_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
   }
   var Companion_instance_6;
   function Companion_getInstance_6() {
@@ -5135,31 +5136,31 @@
     Companion_getInstance_6();
     enabled = enabled === VOID ? true : enabled;
     preset = preset === VOID ? ElevationGainPreset_DEM_getInstance() : preset;
-    thresholdM = thresholdM === VOID ? preset.h2b_1 : thresholdM;
-    smoothWindowM = smoothWindowM === VOID ? preset.i2b_1 : smoothWindowM;
-    this.m2a_1 = enabled;
-    this.n2a_1 = preset;
-    this.o2a_1 = thresholdM;
-    this.p2a_1 = smoothWindowM;
+    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;
     // Inline function 'kotlin.require' call
-    if (!(this.o2a_1 >= 0.0 && isFinite(this.o2a_1))) {
-      var message = 'thresholdM must be finite and >= 0, was ' + this.o2a_1;
+    if (!(this.q2a_1 >= 0.0 && isFinite(this.q2a_1))) {
+      var message = 'thresholdM must be finite and >= 0, was ' + this.q2a_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.p2a_1 >= 0.0 && isFinite(this.p2a_1))) {
-      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.p2a_1;
+    if (!(this.r2a_1 >= 0.0 && isFinite(this.r2a_1))) {
+      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.r2a_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_0));
     }
   }
   protoOf(ElevationGainOptions).toString = function () {
-    return 'ElevationGainOptions(enabled=' + this.m2a_1 + ', preset=' + this.n2a_1.toString() + ', thresholdM=' + this.o2a_1 + ', smoothWindowM=' + this.p2a_1 + ')';
+    return 'ElevationGainOptions(enabled=' + this.o2a_1 + ', preset=' + this.p2a_1.toString() + ', thresholdM=' + this.q2a_1 + ', smoothWindowM=' + this.r2a_1 + ')';
   };
   protoOf(ElevationGainOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.m2a_1);
-    result = imul(result, 31) + this.n2a_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.o2a_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p2a_1) | 0;
+    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;
     return result;
   };
   protoOf(ElevationGainOptions).equals = function (other) {
@@ -5167,13 +5168,13 @@
       return true;
     if (!(other instanceof ElevationGainOptions))
       return false;
-    if (!(this.m2a_1 === other.m2a_1))
+    if (!(this.o2a_1 === other.o2a_1))
       return false;
-    if (!this.n2a_1.equals(other.n2a_1))
+    if (!this.p2a_1.equals(other.p2a_1))
       return false;
-    if (!equals(this.o2a_1, other.o2a_1))
+    if (!equals(this.q2a_1, other.q2a_1))
       return false;
-    if (!equals(this.p2a_1, other.p2a_1))
+    if (!equals(this.r2a_1, other.r2a_1))
       return false;
     return true;
   };
@@ -5194,9 +5195,9 @@
     return ElevationGainPreset_GPS_instance;
   }
   function copyAllSlots($this, source) {
-    var out = new Path(source.j23_1);
+    var out = new Path(source.l23_1);
     var inductionVariable = 0;
-    var last = source.j23_1;
+    var last = source.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
@@ -5204,7 +5205,7 @@
         var _iterator__ex2g4s = get_entries_2().l();
         while (_iterator__ex2g4s.m()) {
           var field = _iterator__ex2g4s.n();
-          out.m2b(i, field, source.l26(i, field));
+          out.o2b(i, field, source.n26(i, field));
         }
       }
        while (inductionVariable < last);
@@ -5212,9 +5213,9 @@
   }
   function $fixElevationCOROUTINE$(_this__u8e3s4, source, provider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.v2b_1 = _this__u8e3s4;
-    this.w2b_1 = source;
-    this.x2b_1 = provider;
+    this.x2b_1 = _this__u8e3s4;
+    this.y2b_1 = source;
+    this.z2b_1 = provider;
   }
   protoOf($fixElevationCOROUTINE$).o7 = function () {
     var suspendResult = this.i7_1;
@@ -5224,21 +5225,21 @@
         switch (tmp) {
           case 0:
             this.h7_1 = 2;
-            if (this.w2b_1.j23_1 === 0)
+            if (this.y2b_1.l23_1 === 0)
               return new Path(0);
-            var size = this.w2b_1.j23_1;
+            var size = this.y2b_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.w2b_1.l23(index) * 57.29577951308232, this.w2b_1.m23(index) * 57.29577951308232));
+                list.k(new LatLon(this.y2b_1.o23(index) * 57.29577951308232, this.y2b_1.p23(index) * 57.29577951308232));
               }
                while (inductionVariable < size);
             var coords = list;
             this.g7_1 = 1;
-            suspendResult = this.x2b_1.c16(coords, VOID, this);
+            suspendResult = this.z2b_1.e16(coords, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5246,17 +5247,17 @@
             continue $sm;
           case 1:
             var corrected = suspendResult;
-            var out = copyAllSlots(this.v2b_1, this.w2b_1);
+            var out = copyAllSlots(this.x2b_1, this.y2b_1);
             var inductionVariable_0 = 0;
-            var last = out.j23_1;
+            var last = out.l23_1;
             if (inductionVariable_0 < last)
               do {
                 var i = inductionVariable_0;
                 inductionVariable_0 = inductionVariable_0 + 1 | 0;
-                out.i24(i, corrected.p(i).c11());
+                out.k24(i, corrected.p(i).e11());
               }
                while (inductionVariable_0 < last);
-            out.c25();
+            out.e25();
             return out;
           case 2:
             throw this.j7_1;
@@ -5273,20 +5274,20 @@
      while (true);
   };
   function ElevationStep() {
-    this.y2b_1 = 150.0;
+    this.a2c_1 = 150.0;
   }
-  protoOf(ElevationStep).z2b = function (source, provider, $completion) {
+  protoOf(ElevationStep).b2c = 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).a2c = function (source, windowM) {
-    if (source.j23_1 === 0)
+  protoOf(ElevationStep).c2c = function (source, windowM) {
+    if (source.l23_1 === 0)
       return new Path(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = source.j23_1;
+    var size = source.l23_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -5294,26 +5295,26 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$4 = source.b2c(index);
+        var tmp$ret$4 = source.d2c(index);
         list.k(tmp$ret$4);
       }
        while (inductionVariable < size);
     var coords = list;
-    var smoothed = ElevationSmoother_instance.t10(coords, windowM);
+    var smoothed = ElevationSmoother_instance.v10(coords, windowM);
     var out = copyAllSlots(this, source);
     var inductionVariable_0 = 0;
-    var last = out.j23_1;
+    var last = out.l23_1;
     if (inductionVariable_0 < last)
       do {
         var i = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        if (isNaN_0(out.c2b(i))) {
-          out.c2c(i, source.n23(i));
+        if (isNaN_0(out.e2b(i))) {
+          out.e2c(i, source.q23(i));
         }
-        out.i24(i, smoothed.p(i).c11());
+        out.k24(i, smoothed.p(i).e11());
       }
        while (inductionVariable_0 < last);
-    out.c25();
+    out.e25();
     return out;
   };
   var ElevationStep_instance;
@@ -5322,21 +5323,21 @@
   }
   function FieldInterpolation() {
     FieldInterpolation_instance = this;
-    this.d2c_1 = 6.283185307179586;
-    this.e2c_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.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()]);
   }
-  protoOf(FieldInterpolation).f2c = function (src, i1, i2, coef, dst, dstIdx) {
+  protoOf(FieldInterpolation).h2c = function (src, i1, i2, coef, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_2().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.m2b(dstIdx, field, this.g2c(field, src.l26(i1, field), src.l26(i2, field), coef));
+      dst.o2b(dstIdx, field, this.i2c(field, src.n26(i1, field), src.n26(i2, field), coef));
     }
   };
-  protoOf(FieldInterpolation).g2c = function (field, v1, v2, coef) {
+  protoOf(FieldInterpolation).i2c = function (field, v1, v2, coef) {
     if (isNaN_0(v1) || isNaN_0(v2))
       return NaN;
     var delta = v2 - v1;
-    if (!this.e2c_1.i1(field) || (delta >= -3.141592653589793 && delta <= 3.141592653589793))
+    if (!this.g2c_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;
@@ -5350,235 +5351,235 @@
     return FieldInterpolation_instance;
   }
   function GeneratedPath(size) {
-    this.j23_1 = size;
+    this.l23_1 = size;
     // Inline function 'kotlin.require' call
-    if (!(this.j23_1 >= 0)) {
-      var message = 'Negative size: ' + this.j23_1;
+    if (!(this.l23_1 >= 0)) {
+      var message = 'Negative size: ' + this.l23_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    this.k23_1 = new Float64Array(imul(this.j23_1, 44));
+    this.m23_1 = new Float64Array(imul(this.l23_1, 44));
     var inductionVariable = 0;
-    var last = this.j23_1;
+    var last = this.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        this.k23_1[imul(i, 44) + 38 | 0] = NaN;
-        this.k23_1[imul(i, 44) + 39 | 0] = NaN;
-        this.k23_1[imul(i, 44) + 40 | 0] = NaN;
-        this.k23_1[imul(i, 44) + 41 | 0] = NaN;
-        this.k23_1[imul(i, 44) + 42 | 0] = NaN;
-        this.k23_1[imul(i, 44) + 43 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 38 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 39 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 40 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 41 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 42 | 0] = NaN;
+        this.m23_1[imul(i, 44) + 43 | 0] = NaN;
       }
        while (inductionVariable < last);
   }
-  protoOf(GeneratedPath).l26 = function (i, field) {
-    return this.k23_1[imul(i, 44) + field.v1_1 | 0];
-  };
-  protoOf(GeneratedPath).m2b = function (i, field, v) {
-    this.k23_1[imul(i, 44) + field.v1_1 | 0] = v;
-  };
-  protoOf(GeneratedPath).l23 = function (i) {
-    return this.k23_1[imul(i, 44) + 0 | 0];
+  protoOf(GeneratedPath).n26 = function (i, field) {
+    return this.m23_1[imul(i, 44) + field.v1_1 | 0];
   };
-  protoOf(GeneratedPath).g24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 0 | 0] = v;
+  protoOf(GeneratedPath).o2b = function (i, field, v) {
+    this.m23_1[imul(i, 44) + field.v1_1 | 0] = v;
   };
-  protoOf(GeneratedPath).m23 = function (i) {
-    return this.k23_1[imul(i, 44) + 1 | 0];
+  protoOf(GeneratedPath).o23 = function (i) {
+    return this.m23_1[imul(i, 44) + 0 | 0];
   };
-  protoOf(GeneratedPath).h24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 1 | 0] = v;
+  protoOf(GeneratedPath).i24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 0 | 0] = v;
   };
-  protoOf(GeneratedPath).b2b = function (i) {
-    return this.k23_1[imul(i, 44) + 2 | 0];
+  protoOf(GeneratedPath).p23 = function (i) {
+    return this.m23_1[imul(i, 44) + 1 | 0];
   };
-  protoOf(GeneratedPath).h2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 2 | 0] = v;
+  protoOf(GeneratedPath).j24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 1 | 0] = v;
   };
-  protoOf(GeneratedPath).i2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 3 | 0] = v;
+  protoOf(GeneratedPath).d2b = function (i) {
+    return this.m23_1[imul(i, 44) + 2 | 0];
   };
-  protoOf(GeneratedPath).o23 = function (i) {
-    return this.k23_1[imul(i, 44) + 4 | 0];
+  protoOf(GeneratedPath).j2c = function (i, v) {
+    this.m23_1[imul(i, 44) + 2 | 0] = v;
   };
-  protoOf(GeneratedPath).j24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 4 | 0] = v;
+  protoOf(GeneratedPath).k2c = function (i, v) {
+    this.m23_1[imul(i, 44) + 3 | 0] = v;
   };
-  protoOf(GeneratedPath).j2c = function (i) {
-    return this.k23_1[imul(i, 44) + 5 | 0];
+  protoOf(GeneratedPath).n23 = function (i) {
+    return this.m23_1[imul(i, 44) + 4 | 0];
   };
-  protoOf(GeneratedPath).k2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 5 | 0] = v;
+  protoOf(GeneratedPath).l24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 4 | 0] = v;
   };
   protoOf(GeneratedPath).l2c = function (i) {
-    return this.k23_1[imul(i, 44) + 6 | 0];
+    return this.m23_1[imul(i, 44) + 5 | 0];
   };
   protoOf(GeneratedPath).m2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 6 | 0] = v;
+    this.m23_1[imul(i, 44) + 5 | 0] = v;
   };
   protoOf(GeneratedPath).n2c = function (i) {
-    return this.k23_1[imul(i, 44) + 7 | 0];
+    return this.m23_1[imul(i, 44) + 6 | 0];
   };
   protoOf(GeneratedPath).o2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 7 | 0] = v;
-  };
-  protoOf(GeneratedPath).n23 = function (i) {
-    return this.k23_1[imul(i, 44) + 8 | 0];
-  };
-  protoOf(GeneratedPath).i24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 8 | 0] = v;
+    this.m23_1[imul(i, 44) + 6 | 0] = v;
   };
   protoOf(GeneratedPath).p2c = function (i) {
-    return this.k23_1[imul(i, 44) + 9 | 0];
+    return this.m23_1[imul(i, 44) + 7 | 0];
   };
   protoOf(GeneratedPath).q2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 9 | 0] = v;
+    this.m23_1[imul(i, 44) + 7 | 0] = v;
+  };
+  protoOf(GeneratedPath).q23 = function (i) {
+    return this.m23_1[imul(i, 44) + 8 | 0];
+  };
+  protoOf(GeneratedPath).k24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 8 | 0] = v;
   };
   protoOf(GeneratedPath).r2c = function (i) {
-    return this.k23_1[imul(i, 44) + 10 | 0];
+    return this.m23_1[imul(i, 44) + 9 | 0];
   };
   protoOf(GeneratedPath).s2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 10 | 0] = v;
+    this.m23_1[imul(i, 44) + 9 | 0] = v;
   };
-  protoOf(GeneratedPath).t2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 11 | 0] = v;
+  protoOf(GeneratedPath).t2c = function (i) {
+    return this.m23_1[imul(i, 44) + 10 | 0];
   };
   protoOf(GeneratedPath).u2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 12 | 0] = v;
+    this.m23_1[imul(i, 44) + 10 | 0] = v;
   };
-  protoOf(GeneratedPath).v2c = function (i) {
-    return this.k23_1[imul(i, 44) + 13 | 0];
+  protoOf(GeneratedPath).v2c = function (i, v) {
+    this.m23_1[imul(i, 44) + 11 | 0] = v;
   };
   protoOf(GeneratedPath).w2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 13 | 0] = v;
+    this.m23_1[imul(i, 44) + 12 | 0] = v;
   };
-  protoOf(GeneratedPath).x2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 14 | 0] = v;
+  protoOf(GeneratedPath).x2c = function (i) {
+    return this.m23_1[imul(i, 44) + 13 | 0];
   };
   protoOf(GeneratedPath).y2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 15 | 0] = v;
+    this.m23_1[imul(i, 44) + 13 | 0] = v;
   };
   protoOf(GeneratedPath).z2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 16 | 0] = v;
+    this.m23_1[imul(i, 44) + 14 | 0] = v;
   };
   protoOf(GeneratedPath).a2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 17 | 0] = v;
-  };
-  protoOf(GeneratedPath).s23 = function (i) {
-    return this.k23_1[imul(i, 44) + 18 | 0];
-  };
-  protoOf(GeneratedPath).k24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 18 | 0] = v;
+    this.m23_1[imul(i, 44) + 15 | 0] = v;
   };
   protoOf(GeneratedPath).b2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 19 | 0] = v;
+    this.m23_1[imul(i, 44) + 16 | 0] = v;
   };
   protoOf(GeneratedPath).c2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 20 | 0] = v;
+    this.m23_1[imul(i, 44) + 17 | 0] = v;
+  };
+  protoOf(GeneratedPath).u23 = function (i) {
+    return this.m23_1[imul(i, 44) + 18 | 0];
+  };
+  protoOf(GeneratedPath).m24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 18 | 0] = v;
   };
   protoOf(GeneratedPath).d2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 21 | 0] = v;
+    this.m23_1[imul(i, 44) + 19 | 0] = v;
   };
   protoOf(GeneratedPath).e2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 22 | 0] = v;
+    this.m23_1[imul(i, 44) + 20 | 0] = v;
   };
   protoOf(GeneratedPath).f2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 23 | 0] = v;
+    this.m23_1[imul(i, 44) + 21 | 0] = v;
   };
   protoOf(GeneratedPath).g2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 24 | 0] = v;
+    this.m23_1[imul(i, 44) + 22 | 0] = v;
   };
   protoOf(GeneratedPath).h2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 25 | 0] = v;
-  };
-  protoOf(GeneratedPath).t23 = function (i) {
-    return this.k23_1[imul(i, 44) + 26 | 0];
+    this.m23_1[imul(i, 44) + 23 | 0] = v;
   };
   protoOf(GeneratedPath).i2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 26 | 0] = v;
+    this.m23_1[imul(i, 44) + 24 | 0] = v;
   };
-  protoOf(GeneratedPath).j2d = function (i) {
-    return this.k23_1[imul(i, 44) + 27 | 0];
+  protoOf(GeneratedPath).j2d = 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) {
-    this.k23_1[imul(i, 44) + 27 | 0] = v;
+    this.m23_1[imul(i, 44) + 26 | 0] = v;
   };
   protoOf(GeneratedPath).l2d = function (i) {
-    return this.k23_1[imul(i, 44) + 28 | 0];
+    return this.m23_1[imul(i, 44) + 27 | 0];
   };
   protoOf(GeneratedPath).m2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 28 | 0] = v;
+    this.m23_1[imul(i, 44) + 27 | 0] = v;
   };
-  protoOf(GeneratedPath).n2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 29 | 0] = v;
+  protoOf(GeneratedPath).n2d = function (i) {
+    return this.m23_1[imul(i, 44) + 28 | 0];
   };
   protoOf(GeneratedPath).o2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 30 | 0] = v;
+    this.m23_1[imul(i, 44) + 28 | 0] = v;
   };
-  protoOf(GeneratedPath).r23 = function (i) {
-    return this.k23_1[imul(i, 44) + 31 | 0];
+  protoOf(GeneratedPath).p2d = function (i, v) {
+    this.m23_1[imul(i, 44) + 29 | 0] = v;
   };
-  protoOf(GeneratedPath).n24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 31 | 0] = v;
+  protoOf(GeneratedPath).q2d = function (i, v) {
+    this.m23_1[imul(i, 44) + 30 | 0] = v;
   };
-  protoOf(GeneratedPath).p2d = function (i) {
-    return this.k23_1[imul(i, 44) + 32 | 0];
+  protoOf(GeneratedPath).t23 = function (i) {
+    return this.m23_1[imul(i, 44) + 31 | 0];
   };
-  protoOf(GeneratedPath).q2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 32 | 0] = v;
+  protoOf(GeneratedPath).p24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 31 | 0] = v;
   };
-  protoOf(GeneratedPath).r2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 33 | 0] = v;
+  protoOf(GeneratedPath).r2d = function (i) {
+    return this.m23_1[imul(i, 44) + 32 | 0];
   };
-  protoOf(GeneratedPath).p23 = function (i) {
-    return this.k23_1[imul(i, 44) + 34 | 0];
+  protoOf(GeneratedPath).s2d = function (i, v) {
+    this.m23_1[imul(i, 44) + 32 | 0] = v;
   };
-  protoOf(GeneratedPath).l24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 34 | 0] = v;
+  protoOf(GeneratedPath).t2d = function (i, v) {
+    this.m23_1[imul(i, 44) + 33 | 0] = v;
   };
-  protoOf(GeneratedPath).q23 = function (i) {
-    return this.k23_1[imul(i, 44) + 35 | 0];
+  protoOf(GeneratedPath).r23 = function (i) {
+    return this.m23_1[imul(i, 44) + 34 | 0];
   };
-  protoOf(GeneratedPath).m24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 35 | 0] = v;
+  protoOf(GeneratedPath).n24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 34 | 0] = v;
   };
-  protoOf(GeneratedPath).s2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 36 | 0] = v;
+  protoOf(GeneratedPath).s23 = function (i) {
+    return this.m23_1[imul(i, 44) + 35 | 0];
   };
-  protoOf(GeneratedPath).t2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 37 | 0] = v;
+  protoOf(GeneratedPath).o24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 35 | 0] = v;
   };
-  protoOf(GeneratedPath).u2d = function (i) {
-    return this.k23_1[imul(i, 44) + 38 | 0];
+  protoOf(GeneratedPath).u2d = function (i, v) {
+    this.m23_1[imul(i, 44) + 36 | 0] = v;
   };
   protoOf(GeneratedPath).v2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 38 | 0] = v;
+    this.m23_1[imul(i, 44) + 37 | 0] = v;
   };
   protoOf(GeneratedPath).w2d = function (i) {
-    return this.k23_1[imul(i, 44) + 39 | 0];
-  };
-  protoOf(GeneratedPath).q24 = function (i, v) {
-    this.k23_1[imul(i, 44) + 39 | 0] = v;
+    return this.m23_1[imul(i, 44) + 38 | 0];
   };
   protoOf(GeneratedPath).x2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 40 | 0] = v;
+    this.m23_1[imul(i, 44) + 38 | 0] = v;
+  };
+  protoOf(GeneratedPath).y2d = function (i) {
+    return this.m23_1[imul(i, 44) + 39 | 0];
   };
-  protoOf(GeneratedPath).y2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 41 | 0] = v;
+  protoOf(GeneratedPath).s24 = function (i, v) {
+    this.m23_1[imul(i, 44) + 39 | 0] = v;
   };
   protoOf(GeneratedPath).z2d = function (i, v) {
-    this.k23_1[imul(i, 44) + 42 | 0] = v;
+    this.m23_1[imul(i, 44) + 40 | 0] = v;
   };
-  protoOf(GeneratedPath).c2b = function (i) {
-    return this.k23_1[imul(i, 44) + 43 | 0];
+  protoOf(GeneratedPath).a2e = function (i, v) {
+    this.m23_1[imul(i, 44) + 41 | 0] = v;
   };
-  protoOf(GeneratedPath).c2c = function (i, v) {
-    this.k23_1[imul(i, 44) + 43 | 0] = v;
+  protoOf(GeneratedPath).b2e = function (i, v) {
+    this.m23_1[imul(i, 44) + 42 | 0] = v;
+  };
+  protoOf(GeneratedPath).e2b = function (i) {
+    return this.m23_1[imul(i, 44) + 43 | 0];
+  };
+  protoOf(GeneratedPath).e2c = function (i, v) {
+    this.m23_1[imul(i, 44) + 43 | 0] = v;
   };
   function Companion_6() {
     Companion_instance_7 = this;
-    this.a2e_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
+    this.c2e_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
   }
   var Companion_instance_7;
   function Companion_getInstance_7() {
@@ -5588,19 +5589,19 @@
   }
   function BoundsRad(minLat, maxLat, minLon, maxLon) {
     Companion_getInstance_7();
-    this.b2e_1 = minLat;
-    this.c2e_1 = maxLat;
-    this.d2e_1 = minLon;
-    this.e2e_1 = maxLon;
+    this.d2e_1 = minLat;
+    this.e2e_1 = maxLat;
+    this.f2e_1 = minLon;
+    this.g2e_1 = maxLon;
   }
   protoOf(BoundsRad).toString = function () {
-    return 'BoundsRad(minLat=' + this.b2e_1 + ', maxLat=' + this.c2e_1 + ', minLon=' + this.d2e_1 + ', maxLon=' + this.e2e_1 + ')';
+    return 'BoundsRad(minLat=' + this.d2e_1 + ', maxLat=' + this.e2e_1 + ', minLon=' + this.f2e_1 + ', maxLon=' + this.g2e_1 + ')';
   };
   protoOf(BoundsRad).hashCode = function () {
-    var result = getNumberHashCode(this.b2e_1);
-    result = imul(result, 31) + getNumberHashCode(this.c2e_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d2e_1) | 0;
+    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;
     return result;
   };
   protoOf(BoundsRad).equals = function (other) {
@@ -5608,19 +5609,17 @@
       return true;
     if (!(other instanceof BoundsRad))
       return false;
-    if (!equals(this.b2e_1, other.b2e_1))
-      return false;
-    if (!equals(this.c2e_1, other.c2e_1))
-      return false;
     if (!equals(this.d2e_1, other.d2e_1))
       return false;
     if (!equals(this.e2e_1, other.e2e_1))
       return false;
+    if (!equals(this.f2e_1, other.f2e_1))
+      return false;
+    if (!equals(this.g2e_1, other.g2e_1))
+      return false;
     return true;
   };
   function copyStatsFrom($this, other) {
-    $this.t24_1 = other.t24_1;
-    $this.u24_1 = other.u24_1;
     $this.v24_1 = other.v24_1;
     $this.w24_1 = other.w24_1;
     $this.x24_1 = other.x24_1;
@@ -5628,22 +5627,24 @@
     $this.z24_1 = other.z24_1;
     $this.a25_1 = other.a25_1;
     $this.b25_1 = other.b25_1;
+    $this.c25_1 = other.c25_1;
+    $this.d25_1 = other.d25_1;
   }
   function resetStats($this) {
-    $this.t24_1 = 0.0;
-    $this.u24_1 = 0.0;
     $this.v24_1 = 0.0;
     $this.w24_1 = 0.0;
     $this.x24_1 = 0.0;
-    $this.y24_1 = NaN;
-    $this.z24_1 = NaN;
-    $this.a25_1 = 0.0;
-    $this.b25_1 = Companion_getInstance_7().a2e_1;
+    $this.y24_1 = 0.0;
+    $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;
   }
   function computeBearing($this, from, to) {
-    var lat1 = $this.l23(from);
-    var lat2 = $this.l23(to);
-    var dLon = $this.m23(to) - $this.m23(from);
+    var lat1 = $this.o23(from);
+    var lat2 = $this.o23(to);
+    var dLon = $this.p23(to) - $this.p23(from);
     if (dLon > 3.141592653589793) {
       dLon = dLon - 2 * 3.141592653589793;
     } else if (dLon <= -3.141592653589793) {
@@ -5666,40 +5667,40 @@
   }
   function Path(size) {
     GeneratedPath.call(this, size);
-    this.t24_1 = 0.0;
-    this.u24_1 = 0.0;
     this.v24_1 = 0.0;
     this.w24_1 = 0.0;
     this.x24_1 = 0.0;
-    this.y24_1 = NaN;
-    this.z24_1 = NaN;
-    this.a25_1 = 0.0;
-    this.b25_1 = Companion_getInstance_7().a2e_1;
+    this.y24_1 = 0.0;
+    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;
   }
-  protoOf(Path).f2e = function () {
-    return isNaN_0(this.y24_1) ? this.w24_1 : this.y24_1;
+  protoOf(Path).h2e = function () {
+    return isNaN_0(this.a25_1) ? this.y24_1 : this.a25_1;
   };
-  protoOf(Path).g2e = function () {
-    return isNaN_0(this.z24_1) ? this.x24_1 : this.z24_1;
+  protoOf(Path).i2e = function () {
+    return isNaN_0(this.b25_1) ? this.z24_1 : this.b25_1;
   };
-  protoOf(Path).h2e = function () {
-    return until(0, this.j23_1);
+  protoOf(Path).j2e = function () {
+    return until(0, this.l23_1);
   };
-  protoOf(Path).i2e = function (i) {
-    return this.l23(i) * 57.29577951308232;
+  protoOf(Path).k2e = function (i) {
+    return this.o23(i) * 57.29577951308232;
   };
-  protoOf(Path).j2e = function (i) {
-    return this.m23(i) * 57.29577951308232;
+  protoOf(Path).l2e = function (i) {
+    return this.p23(i) * 57.29577951308232;
   };
-  protoOf(Path).b2c = function (i) {
-    return new LatLonElevation(this.i2e(i), this.j2e(i), this.n23(i));
+  protoOf(Path).d2c = function (i) {
+    return new LatLonElevation(this.k2e(i), this.l2e(i), this.q23(i));
   };
-  protoOf(Path).k2e = function () {
-    var out = new Path(this.j23_1);
-    var tmp0 = this.k23_1;
-    var tmp2 = out.k23_1;
+  protoOf(Path).m2e = function () {
+    var out = new Path(this.l23_1);
+    var tmp0 = this.m23_1;
+    var tmp2 = out.m23_1;
     // Inline function 'kotlin.collections.copyInto' call
-    var endIndex = this.k23_1.length;
+    var endIndex = this.m23_1.length;
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
     var tmp = tmp0;
@@ -5709,11 +5710,11 @@
     copyStatsFrom(out, this);
     return out;
   };
-  protoOf(Path).c25 = function () {
+  protoOf(Path).e25 = function () {
     resetStats(this);
-    if (this.j23_1 === 0)
+    if (this.l23_1 === 0)
       return Unit_instance;
-    var timeStart = this.o23(0);
+    var timeStart = this.n23(0);
     var cumDist = 0.0;
     var minLat = Infinity;
     var maxLat = -Infinity;
@@ -5724,14 +5725,14 @@
     var gain = 0.0;
     var loss = 0.0;
     var inductionVariable = 0;
-    var last = this.j23_1;
+    var last = this.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var lat = this.l23(i);
-        var lon = this.m23(i);
-        var ele = this.n23(i);
+        var lat = this.o23(i);
+        var lon = this.p23(i);
+        var ele = this.q23(i);
         // Inline function 'kotlin.math.min' call
         var a = minLat;
         minLat = Math.min(a, lat);
@@ -5751,71 +5752,71 @@
         var a_4 = maxEle;
         maxEle = Math.max(a_4, ele);
         if (i > 0) {
-          var prevCoord = new LatLon(this.i2e(i - 1 | 0), this.j2e(i - 1 | 0));
-          var curCoord = new LatLon(this.i2e(i), this.j2e(i));
-          cumDist = cumDist + Distance_instance.x10(prevCoord, curCoord);
-          var dEle = ele - this.n23(i - 1 | 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));
+          cumDist = cumDist + Distance_instance.z10(prevCoord, curCoord);
+          var dEle = ele - this.q23(i - 1 | 0);
           if (dEle > 0)
             gain = gain + dEle;
           else
             loss = loss + dEle;
         }
-        this.h2c(i, cumDist);
+        this.j2c(i, cumDist);
       }
        while (inductionVariable < last);
-    this.t24_1 = cumDist;
-    this.u24_1 = minEle === Infinity ? 0.0 : minEle;
-    this.v24_1 = maxEle === -Infinity ? 0.0 : maxEle;
-    this.w24_1 = gain;
-    this.x24_1 = loss;
-    this.b25_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
-    this.a25_1 = this.j23_1 >= 2 ? this.o23(this.j23_1 - 1 | 0) - timeStart : 0.0;
+    this.v24_1 = cumDist;
+    this.w24_1 = minEle === Infinity ? 0.0 : minEle;
+    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;
     var inductionVariable_0 = 0;
-    var last_0 = this.j23_1;
+    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.k2c(i_0, (this.o23(i_0) - timeStart) / 1000.0);
-        if (this.j23_1 <= 1)
+        this.m2c(i_0, (this.n23(i_0) - timeStart) / 1000.0);
+        if (this.l23_1 <= 1)
           continue $l$loop;
         // Inline function 'kotlin.math.max' call
         var b = i_0 - 1 | 0;
         var im1 = Math.max(0, b);
-        var tmp0 = this.j23_1 - 1 | 0;
+        var tmp0 = this.l23_1 - 1 | 0;
         // Inline function 'kotlin.math.min' call
         var b_0 = i_0 + 1 | 0;
         var ip1 = Math.min(tmp0, b_0);
-        this.o2c(i_0, computeBearing(this, im1, ip1));
-        var dDist = (this.b2b(ip1) - this.b2b(im1)) / 2.0;
-        var dEle_0 = (this.n23(ip1) - this.n23(im1)) / 2.0;
+        this.q2c(i_0, computeBearing(this, im1, ip1));
+        var dDist = (this.d2b(ip1) - this.d2b(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.q2c(i_0, grade);
-        var dTime = (this.o23(ip1) - this.o23(im1)) / 2000.0;
-        this.i2c(i_0, dDist);
-        this.m2c(i_0, dTime);
-        this.k2d(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
+        this.s2c(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);
       }
        while (inductionVariable_0 < last_0);
   };
   function PathSimplifier() {
   }
-  protoOf(PathSimplifier).l2e = function (path, toleranceM, zExaggeration) {
-    if (path.j23_1 <= 2)
-      return path.k2e();
-    var coords = ArrayList_init_$Create$_0(path.j23_1);
+  protoOf(PathSimplifier).n2e = function (path, toleranceM, zExaggeration) {
+    if (path.l23_1 <= 2)
+      return path.m2e();
+    var coords = ArrayList_init_$Create$_0(path.l23_1);
     var inductionVariable = 0;
-    var last = path.j23_1;
+    var last = path.l23_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.collections.plusAssign' call
-        var element = new LatLonElevation(path.l23(i) * 57.29577951308232, path.m23(i) * 57.29577951308232, path.n23(i));
+        var element = new LatLonElevation(path.o23(i) * 57.29577951308232, path.p23(i) * 57.29577951308232, path.q23(i));
         coords.k(element);
       }
        while (inductionVariable < last);
-    var simplified = DouglasPeucker_instance.u10(coords, toleranceM, zExaggeration);
+    var simplified = DouglasPeucker_instance.w10(coords, toleranceM, zExaggeration);
     var retainedIndices = ArrayList_init_$Create$_0(simplified.o());
     var cursor = 0;
     var _iterator__ex2g4s = simplified.l();
@@ -5844,12 +5845,12 @@
       var _iterator__ex2g4s_0 = get_entries_2().l();
       while (_iterator__ex2g4s_0.m()) {
         var field = _iterator__ex2g4s_0.n();
-        out.m2b(dstIdx, field, path.l26(srcIdx, field));
+        out.o2b(dstIdx, field, path.n26(srcIdx, field));
       }
     }
-    out.c25();
-    out.y24_1 = path.y24_1;
-    out.z24_1 = path.z24_1;
+    out.e25();
+    out.a25_1 = path.a25_1;
+    out.b25_1 = path.b25_1;
     return out;
   };
   var PathSimplifier_instance;
@@ -5956,7 +5957,7 @@
   var PointField_SOURCE_ELEVATION_instance;
   function Companion_8() {
     Companion_instance_9 = this;
-    this.m2e_1 = 44;
+    this.o2e_1 = 44;
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
     var this_0 = get_entries_2();
@@ -5966,13 +5967,13 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
-      var tmp$ret$2 = element.d26_1;
+      var tmp$ret$2 = element.f26_1;
       destination.s3(tmp$ret$2, element);
     }
-    tmp.n2e_1 = destination;
+    tmp.p2e_1 = destination;
   }
-  protoOf(Companion_8).o2e = function (prop) {
-    return this.n2e_1.q1(prop);
+  protoOf(Companion_8).q2e = function (prop) {
+    return this.p2e_1.q1(prop);
   };
   var Companion_instance_9;
   function Companion_getInstance_9() {
@@ -5995,13 +5996,13 @@
     anglesInRadians = anglesInRadians === VOID ? false : anglesInRadians;
     nanDefault = nanDefault === VOID ? false : nanDefault;
     Enum.call(this, name, ordinal);
-    this.d26_1 = prop;
-    this.e26_1 = unit;
-    this.f26_1 = shortDescription;
-    this.g26_1 = category;
-    this.h26_1 = notSelectable;
-    this.i26_1 = anglesInRadians;
-    this.j26_1 = nanDefault;
+    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;
   }
   function PointField_LATITUDE_getInstance() {
     static_init_3();
@@ -6217,8 +6218,8 @@
   var PointFieldCategory_ROAD_instance;
   function PointFieldCategory(name, ordinal, id, displayName) {
     Enum.call(this, name, ordinal);
-    this.r2e_1 = id;
-    this.s2e_1 = displayName;
+    this.t2e_1 = id;
+    this.u2e_1 = displayName;
   }
   function PointFieldCategory_COORDINATES_getInstance() {
     static_init_4();
@@ -6281,35 +6282,35 @@
     return PointFieldCategory_ROAD_instance;
   }
   function Copy(sourceIndex) {
-    this.t2e_1 = sourceIndex;
+    this.v2e_1 = sourceIndex;
   }
   protoOf(Copy).toString = function () {
-    return 'Copy(sourceIndex=' + this.t2e_1 + ')';
+    return 'Copy(sourceIndex=' + this.v2e_1 + ')';
   };
   protoOf(Copy).hashCode = function () {
-    return this.t2e_1;
+    return this.v2e_1;
   };
   protoOf(Copy).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy))
       return false;
-    if (!(this.t2e_1 === other.t2e_1))
+    if (!(this.v2e_1 === other.v2e_1))
       return false;
     return true;
   };
   function Interpolate(from, to, coef) {
-    this.u2e_1 = from;
-    this.v2e_1 = to;
-    this.w2e_1 = coef;
+    this.w2e_1 = from;
+    this.x2e_1 = to;
+    this.y2e_1 = coef;
   }
   protoOf(Interpolate).toString = function () {
-    return 'Interpolate(from=' + this.u2e_1 + ', to=' + this.v2e_1 + ', coef=' + this.w2e_1 + ')';
+    return 'Interpolate(from=' + this.w2e_1 + ', to=' + this.x2e_1 + ', coef=' + this.y2e_1 + ')';
   };
   protoOf(Interpolate).hashCode = function () {
-    var result = this.u2e_1;
-    result = imul(result, 31) + this.v2e_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w2e_1) | 0;
+    var result = this.w2e_1;
+    result = imul(result, 31) + this.x2e_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.y2e_1) | 0;
     return result;
   };
   protoOf(Interpolate).equals = function (other) {
@@ -6317,28 +6318,28 @@
       return true;
     if (!(other instanceof Interpolate))
       return false;
-    if (!(this.u2e_1 === other.u2e_1))
+    if (!(this.w2e_1 === other.w2e_1))
       return false;
-    if (!(this.v2e_1 === other.v2e_1))
+    if (!(this.x2e_1 === other.x2e_1))
       return false;
-    if (!equals(this.w2e_1, other.w2e_1))
+    if (!equals(this.y2e_1, other.y2e_1))
       return false;
     return true;
   };
   function buildPlan($this, source, minDistanceM, maxDistanceM) {
-    var n = source.j23_1;
+    var n = source.l23_1;
     var plan = ArrayList_init_$Create$_0(n);
     // Inline function 'kotlin.collections.plusAssign' call
     var element = new Copy(0);
     plan.k(element);
-    var lastAddedDistance = source.b2b(0);
+    var lastAddedDistance = source.d2b(0);
     var lastAddedIndex = 0;
     var inductionVariable = 1;
     if (inductionVariable < n)
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var curDist = source.b2b(i);
+        var curDist = source.d2b(i);
         var gap = curDist - lastAddedDistance;
         if (gap < minDistanceM)
           continue $l$loop;
@@ -6361,11 +6362,11 @@
               var j = inductionVariable_0;
               inductionVariable_0 = inductionVariable_0 + 1 | 0;
               var targetDistance = lastAddedDistance + j * spacing;
-              while (index1 < (i - 1 | 0) && source.b2b(index1 + 1 | 0) < targetDistance) {
+              while (index1 < (i - 1 | 0) && source.d2b(index1 + 1 | 0) < targetDistance) {
                 index1 = index1 + 1 | 0;
               }
-              var dist1 = source.b2b(index1);
-              var dist2 = source.b2b(index1 + 1 | 0);
+              var dist1 = source.d2b(index1);
+              var dist2 = source.d2b(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);
@@ -6391,42 +6392,42 @@
       index = index + 1 | 0;
       var op = iterator.n();
       if (op instanceof Copy) {
-        copyFields($this, source, op.t2e_1, out, dstIdx);
+        copyFields($this, source, op.v2e_1, out, dstIdx);
       } else {
         if (op instanceof Interpolate) {
-          FieldInterpolation_getInstance().f2c(source, op.u2e_1, op.v2e_1, op.w2e_1, out, dstIdx);
+          FieldInterpolation_getInstance().h2c(source, op.w2e_1, op.x2e_1, op.y2e_1, out, dstIdx);
         } else {
           noWhenBranchMatchedException();
         }
       }
     }
-    out.c25();
+    out.e25();
     return out;
   }
   function copyFields($this, src, srcIdx, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_2().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.m2b(dstIdx, field, src.l26(srcIdx, field));
+      dst.o2b(dstIdx, field, src.n26(srcIdx, field));
     }
   }
   function PointPerDistance() {
   }
-  protoOf(PointPerDistance).x2e = function (source, minDistanceM, maxDistanceM) {
-    return this.y2e(source, minDistanceM, maxDistanceM);
+  protoOf(PointPerDistance).z2e = function (source, minDistanceM, maxDistanceM) {
+    return this.a2f(source, minDistanceM, maxDistanceM);
   };
-  protoOf(PointPerDistance).y2e = function (source, minDistanceM, maxDistanceM) {
+  protoOf(PointPerDistance).a2f = function (source, minDistanceM, maxDistanceM) {
     // Inline function 'kotlin.require' call
     if (!(maxDistanceM > 0.0)) {
       var message = 'maxDistanceM must be > 0, got ' + maxDistanceM;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    if (source.j23_1 === 0)
+    if (source.l23_1 === 0)
       return new Path(0);
-    if (source.j23_1 === 1) {
+    if (source.l23_1 === 1) {
       var out = new Path(1);
       copyFields(this, source, 0, out, 0);
-      out.c25();
+      out.e25();
       return out;
     }
     var plan = buildPlan(this, source, minDistanceM, maxDistanceM);
@@ -6437,35 +6438,35 @@
     return PointPerDistance_instance;
   }
   function Copy_0(sourceIndex) {
-    this.z2e_1 = sourceIndex;
+    this.b2f_1 = sourceIndex;
   }
   protoOf(Copy_0).toString = function () {
-    return 'Copy(sourceIndex=' + this.z2e_1 + ')';
+    return 'Copy(sourceIndex=' + this.b2f_1 + ')';
   };
   protoOf(Copy_0).hashCode = function () {
-    return this.z2e_1;
+    return this.b2f_1;
   };
   protoOf(Copy_0).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy_0))
       return false;
-    if (!(this.z2e_1 === other.z2e_1))
+    if (!(this.b2f_1 === other.b2f_1))
       return false;
     return true;
   };
   function Interpolate_0(from, to, coef) {
-    this.a2f_1 = from;
-    this.b2f_1 = to;
-    this.c2f_1 = coef;
+    this.c2f_1 = from;
+    this.d2f_1 = to;
+    this.e2f_1 = coef;
   }
   protoOf(Interpolate_0).toString = function () {
-    return 'Interpolate(from=' + this.a2f_1 + ', to=' + this.b2f_1 + ', coef=' + this.c2f_1 + ')';
+    return 'Interpolate(from=' + this.c2f_1 + ', to=' + this.d2f_1 + ', coef=' + this.e2f_1 + ')';
   };
   protoOf(Interpolate_0).hashCode = function () {
-    var result = this.a2f_1;
-    result = imul(result, 31) + this.b2f_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.c2f_1) | 0;
+    var result = this.c2f_1;
+    result = imul(result, 31) + this.d2f_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.e2f_1) | 0;
     return result;
   };
   protoOf(Interpolate_0).equals = function (other) {
@@ -6473,23 +6474,23 @@
       return true;
     if (!(other instanceof Interpolate_0))
       return false;
-    if (!(this.a2f_1 === other.a2f_1))
+    if (!(this.c2f_1 === other.c2f_1))
       return false;
-    if (!(this.b2f_1 === other.b2f_1))
+    if (!(this.d2f_1 === other.d2f_1))
       return false;
-    if (!equals(this.c2f_1, other.c2f_1))
+    if (!equals(this.e2f_1, other.e2f_1))
       return false;
     return true;
   };
   function buildPlan_0($this, source) {
     var plan = LinkedHashMap_init_$Create$_0();
-    var n = source.j23_1;
+    var n = source.l23_1;
     var inductionVariable = 0;
     if (inductionVariable < n)
       $l$loop_0: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var time1 = source.o23(i);
+        var time1 = source.n23(i);
         // Inline function 'kotlin.math.floor' call
         var x = time1 / 1000.0;
         var tmp$ret$0 = Math.floor(x);
@@ -6510,7 +6511,7 @@
           }
           continue $l$loop_0;
         }
-        var time2 = source.o23(i + 1 | 0);
+        var time2 = source.n23(i + 1 | 0);
         // Inline function 'kotlin.math.floor' call
         var x_0 = time2 / 1000.0;
         var tmp$ret$4 = Math.floor(x_0);
@@ -6555,30 +6556,30 @@
       }
       var data = tmp;
       if (data instanceof Copy_0) {
-        copyFields_0($this, source, data.z2e_1, out, idx);
+        copyFields_0($this, source, data.b2f_1, out, idx);
       } else {
         if (data instanceof Interpolate_0) {
-          FieldInterpolation_getInstance().f2c(source, data.a2f_1, data.b2f_1, data.c2f_1, out, idx);
+          FieldInterpolation_getInstance().h2c(source, data.c2f_1, data.d2f_1, data.e2f_1, out, idx);
         } else {
           noWhenBranchMatchedException();
         }
       }
-      out.j24(idx, toNumber(multiply(epoch, new Long(1000, 0))));
+      out.l24(idx, toNumber(multiply(epoch, new Long(1000, 0))));
     }
-    out.c25();
+    out.e25();
     return out;
   }
   function copyFields_0($this, src, srcIdx, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_2().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.m2b(dstIdx, field, src.l26(srcIdx, field));
+      dst.o2b(dstIdx, field, src.n26(srcIdx, field));
     }
   }
   function PointPerSecond() {
   }
-  protoOf(PointPerSecond).d2f = function (source) {
-    if (source.j23_1 === 0)
+  protoOf(PointPerSecond).f2f = function (source) {
+    if (source.l23_1 === 0)
       return new Path(0);
     var plan = buildPlan_0(this, source);
     return materialize_0(this, source, plan);
@@ -6588,33 +6589,33 @@
     return PointPerSecond_instance;
   }
   function TunnelSpan(first, last, chordGrade, heightM, riseGrade, fallGrade, straightness, stepM) {
-    this.e2f_1 = first;
-    this.f2f_1 = last;
-    this.g2f_1 = chordGrade;
-    this.h2f_1 = heightM;
-    this.i2f_1 = riseGrade;
-    this.j2f_1 = fallGrade;
-    this.k2f_1 = straightness;
-    this.l2f_1 = 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;
   }
-  protoOf(TunnelSpan).m2f = function () {
-    return this.e2f_1 * this.l2f_1;
+  protoOf(TunnelSpan).o2f = function () {
+    return this.g2f_1 * this.n2f_1;
   };
-  protoOf(TunnelSpan).n2f = function () {
-    return this.f2f_1 * this.l2f_1;
+  protoOf(TunnelSpan).p2f = function () {
+    return this.h2f_1 * this.n2f_1;
   };
   protoOf(TunnelSpan).toString = function () {
-    return 'TunnelSpan(first=' + this.e2f_1 + ', last=' + this.f2f_1 + ', chordGrade=' + this.g2f_1 + ', heightM=' + this.h2f_1 + ', riseGrade=' + this.i2f_1 + ', fallGrade=' + this.j2f_1 + ', straightness=' + this.k2f_1 + ', stepM=' + this.l2f_1 + ')';
+    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 + ')';
   };
   protoOf(TunnelSpan).hashCode = function () {
-    var result = this.e2f_1;
-    result = imul(result, 31) + this.f2f_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h2f_1) | 0;
+    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;
     return result;
   };
   protoOf(TunnelSpan).equals = function (other) {
@@ -6622,13 +6623,9 @@
       return true;
     if (!(other instanceof TunnelSpan))
       return false;
-    if (!(this.e2f_1 === other.e2f_1))
+    if (!(this.g2f_1 === other.g2f_1))
       return false;
-    if (!(this.f2f_1 === other.f2f_1))
-      return false;
-    if (!equals(this.g2f_1, other.g2f_1))
-      return false;
-    if (!equals(this.h2f_1, other.h2f_1))
+    if (!(this.h2f_1 === other.h2f_1))
       return false;
     if (!equals(this.i2f_1, other.i2f_1))
       return false;
@@ -6638,30 +6635,34 @@
       return false;
     if (!equals(this.l2f_1, other.l2f_1))
       return false;
+    if (!equals(this.m2f_1, other.m2f_1))
+      return false;
+    if (!equals(this.n2f_1, other.n2f_1))
+      return false;
     return true;
   };
   function Stations(options) {
-    this.o2f_1 = options.h2g();
-    this.p2f_1 = options.i2g();
     this.q2f_1 = options.j2g();
     this.r2f_1 = options.k2g();
+    this.s2f_1 = options.l2g();
+    this.t2f_1 = options.m2g();
   }
   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.p2f_1;
-    var z = profile.l2g_1;
+    var w = stations.r2f_1;
+    var z = profile.n2g_1;
     var n = z.length;
-    var step = options.s2f_1;
+    var step = options.u2f_1;
     var length = (b - a | 0) * step;
-    if (length < options.e2g_1 - 1.0E-9)
+    if (length < options.g2g_1 - 1.0E-9)
       return null;
-    var chord = Distance_instance.x10(new LatLon(profile.m2g_1[a], profile.n2g_1[a]), new LatLon(profile.m2g_1[b], profile.n2g_1[b]));
+    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 straightness = chord / length;
-    if (!(straightness >= options.g2g_1))
+    if (!(straightness >= options.i2g_1))
       return null;
-    var w0 = stations.p2f_1;
+    var w0 = stations.r2f_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - w0 | 0;
     var inductionVariable = Math.max(0, b_0);
@@ -6692,7 +6693,7 @@
        while (!(k_0 === last));
     var c = (z[b] - z[a]) / length;
     // Inline function 'kotlin.math.abs' call
-    if (!(Math.abs(c) <= options.z2f_1))
+    if (!(Math.abs(c) <= options.b2g_1))
       return null;
     var height = -Infinity;
     var inductionVariable_1 = a;
@@ -6701,15 +6702,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.c2g_1)
+        if (isNaN_0(h) || h < -options.e2g_1)
           return null;
         if (h > height)
           height = h;
       }
        while (!(k_1 === b));
-    if (height < options.a2g_1)
+    if (height < options.c2g_1)
       return null;
-    var f = stations.r2f_1;
+    var f = stations.t2f_1;
     var nearEntry = -Infinity;
     var inductionVariable_2 = a;
     // Inline function 'kotlin.comparisons.minOf' call
@@ -6739,9 +6740,9 @@
         nearExit = Math.max(tmp0_1, b_5);
       }
        while (!(k_3 === b));
-    if (nearEntry < options.a2g_1 || nearExit < options.a2g_1)
+    if (nearEntry < options.c2g_1 || nearExit < options.c2g_1)
       return null;
-    var s = stations.q2f_1;
+    var s = stations.s2f_1;
     var rise = -Infinity;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_6 = a - (w / 2 | 0) | 0;
@@ -6773,7 +6774,7 @@
           fall = g_0;
       }
        while (!(k_5 === last_2));
-    if (rise < options.x2f_1 || fall > -options.x2f_1)
+    if (rise < options.z2f_1 || fall > -options.z2f_1)
       return null;
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
@@ -6810,7 +6811,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.d2g_1)
+            if (z[k_6] - (z[a] + c * (k_6 - a | 0) * step) < options.f2g_1)
               return null;
           }
            while (!(k_6 === y));
@@ -6819,15 +6820,15 @@
     return new TunnelSpan(a, b, c, height, rise, fall, straightness, step);
   }
   function TunnelDetector() {
-    this.o2g_1 = 1.0E-6;
+    this.q2g_1 = 1.0E-6;
   }
-  protoOf(TunnelDetector).p2g = function (profile, options) {
-    var z = profile.l2g_1;
+  protoOf(TunnelDetector).r2g = function (profile, options) {
+    var z = profile.n2g_1;
     if (z.length < 2)
       return emptyList();
     var stations = new Stations(options);
-    var entries = this.q2g(z, options, true, stations);
-    var exits = this.q2g(z, options, false, stations);
+    var entries = this.s2g(z, options, true, stations);
+    var exits = this.s2g(z, options, false, stations);
     var out = ArrayList_init_$Create$();
     var next = -1;
     var _iterator__ex2g4s = entries.l();
@@ -6841,7 +6842,7 @@
         var b = _iterator__ex2g4s_0.n();
         if (b <= a)
           continue $l$loop_2;
-        if ((b - a | 0) * options.s2f_1 > options.f2g_1 + 1.0E-9)
+        if ((b - a | 0) * options.u2f_1 > options.h2g_1 + 1.0E-9)
           break $l$loop_2;
         var tmp0_elvis_lhs = judge(this, profile, a, b, entries, exits, options, stations);
         var tmp;
@@ -6851,23 +6852,23 @@
           tmp = tmp0_elvis_lhs;
         }
         var span = tmp;
-        if (best == null || span.h2f_1 > best.h2f_1 + 1.0E-9)
+        if (best == null || span.j2f_1 > best.j2f_1 + 1.0E-9)
           best = span;
       }
       if (!(best == null)) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element = best;
         out.k(element);
-        next = best.f2f_1;
+        next = best.h2f_1;
       }
     }
     return out;
   };
-  protoOf(TunnelDetector).q2g = function (z, options, entry, stations) {
+  protoOf(TunnelDetector).s2g = function (z, options, entry, stations) {
     var n = z.length;
-    var m = stations.o2f_1;
-    var w = stations.p2f_1;
-    var step = options.s2f_1;
+    var m = stations.q2f_1;
+    var w = stations.r2f_1;
+    var step = options.u2f_1;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
     while (tmp < n) {
@@ -6890,14 +6891,14 @@
           var tmp_2;
           var tmp_3;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(back) <= options.v2f_1) {
+          if (Math.abs(back) <= options.x2f_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_3 = Math.abs(outer) <= options.v2f_1;
+            tmp_3 = Math.abs(outer) <= options.x2f_1;
           } else {
             tmp_3 = false;
           }
           if (tmp_3) {
-            tmp_2 = ahead >= options.w2f_1;
+            tmp_2 = ahead >= options.y2f_1;
           } else {
             tmp_2 = false;
           }
@@ -6907,14 +6908,14 @@
           var tmp_4;
           var tmp_5;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(ahead) <= options.v2f_1) {
+          if (Math.abs(ahead) <= options.x2f_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_5 = Math.abs(outer_0) <= options.v2f_1;
+            tmp_5 = Math.abs(outer_0) <= options.x2f_1;
           } else {
             tmp_5 = false;
           }
           if (tmp_5) {
-            tmp_4 = back <= -options.w2f_1;
+            tmp_4 = back <= -options.y2f_1;
           } else {
             tmp_4 = false;
           }
@@ -6990,30 +6991,30 @@
     return TunnelDetector_instance;
   }
   function TunnelProfile(terrainM, latDeg, lonDeg) {
-    this.l2g_1 = terrainM;
-    this.m2g_1 = latDeg;
-    this.n2g_1 = lonDeg;
+    this.n2g_1 = terrainM;
+    this.o2g_1 = latDeg;
+    this.p2g_1 = lonDeg;
     // Inline function 'kotlin.require' call
-    if (!(this.l2g_1.length === this.m2g_1.length && this.m2g_1.length === this.n2g_1.length)) {
-      var message = 'terrain, latitude and longitude must have one sample per station: ' + this.l2g_1.length + ', ' + this.m2g_1.length + ', ' + this.n2g_1.length;
+    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;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   function stations_0($this, metres, name) {
-    var r = metres / $this.s2f_1;
+    var r = metres / $this.u2f_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.s2f_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.u2f_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
   function Companion_9() {
     Companion_instance_10 = this;
-    this.r2g_1 = new TunnelDetectorOptions();
+    this.t2g_1 = new TunnelDetectorOptions();
   }
   var Companion_instance_10;
   function Companion_getInstance_10() {
@@ -7038,84 +7039,82 @@
     minLengthM = minLengthM === VOID ? 50.0 : minLengthM;
     maxLengthM = maxLengthM === VOID ? 3000.0 : maxLengthM;
     minStraightness = minStraightness === VOID ? 0.8 : minStraightness;
-    this.s2f_1 = stepM;
-    this.t2f_1 = footWindowM;
-    this.u2f_1 = steepWindowM;
-    this.v2f_1 = maxRoadGrade;
-    this.w2f_1 = minPortalGrade;
-    this.x2f_1 = minSideGrade;
-    this.y2f_1 = sideSearchM;
-    this.z2f_1 = maxChordGrade;
-    this.a2g_1 = minHeightM;
-    this.b2g_1 = faceReachM;
-    this.c2g_1 = maxBelowChordM;
-    this.d2g_1 = minValleyHeightM;
-    this.e2g_1 = minLengthM;
-    this.f2g_1 = maxLengthM;
-    this.g2g_1 = 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;
     // Inline function 'kotlin.require' call
-    if (!(this.s2f_1 > 0.0)) {
-      var message = 'stepM must be positive, got ' + this.s2f_1;
+    if (!(this.u2f_1 > 0.0)) {
+      var message = 'stepM must be positive, got ' + this.u2f_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.h2g() >= 1 && this.i2g() >= 1)) {
+    if (!(this.j2g() >= 1 && this.k2g() >= 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.j2g() >= 0)) {
+    if (!(this.l2g() >= 0)) {
       var message_1 = 'negative sideSearchM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.k2g() >= 1)) {
+    if (!(this.m2g() >= 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.v2f_1 >= 0.0 && this.w2f_1 > 0.0 && this.x2f_1 > 0.0)) {
+    if (!(this.x2f_1 >= 0.0 && this.y2f_1 > 0.0 && this.z2f_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.z2f_1 >= 0.0 && this.a2g_1 > 0.0 && this.c2g_1 >= 0.0)) {
+    if (!(this.b2g_1 >= 0.0 && this.c2g_1 > 0.0 && this.e2g_1 >= 0.0)) {
       var message_4 = 'negative threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_4));
     }
-    var containsUpper = this.f2g_1;
-    var containsArg = this.e2g_1;
+    var containsUpper = this.h2g_1;
+    var containsArg = this.g2g_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.g2g_1;
+    var containsArg_0 = this.i2g_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.g2g_1;
+      var message_6 = 'minStraightness must be in 0..1, got ' + this.i2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
   }
-  protoOf(TunnelDetectorOptions).h2g = function () {
-    return stations_0(this, this.t2f_1, 'footWindowM');
-  };
-  protoOf(TunnelDetectorOptions).i2g = function () {
-    return stations_0(this, this.u2f_1, 'steepWindowM');
-  };
   protoOf(TunnelDetectorOptions).j2g = function () {
-    return stations_0(this, this.y2f_1, 'sideSearchM');
+    return stations_0(this, this.v2f_1, 'footWindowM');
   };
   protoOf(TunnelDetectorOptions).k2g = function () {
-    return stations_0(this, this.b2g_1, 'faceReachM');
+    return stations_0(this, this.w2f_1, 'steepWindowM');
+  };
+  protoOf(TunnelDetectorOptions).l2g = function () {
+    return stations_0(this, this.a2g_1, 'sideSearchM');
+  };
+  protoOf(TunnelDetectorOptions).m2g = function () {
+    return stations_0(this, this.d2g_1, 'faceReachM');
   };
   protoOf(TunnelDetectorOptions).toString = function () {
-    return 'TunnelDetectorOptions(stepM=' + this.s2f_1 + ', footWindowM=' + this.t2f_1 + ', steepWindowM=' + this.u2f_1 + ', maxRoadGrade=' + this.v2f_1 + ', minPortalGrade=' + this.w2f_1 + ', minSideGrade=' + this.x2f_1 + ', sideSearchM=' + this.y2f_1 + ', maxChordGrade=' + this.z2f_1 + ', minHeightM=' + this.a2g_1 + ', faceReachM=' + this.b2g_1 + ', maxBelowChordM=' + this.c2g_1 + ', minValleyHeightM=' + this.d2g_1 + ', minLengthM=' + this.e2g_1 + ', maxLengthM=' + this.f2g_1 + ', minStraightness=' + this.g2g_1 + ')';
+    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 + ')';
   };
   protoOf(TunnelDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.s2f_1);
-    result = imul(result, 31) + getNumberHashCode(this.t2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u2f_1) | 0;
+    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;
@@ -7128,6 +7127,8 @@
     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;
+    result = imul(result, 31) + getNumberHashCode(this.h2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i2g_1) | 0;
     return result;
   };
   protoOf(TunnelDetectorOptions).equals = function (other) {
@@ -7135,10 +7136,6 @@
       return true;
     if (!(other instanceof TunnelDetectorOptions))
       return false;
-    if (!equals(this.s2f_1, other.s2f_1))
-      return false;
-    if (!equals(this.t2f_1, other.t2f_1))
-      return false;
     if (!equals(this.u2f_1, other.u2f_1))
       return false;
     if (!equals(this.v2f_1, other.v2f_1))
@@ -7165,6 +7162,10 @@
       return false;
     if (!equals(this.g2g_1, other.g2g_1))
       return false;
+    if (!equals(this.h2g_1, other.h2g_1))
+      return false;
+    if (!equals(this.i2g_1, other.i2g_1))
+      return false;
     return true;
   };
   //region block: init