@glandais/vcyclist-engine 6.7.0 → 6.9.0

package/vcyclist-gpx.js

@@ -283,27 +283,27 @@
     symbol = symbol === VOID ? null : symbol;
     type = type === VOID ? null : type;
     timeEpochMs = timeEpochMs === VOID ? null : timeEpochMs;
-    this.z29_1 = latitudeDeg;
-    this.a2a_1 = longitudeDeg;
-    this.b2a_1 = elevationM;
-    this.c2a_1 = name;
-    this.d2a_1 = description;
-    this.e2a_1 = symbol;
-    this.f2a_1 = type;
-    this.g2a_1 = timeEpochMs;
+    this.b2a_1 = latitudeDeg;
+    this.c2a_1 = longitudeDeg;
+    this.d2a_1 = elevationM;
+    this.e2a_1 = name;
+    this.f2a_1 = description;
+    this.g2a_1 = symbol;
+    this.h2a_1 = type;
+    this.i2a_1 = timeEpochMs;
   }
   protoOf(GpxWaypoint).toString = function () {
-    return 'GpxWaypoint(latitudeDeg=' + this.z29_1 + ', longitudeDeg=' + this.a2a_1 + ', elevationM=' + this.b2a_1 + ', name=' + this.c2a_1 + ', description=' + this.d2a_1 + ', symbol=' + this.e2a_1 + ', type=' + this.f2a_1 + ', timeEpochMs=' + toString(this.g2a_1) + ')';
+    return 'GpxWaypoint(latitudeDeg=' + this.b2a_1 + ', longitudeDeg=' + this.c2a_1 + ', elevationM=' + this.d2a_1 + ', name=' + this.e2a_1 + ', description=' + this.f2a_1 + ', symbol=' + this.g2a_1 + ', type=' + this.h2a_1 + ', timeEpochMs=' + toString(this.i2a_1) + ')';
   };
   protoOf(GpxWaypoint).hashCode = function () {
-    var result = getNumberHashCode(this.z29_1);
-    result = imul(result, 31) + getNumberHashCode(this.a2a_1) | 0;
-    result = imul(result, 31) + (this.b2a_1 == null ? 0 : getNumberHashCode(this.b2a_1)) | 0;
-    result = imul(result, 31) + (this.c2a_1 == null ? 0 : getStringHashCode(this.c2a_1)) | 0;
-    result = imul(result, 31) + (this.d2a_1 == null ? 0 : getStringHashCode(this.d2a_1)) | 0;
+    var result = getNumberHashCode(this.b2a_1);
+    result = imul(result, 31) + getNumberHashCode(this.c2a_1) | 0;
+    result = imul(result, 31) + (this.d2a_1 == null ? 0 : getNumberHashCode(this.d2a_1)) | 0;
     result = imul(result, 31) + (this.e2a_1 == null ? 0 : getStringHashCode(this.e2a_1)) | 0;
     result = imul(result, 31) + (this.f2a_1 == null ? 0 : getStringHashCode(this.f2a_1)) | 0;
-    result = imul(result, 31) + (this.g2a_1 == null ? 0 : this.g2a_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.g2a_1 == null ? 0 : getStringHashCode(this.g2a_1)) | 0;
+    result = imul(result, 31) + (this.h2a_1 == null ? 0 : getStringHashCode(this.h2a_1)) | 0;
+    result = imul(result, 31) + (this.i2a_1 == null ? 0 : this.i2a_1.hashCode()) | 0;
     return result;
   };
   protoOf(GpxWaypoint).equals = function (other) {
@@ -311,38 +311,38 @@
       return true;
     if (!(other instanceof GpxWaypoint))
       return false;
-    if (!equals(this.z29_1, other.z29_1))
-      return false;
-    if (!equals(this.a2a_1, other.a2a_1))
-      return false;
     if (!equals(this.b2a_1, other.b2a_1))
       return false;
-    if (!(this.c2a_1 == other.c2a_1))
+    if (!equals(this.c2a_1, other.c2a_1))
       return false;
-    if (!(this.d2a_1 == other.d2a_1))
+    if (!equals(this.d2a_1, other.d2a_1))
       return false;
     if (!(this.e2a_1 == other.e2a_1))
       return false;
     if (!(this.f2a_1 == other.f2a_1))
       return false;
-    if (!equals(this.g2a_1, other.g2a_1))
+    if (!(this.g2a_1 == other.g2a_1))
+      return false;
+    if (!(this.h2a_1 == other.h2a_1))
+      return false;
+    if (!equals(this.i2a_1, other.i2a_1))
       return false;
     return true;
   };
   function GpxDocument(name, tracks, waypoints) {
     name = name === VOID ? 'noname' : name;
     waypoints = waypoints === VOID ? emptyList() : waypoints;
-    this.h2a_1 = name;
-    this.i2a_1 = tracks;
-    this.j2a_1 = waypoints;
+    this.j2a_1 = name;
+    this.k2a_1 = tracks;
+    this.l2a_1 = waypoints;
   }
   protoOf(GpxDocument).toString = function () {
-    return 'GpxDocument(name=' + this.h2a_1 + ', tracks=' + toString_0(this.i2a_1) + ', waypoints=' + toString_0(this.j2a_1) + ')';
+    return 'GpxDocument(name=' + this.j2a_1 + ', tracks=' + toString_0(this.k2a_1) + ', waypoints=' + toString_0(this.l2a_1) + ')';
   };
   protoOf(GpxDocument).hashCode = function () {
-    var result = getStringHashCode(this.h2a_1);
-    result = imul(result, 31) + hashCode(this.i2a_1) | 0;
-    result = imul(result, 31) + hashCode(this.j2a_1) | 0;
+    var result = getStringHashCode(this.j2a_1);
+    result = imul(result, 31) + hashCode(this.k2a_1) | 0;
+    result = imul(result, 31) + hashCode(this.l2a_1) | 0;
     return result;
   };
   protoOf(GpxDocument).equals = function (other) {
@@ -350,24 +350,24 @@
       return true;
     if (!(other instanceof GpxDocument))
       return false;
-    if (!(this.h2a_1 === other.h2a_1))
+    if (!(this.j2a_1 === other.j2a_1))
       return false;
-    if (!equals(this.i2a_1, other.i2a_1))
+    if (!equals(this.k2a_1, other.k2a_1))
       return false;
-    if (!equals(this.j2a_1, other.j2a_1))
+    if (!equals(this.l2a_1, other.l2a_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).k2a = function (name, type, points, kind) {
+  protoOf(Companion).m2a = function (name, type, points, kind) {
     return new GpxTrack(name, type, listOf(new GpxSegment(points)), kind);
   };
-  protoOf(Companion).l2a = function (name, type, points, kind, $super) {
+  protoOf(Companion).n2a = 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.k2a(name, type, points, kind) : $super.k2a.call(this, name, type, points, kind);
+    return $super === VOID ? this.m2a(name, type, points, kind) : $super.m2a.call(this, name, type, points, kind);
   };
   var Companion_instance_0;
   function Companion_getInstance_0() {
@@ -376,13 +376,13 @@
   function GpxTrack$points$delegate$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.collections.flatMap' call
-      var tmp0 = this$0.o2a_1;
+      var tmp0 = this$0.q2a_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.t2a_1;
+        var list = element.v2a_1;
         addAll(destination, list);
       }
       return destination;
@@ -390,7 +390,7 @@
   }
   function GpxTrack$_get_points_$ref_4x48pr() {
     return constructCallableReference(function (p0) {
-      return p0.u2a();
+      return p0.w2a();
     }, 1, 0, 8);
   }
   function GpxTrack(name, type, segments, kind, roadWidthM, highway) {
@@ -399,32 +399,32 @@
     kind = kind === VOID ? GpxPathKind_TRACK_getInstance() : kind;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.m2a_1 = name;
-    this.n2a_1 = type;
-    this.o2a_1 = segments;
-    this.p2a_1 = kind;
-    this.q2a_1 = roadWidthM;
-    this.r2a_1 = highway;
+    this.o2a_1 = name;
+    this.p2a_1 = type;
+    this.q2a_1 = segments;
+    this.r2a_1 = kind;
+    this.s2a_1 = roadWidthM;
+    this.t2a_1 = highway;
     var tmp = this;
-    tmp.s2a_1 = lazy(GpxTrack$points$delegate$lambda(this));
+    tmp.u2a_1 = lazy(GpxTrack$points$delegate$lambda(this));
   }
-  protoOf(GpxTrack).u2a = function () {
-    var tmp0 = this.s2a_1;
+  protoOf(GpxTrack).w2a = function () {
+    var tmp0 = this.u2a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('points', 1, tmp, GpxTrack$_get_points_$ref_4x48pr(), null);
     return tmp0.q1();
   };
   protoOf(GpxTrack).toString = function () {
-    return 'GpxTrack(name=' + this.m2a_1 + ', type=' + this.n2a_1 + ', segments=' + toString_0(this.o2a_1) + ', kind=' + this.p2a_1.toString() + ', roadWidthM=' + this.q2a_1 + ', highway=' + this.r2a_1 + ')';
+    return 'GpxTrack(name=' + this.o2a_1 + ', type=' + this.p2a_1 + ', segments=' + toString_0(this.q2a_1) + ', kind=' + this.r2a_1.toString() + ', roadWidthM=' + this.s2a_1 + ', highway=' + this.t2a_1 + ')';
   };
   protoOf(GpxTrack).hashCode = function () {
-    var result = this.m2a_1 == null ? 0 : getStringHashCode(this.m2a_1);
-    result = imul(result, 31) + (this.n2a_1 == null ? 0 : getStringHashCode(this.n2a_1)) | 0;
-    result = imul(result, 31) + hashCode(this.o2a_1) | 0;
-    result = imul(result, 31) + this.p2a_1.hashCode() | 0;
-    result = imul(result, 31) + (this.q2a_1 == null ? 0 : getNumberHashCode(this.q2a_1)) | 0;
-    result = imul(result, 31) + (this.r2a_1 == null ? 0 : getStringHashCode(this.r2a_1)) | 0;
+    var result = this.o2a_1 == null ? 0 : getStringHashCode(this.o2a_1);
+    result = imul(result, 31) + (this.p2a_1 == null ? 0 : getStringHashCode(this.p2a_1)) | 0;
+    result = imul(result, 31) + hashCode(this.q2a_1) | 0;
+    result = imul(result, 31) + this.r2a_1.hashCode() | 0;
+    result = imul(result, 31) + (this.s2a_1 == null ? 0 : getNumberHashCode(this.s2a_1)) | 0;
+    result = imul(result, 31) + (this.t2a_1 == null ? 0 : getStringHashCode(this.t2a_1)) | 0;
     return result;
   };
   protoOf(GpxTrack).equals = function (other) {
@@ -432,35 +432,35 @@
       return true;
     if (!(other instanceof GpxTrack))
       return false;
-    if (!(this.m2a_1 == other.m2a_1))
+    if (!(this.o2a_1 == other.o2a_1))
       return false;
-    if (!(this.n2a_1 == other.n2a_1))
+    if (!(this.p2a_1 == other.p2a_1))
       return false;
-    if (!equals(this.o2a_1, other.o2a_1))
+    if (!equals(this.q2a_1, other.q2a_1))
       return false;
-    if (!this.p2a_1.equals(other.p2a_1))
+    if (!this.r2a_1.equals(other.r2a_1))
       return false;
-    if (!equals(this.q2a_1, other.q2a_1))
+    if (!equals(this.s2a_1, other.s2a_1))
       return false;
-    if (!(this.r2a_1 == other.r2a_1))
+    if (!(this.t2a_1 == other.t2a_1))
       return false;
     return true;
   };
   function GpxSegment(points) {
-    this.t2a_1 = points;
+    this.v2a_1 = points;
   }
   protoOf(GpxSegment).toString = function () {
-    return 'GpxSegment(points=' + toString_0(this.t2a_1) + ')';
+    return 'GpxSegment(points=' + toString_0(this.v2a_1) + ')';
   };
   protoOf(GpxSegment).hashCode = function () {
-    return hashCode(this.t2a_1);
+    return hashCode(this.v2a_1);
   };
   protoOf(GpxSegment).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof GpxSegment))
       return false;
-    if (!equals(this.t2a_1, other.t2a_1))
+    if (!equals(this.v2a_1, other.v2a_1))
       return false;
     return true;
   };
@@ -473,31 +473,31 @@
     powerW = powerW === VOID ? null : powerW;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.v2a_1 = latitudeDeg;
-    this.w2a_1 = longitudeDeg;
-    this.x2a_1 = elevationM;
-    this.y2a_1 = timeEpochMs;
-    this.z2a_1 = heartRate;
-    this.a2b_1 = cadence;
-    this.b2b_1 = temperatureC;
-    this.c2b_1 = powerW;
-    this.d2b_1 = roadWidthM;
-    this.e2b_1 = highway;
+    this.x2a_1 = latitudeDeg;
+    this.y2a_1 = longitudeDeg;
+    this.z2a_1 = elevationM;
+    this.a2b_1 = timeEpochMs;
+    this.b2b_1 = heartRate;
+    this.c2b_1 = cadence;
+    this.d2b_1 = temperatureC;
+    this.e2b_1 = powerW;
+    this.f2b_1 = roadWidthM;
+    this.g2b_1 = highway;
   }
   protoOf(GpxTrackPoint).toString = function () {
-    return 'GpxTrackPoint(latitudeDeg=' + this.v2a_1 + ', longitudeDeg=' + this.w2a_1 + ', elevationM=' + this.x2a_1 + ', timeEpochMs=' + toString(this.y2a_1) + ', heartRate=' + this.z2a_1 + ', cadence=' + this.a2b_1 + ', temperatureC=' + this.b2b_1 + ', powerW=' + this.c2b_1 + ', roadWidthM=' + this.d2b_1 + ', highway=' + this.e2b_1 + ')';
+    return 'GpxTrackPoint(latitudeDeg=' + this.x2a_1 + ', longitudeDeg=' + this.y2a_1 + ', elevationM=' + this.z2a_1 + ', timeEpochMs=' + toString(this.a2b_1) + ', heartRate=' + this.b2b_1 + ', cadence=' + this.c2b_1 + ', temperatureC=' + this.d2b_1 + ', powerW=' + this.e2b_1 + ', roadWidthM=' + this.f2b_1 + ', highway=' + this.g2b_1 + ')';
   };
   protoOf(GpxTrackPoint).hashCode = function () {
-    var result = getNumberHashCode(this.v2a_1);
-    result = imul(result, 31) + getNumberHashCode(this.w2a_1) | 0;
-    result = imul(result, 31) + (this.x2a_1 == null ? 0 : getNumberHashCode(this.x2a_1)) | 0;
-    result = imul(result, 31) + (this.y2a_1 == null ? 0 : this.y2a_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.z2a_1 == null ? 0 : this.z2a_1) | 0;
-    result = imul(result, 31) + (this.a2b_1 == null ? 0 : this.a2b_1) | 0;
-    result = imul(result, 31) + (this.b2b_1 == null ? 0 : getNumberHashCode(this.b2b_1)) | 0;
-    result = imul(result, 31) + (this.c2b_1 == null ? 0 : getNumberHashCode(this.c2b_1)) | 0;
+    var result = getNumberHashCode(this.x2a_1);
+    result = imul(result, 31) + getNumberHashCode(this.y2a_1) | 0;
+    result = imul(result, 31) + (this.z2a_1 == null ? 0 : getNumberHashCode(this.z2a_1)) | 0;
+    result = imul(result, 31) + (this.a2b_1 == null ? 0 : this.a2b_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.b2b_1 == null ? 0 : this.b2b_1) | 0;
+    result = imul(result, 31) + (this.c2b_1 == null ? 0 : this.c2b_1) | 0;
     result = imul(result, 31) + (this.d2b_1 == null ? 0 : getNumberHashCode(this.d2b_1)) | 0;
-    result = imul(result, 31) + (this.e2b_1 == null ? 0 : getStringHashCode(this.e2b_1)) | 0;
+    result = imul(result, 31) + (this.e2b_1 == null ? 0 : getNumberHashCode(this.e2b_1)) | 0;
+    result = imul(result, 31) + (this.f2b_1 == null ? 0 : getNumberHashCode(this.f2b_1)) | 0;
+    result = imul(result, 31) + (this.g2b_1 == null ? 0 : getStringHashCode(this.g2b_1)) | 0;
     return result;
   };
   protoOf(GpxTrackPoint).equals = function (other) {
@@ -505,25 +505,25 @@
       return true;
     if (!(other instanceof GpxTrackPoint))
       return false;
-    if (!equals(this.v2a_1, other.v2a_1))
-      return false;
-    if (!equals(this.w2a_1, other.w2a_1))
-      return false;
     if (!equals(this.x2a_1, other.x2a_1))
       return false;
     if (!equals(this.y2a_1, other.y2a_1))
       return false;
-    if (!(this.z2a_1 == other.z2a_1))
+    if (!equals(this.z2a_1, other.z2a_1))
       return false;
-    if (!(this.a2b_1 == other.a2b_1))
+    if (!equals(this.a2b_1, other.a2b_1))
       return false;
-    if (!equals(this.b2b_1, other.b2b_1))
+    if (!(this.b2b_1 == other.b2b_1))
       return false;
-    if (!equals(this.c2b_1, other.c2b_1))
+    if (!(this.c2b_1 == other.c2b_1))
       return false;
     if (!equals(this.d2b_1, other.d2b_1))
       return false;
-    if (!(this.e2b_1 == other.e2b_1))
+    if (!equals(this.e2b_1, other.e2b_1))
+      return false;
+    if (!equals(this.f2b_1, other.f2b_1))
+      return false;
+    if (!(this.g2b_1 == other.g2b_1))
       return false;
     return true;
   };
@@ -555,11 +555,11 @@
     var scale = point - digits.length | 0;
     var tmp;
     if (0 <= scale ? scale <= 22 : false) {
-      tmp = toNumber(significand) * $this.i2b_1[scale];
+      tmp = toNumber(significand) * $this.k2b_1[scale];
     } else {
       var containsArg = -scale | 0;
       if (1 <= containsArg ? containsArg <= 22 : false) {
-        tmp = toNumber(significand) / $this.i2b_1[-scale | 0];
+        tmp = toNumber(significand) / $this.k2b_1[-scale | 0];
       } else {
         tmp = null;
       }
@@ -587,14 +587,14 @@
   }
   function GpxDecimal() {
     GpxDecimal_instance = this;
-    this.f2b_1 = 18;
-    this.g2b_1 = new Long(0, 2097152);
-    this.h2b_1 = 22;
+    this.h2b_1 = 18;
+    this.i2b_1 = new Long(0, 2097152);
+    this.j2b_1 = 22;
     var tmp = this;
     // Inline function 'kotlin.doubleArrayOf' call
-    tmp.i2b_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.k2b_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).j2b = function (value) {
+  protoOf(GpxDecimal).l2b = function (value) {
     if (!isFinite(value))
       return value.toString();
     var text = value.toString();
@@ -738,9 +738,9 @@
   var GpxPowerSource_COMPUTED_OR_INPUT_instance;
   function Companion_0() {
     Companion_instance_1 = this;
-    this.k2b_1 = GpxPowerSource_INPUT_getInstance();
+    this.m2b_1 = GpxPowerSource_INPUT_getInstance();
   }
-  protoOf(Companion_0).l2b = function (value) {
+  protoOf(Companion_0).n2b = function (value) {
     var tmp0 = get_entries_0();
     var tmp$ret$0;
     $l$block: {
@@ -748,7 +748,7 @@
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (element.o2b() === value) {
+        if (element.q2b() === value) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -757,7 +757,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_0).p2b = function () {
+  protoOf(Companion_0).r2b = function () {
     // Inline function 'kotlin.collections.map' call
     var this_0 = get_entries_0();
     // Inline function 'kotlin.collections.mapTo' call
@@ -765,7 +765,7 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = item.o2b();
+      var tmp$ret$2 = item.q2b();
       destination.k(tmp$ret$2);
     }
     return destination;
@@ -789,7 +789,7 @@
   function GpxPowerSource(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  protoOf(GpxPowerSource).o2b = function () {
+  protoOf(GpxPowerSource).q2b = function () {
     var tmp;
     switch (this.y1_1) {
       case 0:
@@ -820,10 +820,10 @@
     startTime = startTime === VOID ? null : startTime;
     powerSource = powerSource === VOID ? GpxPowerSource_INPUT_getInstance() : powerSource;
     var startTimeMs = startTime == null ? null : startTime.gh();
-    var t0 = _this__u8e3s4.q2b_1 === 0 || isNaN_0(_this__u8e3s4.s2b(0)) ? 0.0 : _this__u8e3s4.s2b(0);
+    var t0 = _this__u8e3s4.s2b_1 === 0 || isNaN_0(_this__u8e3s4.u2b(0)) ? 0.0 : _this__u8e3s4.u2b(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = _this__u8e3s4.q2b_1;
+    var size = _this__u8e3s4.s2b_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -831,10 +831,10 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp = _this__u8e3s4.t2b(index) * 57.29577951308232;
-        var tmp_0 = _this__u8e3s4.u2b(index) * 57.29577951308232;
+        var tmp = _this__u8e3s4.v2b(index) * 57.29577951308232;
+        var tmp_0 = _this__u8e3s4.w2b(index) * 57.29577951308232;
         // Inline function 'kotlin.takeUnless' call
-        var this_0 = _this__u8e3s4.v2b(index);
+        var this_0 = _this__u8e3s4.x2b(index);
         var tmp_1;
         if (!isNaN_0(this_0)) {
           tmp_1 = this_0;
@@ -843,13 +843,13 @@
         }
         var tmp_2 = tmp_1;
         var tmp_3;
-        if (isNaN_0(_this__u8e3s4.s2b(index))) {
+        if (isNaN_0(_this__u8e3s4.u2b(index))) {
           tmp_3 = null;
         } else if (!(startTimeMs == null)) {
-          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.s2b(index) - t0));
+          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.u2b(index) - t0));
         } else {
           // Inline function 'kotlin.takeIf' call
-          var this_1 = numberToLong(_this__u8e3s4.s2b(index));
+          var this_1 = numberToLong(_this__u8e3s4.u2b(index));
           var tmp_4;
           if (compare(this_1, new Long(0, 0)) > 0) {
             tmp_4 = this_1;
@@ -860,7 +860,7 @@
         }
         var tmp_5 = tmp_3;
         // Inline function 'kotlin.takeUnless' call
-        var this_2 = _this__u8e3s4.w2b(index);
+        var this_2 = _this__u8e3s4.y2b(index);
         var tmp_6;
         if (!isNaN_0(this_2)) {
           tmp_6 = this_2;
@@ -870,7 +870,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.x2b(index);
+        var this_3 = _this__u8e3s4.z2b(index);
         var tmp_8;
         if (!isNaN_0(this_3)) {
           tmp_8 = this_3;
@@ -880,7 +880,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.y2b(index);
+        var this_4 = _this__u8e3s4.a2c(index);
         var tmp_10;
         if (!isNaN_0(this_4)) {
           tmp_10 = this_4;
@@ -893,11 +893,11 @@
       }
        while (inductionVariable < size);
     var points = list;
-    return Companion_instance_0.l2a(name, type, points);
+    return Companion_instance_0.n2a(name, type, points);
   }
   function powerAt(_this__u8e3s4, i, source) {
     // Inline function 'kotlin.takeUnless' call
-    var this_0 = _this__u8e3s4.z2b(i);
+    var this_0 = _this__u8e3s4.b2c(i);
     var tmp;
     if (!isNaN_0(this_0)) {
       tmp = this_0;
@@ -906,7 +906,7 @@
     }
     var input = tmp;
     // Inline function 'kotlin.takeUnless' call
-    var this_1 = _this__u8e3s4.a2c(i);
+    var this_1 = _this__u8e3s4.c2c(i);
     var tmp_0;
     if (!(isNaN_0(this_1) || this_1 === 0.0)) {
       tmp_0 = this_1;
@@ -946,7 +946,7 @@
   function parseOnce($this, xml) {
     var tmp;
     try {
-      tmp = get_xmlStreaming().y1s(xml);
+      tmp = get_xmlStreaming().a1t(xml);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof IllegalArgumentException) {
@@ -980,7 +980,7 @@
       }
     }
     finally {
-      reader.g1s();
+      reader.i1s();
     }
     return tmp_1;
   }
@@ -988,8 +988,8 @@
     while (reader.m()) {
       var ev = reader.n();
       if (ev.equals(EventType_START_ELEMENT_getInstance())) {
-        if (!(reader.t1r() === 'gpx')) {
-          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.t1r() + ')');
+        if (!(reader.v1r() === 'gpx')) {
+          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.v1r() + ')');
         }
         return parseGpxRoot($this, reader);
       }
@@ -1006,7 +1006,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          switch (reader.t1r()) {
+          switch (reader.v1r()) {
             case 'metadata':
               var metaName = parseMetadataName($this, reader);
               if (!(metaName == null))
@@ -1041,7 +1041,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          if (reader.t1r() === 'name' && name == null) {
+          if (reader.v1r() === 'name' && name == null) {
             // Inline function 'kotlin.text.trim' call
             var this_0 = readElementText($this, reader);
             // Inline function 'kotlin.text.ifEmpty' call
@@ -1077,7 +1077,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          switch (reader.t1r()) {
+          switch (reader.v1r()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -1127,12 +1127,12 @@
 
           break;
         case 2:
-          return new GpxTrack(name, type, segments, VOID, trackExt.f2c_1);
+          return new GpxTrack(name, type, segments, VOID, trackExt.h2c_1);
         default:
           break;
       }
     }
-    return new GpxTrack(name, type, segments, VOID, trackExt.f2c_1);
+    return new GpxTrack(name, type, segments, VOID, trackExt.h2c_1);
   }
   function parseRoute($this, reader) {
     var name = null;
@@ -1143,7 +1143,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          switch (reader.t1r()) {
+          switch (reader.v1r()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -1204,7 +1204,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          if (reader.t1r() === 'trkpt') {
+          if (reader.v1r() === 'trkpt') {
             points.k(parseTrackPoint($this, reader));
           } else {
             skipElement($this, reader);
@@ -1220,8 +1220,8 @@
     return new GpxSegment(points);
   }
   function parseTrackPoint($this, reader) {
-    var latStr = reader.e1s(null, 'lat');
-    var lonStr = reader.e1s(null, 'lon');
+    var latStr = reader.g1s(null, 'lat');
+    var lonStr = reader.g1s(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -1256,7 +1256,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          switch (reader.t1r()) {
+          switch (reader.v1r()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -1290,16 +1290,16 @@
 
           break;
         case 2:
-          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.b2c_1, ext.c2c_1, ext.d2c_1, ext.e2c_1, ext.f2c_1, ext.g2c_1);
+          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.d2c_1, ext.e2c_1, ext.f2c_1, ext.g2c_1, ext.h2c_1, ext.i2c_1);
         default:
           break;
       }
     }
-    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.b2c_1, ext.c2c_1, ext.d2c_1, ext.e2c_1, ext.f2c_1, ext.g2c_1);
+    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.d2c_1, ext.e2c_1, ext.f2c_1, ext.g2c_1, ext.h2c_1, ext.i2c_1);
   }
   function parseWaypoint($this, reader) {
-    var latStr = reader.e1s(null, 'lat');
-    var lonStr = reader.e1s(null, 'lon');
+    var latStr = reader.g1s(null, 'lat');
+    var lonStr = reader.g1s(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -1337,7 +1337,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          switch (reader.t1r()) {
+          switch (reader.v1r()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -1452,7 +1452,7 @@
       var ev = reader.n();
       switch (ev.y1_1) {
         case 1:
-          var ln = reader.t1r();
+          var ln = reader.v1r();
           // Inline function 'kotlin.text.lowercase' call
 
           // Inline function 'kotlin.js.asDynamic' call
@@ -1465,8 +1465,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp = ext;
-                var tmp0_elvis_lhs = ext.e2c_1;
-                tmp.e2c_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
+                var tmp0_elvis_lhs = ext.g2c_1;
+                tmp.g2c_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
               }
 
               break;
@@ -1477,8 +1477,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.b2c_1 == null)
-                  ext.b2c_1 = numberToInt(tmp3_safe_receiver);
+                if (ext.d2c_1 == null)
+                  ext.d2c_1 = numberToInt(tmp3_safe_receiver);
               }
 
               break;
@@ -1489,8 +1489,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.c2c_1 == null)
-                  ext.c2c_1 = numberToInt(tmp4_safe_receiver);
+                if (ext.e2c_1 == null)
+                  ext.e2c_1 = numberToInt(tmp4_safe_receiver);
               }
 
               break;
@@ -1503,8 +1503,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_0 = ext;
-                var tmp0_elvis_lhs_0 = ext.d2c_1;
-                tmp_0.d2c_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
+                var tmp0_elvis_lhs_0 = ext.f2c_1;
+                tmp_0.f2c_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
               }
 
               break;
@@ -1515,8 +1515,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_1 = ext;
-                var tmp0_elvis_lhs_1 = ext.f2c_1;
-                tmp_1.f2c_1 = tmp0_elvis_lhs_1 == null ? tmp6_safe_receiver : tmp0_elvis_lhs_1;
+                var tmp0_elvis_lhs_1 = ext.h2c_1;
+                tmp_1.h2c_1 = tmp0_elvis_lhs_1 == null ? tmp6_safe_receiver : tmp0_elvis_lhs_1;
               }
 
               break;
@@ -1529,13 +1529,13 @@
               // Inline function 'kotlin.text.isNotEmpty' call
 
               if (charSequenceLength(text) > 0) {
-                tmp_2 = ext.g2c_1 == null;
+                tmp_2 = ext.i2c_1 == null;
               } else {
                 tmp_2 = false;
               }
 
               if (tmp_2)
-                ext.g2c_1 = text;
+                ext.i2c_1 = text;
               break;
             default:
               parseExtensions($this, reader, ext);
@@ -1559,7 +1559,7 @@
         case 5:
         case 9:
         case 8:
-          sb.x6(reader.y1r());
+          sb.x6(reader.a1s());
           break;
         case 1:
           skipElement($this, reader);
@@ -1621,16 +1621,16 @@
     powerW = powerW === VOID ? null : powerW;
     roadWidthM = roadWidthM === VOID ? null : roadWidthM;
     highway = highway === VOID ? null : highway;
-    this.b2c_1 = heartRate;
-    this.c2c_1 = cadence;
-    this.d2c_1 = temperatureC;
-    this.e2c_1 = powerW;
-    this.f2c_1 = roadWidthM;
-    this.g2c_1 = highway;
+    this.d2c_1 = heartRate;
+    this.e2c_1 = cadence;
+    this.f2c_1 = temperatureC;
+    this.g2c_1 = powerW;
+    this.h2c_1 = roadWidthM;
+    this.i2c_1 = highway;
   }
   function GpxParser() {
   }
-  protoOf(GpxParser).h2c = function (xml, repairOnFailure) {
+  protoOf(GpxParser).j2c = function (xml, repairOnFailure) {
     var tmp;
     try {
       tmp = parseOnce(this, xml);
@@ -1640,7 +1640,7 @@
         var firstFailure = $p;
         if (!repairOnFailure)
           throw firstFailure;
-        var repaired = GpxXmlRepair_getInstance().l2c(xml);
+        var repaired = GpxXmlRepair_getInstance().n2c(xml);
         var tmp_1;
         try {
           tmp_1 = parseOnce(this, repaired);
@@ -1661,9 +1661,9 @@
     }
     return tmp;
   };
-  protoOf(GpxParser).m2c = function (xml, repairOnFailure, $super) {
+  protoOf(GpxParser).o2c = function (xml, repairOnFailure, $super) {
     repairOnFailure = repairOnFailure === VOID ? true : repairOnFailure;
-    return $super === VOID ? this.h2c(xml, repairOnFailure) : $super.h2c.call(this, xml, repairOnFailure);
+    return $super === VOID ? this.j2c(xml, repairOnFailure) : $super.j2c.call(this, xml, repairOnFailure);
   };
   var GpxParser_instance;
   function GpxParser_getInstance() {
@@ -1681,7 +1681,7 @@
   var PLAUSIBLE_ROAD_WIDTH_M;
   function firstTrackAsPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.i2a_1);
+    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.k2a_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -1697,16 +1697,16 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.i2a_1;
+    var tmp0 = _this__u8e3s4.k2a_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.m1(element.p2a_1)) {
+      if (kinds.m1(element.r2a_1)) {
         // Inline function 'kotlin.collections.isNotEmpty' call
-        tmp = !element.u2a().r();
+        tmp = !element.w2a().r();
       } else {
         tmp = false;
       }
@@ -1729,13 +1729,13 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.i2a_1;
+    var tmp0 = _this__u8e3s4.k2a_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.m1(element.p2a_1)) {
+      if (kinds.m1(element.r2a_1)) {
         destination.k(element);
       }
     }
@@ -1746,13 +1746,13 @@
     while (_iterator__ex2g4s_0.m()) {
       var element_0 = _iterator__ex2g4s_0.n();
       // Inline function 'kotlin.collections.map' call
-      var this_0 = element_0.o2a_1;
+      var this_0 = element_0.q2a_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.q2a_1, item);
+        var tmp$ret$8 = to(element_0.s2a_1, item);
         destination_1.k(tmp$ret$8);
       }
       var list = destination_1;
@@ -1765,7 +1765,7 @@
     while (_iterator__ex2g4s_2.m()) {
       var element_1 = _iterator__ex2g4s_2.n();
       // Inline function 'kotlin.collections.isNotEmpty' call
-      if (!element_1.ld_1.t2a_1.r()) {
+      if (!element_1.ld_1.v2a_1.r()) {
         destination_2.k(element_1);
       }
     }
@@ -1784,11 +1784,11 @@
   }
   function toPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.u2a(), _this__u8e3s4.q2a_1);
+    return pointsToPath(_this__u8e3s4.w2a(), _this__u8e3s4.s2a_1);
   }
   function toPath_0(_this__u8e3s4, trackRoadWidthM) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.t2a_1, trackRoadWidthM);
+    return pointsToPath(_this__u8e3s4.v2a_1, trackRoadWidthM);
   }
   function pointsToPath(points, trackRoadWidthM) {
     trackRoadWidthM = trackRoadWidthM === VOID ? null : trackRoadWidthM;
@@ -1800,28 +1800,28 @@
       var i = index;
       index = index + 1 | 0;
       var p = iterator.n();
-      path.n2c(i, p.v2a_1 * 0.017453292519943295);
-      path.o2c(i, p.w2a_1 * 0.017453292519943295);
-      var tmp0_elvis_lhs = p.x2a_1;
-      path.p2c(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
-      var tmp1_elvis_lhs = p.y2a_1;
-      path.q2c(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
-      var tmp2_elvis_lhs = p.c2b_1;
-      path.r2c(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
-      var tmp3_safe_receiver = p.z2a_1;
+      path.p2c(i, p.x2a_1 * 0.017453292519943295);
+      path.q2c(i, p.y2a_1 * 0.017453292519943295);
+      var tmp0_elvis_lhs = p.z2a_1;
+      path.r2c(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
+      var tmp1_elvis_lhs = p.a2b_1;
+      path.s2c(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
+      var tmp2_elvis_lhs = p.e2b_1;
+      path.t2c(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
+      var tmp3_safe_receiver = p.b2b_1;
       var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : tmp3_safe_receiver;
-      path.s2c(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
-      var tmp5_safe_receiver = p.a2b_1;
+      path.u2c(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
+      var tmp5_safe_receiver = p.c2b_1;
       var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : tmp5_safe_receiver;
-      path.t2c(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
-      var tmp7_elvis_lhs = p.b2b_1;
-      path.u2c(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
-      var tmp8_elvis_lhs = p.d2b_1;
+      path.v2c(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
+      var tmp7_elvis_lhs = p.d2b_1;
+      path.w2c(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
+      var tmp8_elvis_lhs = p.f2b_1;
       var tmp9_elvis_lhs = tmp8_elvis_lhs == null ? trackRoadWidthM : tmp8_elvis_lhs;
-      var width = tmp9_elvis_lhs == null ? OsmHighway_getInstance().w2c(p.e2b_1) : tmp9_elvis_lhs;
-      path.x2c(i, !(width == null) && get_PLAUSIBLE_ROAD_WIDTH_M().y(width) ? width : NaN);
+      var width = tmp9_elvis_lhs == null ? OsmHighway_getInstance().y2c(p.g2b_1) : tmp9_elvis_lhs;
+      path.z2c(i, !(width == null) && get_PLAUSIBLE_ROAD_WIDTH_M().y(width) ? width : NaN);
     }
-    path.k2d();
+    path.m2d();
     return path;
   }
   var properties_initialized_GpxToPath_kt_83hcm9;
@@ -1833,14 +1833,14 @@
     }
   }
   function writeDocument($this, w, document, writeExtensions) {
-    w.y1t('', 'http://www.topografix.com/GPX/1/1');
-    w.y1t('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.a1u('', 'http://www.topografix.com/GPX/1/1');
+    w.a1u('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.y1t('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.a1u('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
     var tmp;
     if (writeExtensions) {
-      var tmp0 = document.i2a_1;
+      var tmp0 = document.k2a_1;
       var tmp$ret$0;
       $l$block_2: {
         // Inline function 'kotlin.collections.any' call
@@ -1858,10 +1858,10 @@
         while (_iterator__ex2g4s.m()) {
           var element = _iterator__ex2g4s.n();
           var tmp_1;
-          if (element.p2a_1.equals(GpxPathKind_TRACK_getInstance()) && !(element.q2a_1 == null)) {
+          if (element.r2a_1.equals(GpxPathKind_TRACK_getInstance()) && !(element.s2a_1 == null)) {
             tmp_1 = true;
           } else {
-            var tmp0_0 = element.u2a();
+            var tmp0_0 = element.w2a();
             var tmp$ret$2;
             $l$block_1: {
               // Inline function 'kotlin.collections.any' call
@@ -1878,7 +1878,7 @@
               var _iterator__ex2g4s_0 = tmp0_0.l();
               while (_iterator__ex2g4s_0.m()) {
                 var element_0 = _iterator__ex2g4s_0.n();
-                if (!(element_0.d2b_1 == null)) {
+                if (!(element_0.f2b_1 == null)) {
                   tmp$ret$2 = true;
                   break $l$block_1;
                 }
@@ -1900,30 +1900,30 @@
     }
     var hasRoadWidth = tmp;
     if (hasRoadWidth) {
-      w.y1t('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
+      w.a1u('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
     }
-    w.a1u('http://www.topografix.com/GPX/1/1', 'gpx', '');
-    w.c1u(null, 'version', null, '1.1');
-    w.c1u(null, 'creator', null, '@glandais/vcyclist');
-    w.z1t('', 'http://www.topografix.com/GPX/1/1');
-    w.z1t('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.c1u('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.e1u(null, 'version', null, '1.1');
+    w.e1u(null, 'creator', null, '@glandais/vcyclist');
+    w.b1u('', 'http://www.topografix.com/GPX/1/1');
+    w.b1u('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.z1t('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.b1u('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
     if (hasRoadWidth) {
-      w.z1t('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
+      w.b1u('vc', 'https://github.com/glandais/vcyclist/xmlschemas/v1');
     }
-    w.c1u('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.h2a_1);
-    var _iterator__ex2g4s_1 = document.j2a_1.l();
+    w.e1u('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.j2a_1);
+    var _iterator__ex2g4s_1 = document.l2a_1.l();
     while (_iterator__ex2g4s_1.m()) {
       var waypoint = _iterator__ex2g4s_1.n();
       writeWaypoint($this, w, waypoint);
     }
-    var _iterator__ex2g4s_2 = document.i2a_1.l();
+    var _iterator__ex2g4s_2 = document.k2a_1.l();
     while (_iterator__ex2g4s_2.m()) {
       var track = _iterator__ex2g4s_2.n();
-      switch (track.p2a_1.y1_1) {
+      switch (track.r2a_1.y1_1) {
         case 1:
           writeRoute($this, w, track, writeExtensions);
           break;
@@ -1935,150 +1935,150 @@
           break;
       }
     }
-    w.f1u('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.h1u('http://www.topografix.com/GPX/1/1', 'gpx', '');
   }
   function writeWaypoint($this, w, waypoint) {
-    w.a1u('http://www.topografix.com/GPX/1/1', 'wpt', '');
-    w.c1u(null, 'lat', null, GpxDecimal_getInstance().j2b(waypoint.z29_1));
-    w.c1u(null, 'lon', null, GpxDecimal_getInstance().j2b(waypoint.a2a_1));
-    var tmp0_safe_receiver = waypoint.b2a_1;
+    w.c1u('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.e1u(null, 'lat', null, GpxDecimal_getInstance().l2b(waypoint.b2a_1));
+    w.e1u(null, 'lon', null, GpxDecimal_getInstance().l2b(waypoint.c2a_1));
+    var tmp0_safe_receiver = waypoint.d2a_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().j2b(tmp0_safe_receiver));
+      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().l2b(tmp0_safe_receiver));
     }
-    var tmp1_safe_receiver = waypoint.g2a_1;
+    var tmp1_safe_receiver = waypoint.i2a_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().yg(tmp1_safe_receiver).toString());
     }
-    var tmp2_safe_receiver = waypoint.c2a_1;
+    var tmp2_safe_receiver = waypoint.e2a_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.d2a_1;
+    var tmp3_safe_receiver = waypoint.f2a_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.e2a_1;
+    var tmp4_safe_receiver = waypoint.g2a_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.f2a_1;
+    var tmp5_safe_receiver = waypoint.h2a_1;
     if (tmp5_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp5_safe_receiver);
     }
-    w.f1u('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.h1u('http://www.topografix.com/GPX/1/1', 'wpt', '');
   }
   function writeMetadata($this, w, name) {
-    w.a1u('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.c1u('http://www.topografix.com/GPX/1/1', 'metadata', '');
     writeSimpleText($this, w, 'name', name);
-    w.f1u('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.h1u('http://www.topografix.com/GPX/1/1', 'metadata', '');
   }
   function writeTrack($this, w, track, writeExtensions) {
-    w.a1u('http://www.topografix.com/GPX/1/1', 'trk', '');
-    var tmp0_safe_receiver = track.m2a_1;
+    w.c1u('http://www.topografix.com/GPX/1/1', 'trk', '');
+    var tmp0_safe_receiver = track.o2a_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.n2a_1;
+    var tmp1_safe_receiver = track.p2a_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp1_safe_receiver);
     }
-    if (writeExtensions && !(track.q2a_1 == null)) {
-      w.a1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
-      writeRoadWidth($this, w, track.q2a_1);
-      w.f1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
+    if (writeExtensions && !(track.s2a_1 == null)) {
+      w.c1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      writeRoadWidth($this, w, track.s2a_1);
+      w.h1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    var _iterator__ex2g4s = track.o2a_1.l();
+    var _iterator__ex2g4s = track.q2a_1.l();
     while (_iterator__ex2g4s.m()) {
       var segment = _iterator__ex2g4s.n();
-      w.a1u('http://www.topografix.com/GPX/1/1', 'trkseg', '');
-      var _iterator__ex2g4s_0 = segment.t2a_1.l();
+      w.c1u('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      var _iterator__ex2g4s_0 = segment.v2a_1.l();
       while (_iterator__ex2g4s_0.m()) {
         var p = _iterator__ex2g4s_0.n();
         writeTrackPoint($this, w, p, writeExtensions);
       }
-      w.f1u('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      w.h1u('http://www.topografix.com/GPX/1/1', 'trkseg', '');
     }
-    w.f1u('http://www.topografix.com/GPX/1/1', 'trk', '');
+    w.h1u('http://www.topografix.com/GPX/1/1', 'trk', '');
   }
   function writeRoute($this, w, route, writeExtensions) {
-    w.a1u('http://www.topografix.com/GPX/1/1', 'rte', '');
-    var tmp0_safe_receiver = route.m2a_1;
+    w.c1u('http://www.topografix.com/GPX/1/1', 'rte', '');
+    var tmp0_safe_receiver = route.o2a_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.n2a_1;
+    var tmp1_safe_receiver = route.p2a_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.u2a().l();
+    var _iterator__ex2g4s = route.w2a().l();
     while (_iterator__ex2g4s.m()) {
       var p = _iterator__ex2g4s.n();
       writeTrackPoint($this, w, p, writeExtensions, 'rtept');
     }
-    w.f1u('http://www.topografix.com/GPX/1/1', 'rte', '');
+    w.h1u('http://www.topografix.com/GPX/1/1', 'rte', '');
   }
   function writeTrackPoint($this, w, p, writeExtensions, localName) {
     localName = localName === VOID ? 'trkpt' : localName;
-    w.a1u('http://www.topografix.com/GPX/1/1', localName, '');
-    w.c1u(null, 'lat', null, GpxDecimal_getInstance().j2b(p.v2a_1));
-    w.c1u(null, 'lon', null, GpxDecimal_getInstance().j2b(p.w2a_1));
-    var tmp0_safe_receiver = p.x2a_1;
+    w.c1u('http://www.topografix.com/GPX/1/1', localName, '');
+    w.e1u(null, 'lat', null, GpxDecimal_getInstance().l2b(p.x2a_1));
+    w.e1u(null, 'lon', null, GpxDecimal_getInstance().l2b(p.y2a_1));
+    var tmp0_safe_receiver = p.z2a_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().j2b(tmp0_safe_receiver));
+      writeSimpleText(GpxWriter_instance, w, 'ele', GpxDecimal_getInstance().l2b(tmp0_safe_receiver));
     }
-    var tmp1_safe_receiver = p.y2a_1;
+    var tmp1_safe_receiver = p.a2b_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().yg(tmp1_safe_receiver).toString());
     }
-    var hasGarminExt = !(p.z2a_1 == null) || !(p.a2b_1 == null) || !(p.b2b_1 == null);
-    var hasPower = !(p.c2b_1 == null);
-    var hasRoadWidth = !(p.d2b_1 == null);
+    var hasGarminExt = !(p.b2b_1 == null) || !(p.c2b_1 == null) || !(p.d2b_1 == null);
+    var hasPower = !(p.e2b_1 == null);
+    var hasRoadWidth = !(p.f2b_1 == null);
     if (writeExtensions && (hasGarminExt || hasPower || hasRoadWidth)) {
-      w.a1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
-      var tmp2_safe_receiver = p.c2b_1;
+      w.c1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      var tmp2_safe_receiver = p.e2b_1;
       if (tmp2_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        writeSimpleText(GpxWriter_instance, w, 'power', GpxDecimal_getInstance().j2b(tmp2_safe_receiver));
+        writeSimpleText(GpxWriter_instance, w, 'power', GpxDecimal_getInstance().l2b(tmp2_safe_receiver));
       }
-      var tmp3_safe_receiver = p.d2b_1;
+      var tmp3_safe_receiver = p.f2b_1;
       if (tmp3_safe_receiver == null)
         null;
       else {
@@ -2086,66 +2086,66 @@
         writeRoadWidth(GpxWriter_instance, w, tmp3_safe_receiver);
       }
       if (hasGarminExt) {
-        w.a1u('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
-        var tmp4_safe_receiver = p.z2a_1;
+        w.c1u('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        var tmp4_safe_receiver = p.b2b_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.a2b_1;
+        var tmp5_safe_receiver = p.c2b_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.b2b_1;
+        var tmp6_safe_receiver = p.d2b_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().j2b(tmp6_safe_receiver));
+          writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'atemp', 'gpxtpx', GpxDecimal_getInstance().l2b(tmp6_safe_receiver));
         }
-        w.f1u('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        w.h1u('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
       }
-      w.f1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.h1u('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    w.f1u('http://www.topografix.com/GPX/1/1', localName, '');
+    w.h1u('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().j2b(widthM));
+    return writeNamespaced($this, w, 'https://github.com/glandais/vcyclist/xmlschemas/v1', 'roadWidth', 'vc', GpxDecimal_getInstance().l2b(widthM));
   }
   function writeSimpleText($this, w, localName, text) {
-    w.a1u('http://www.topografix.com/GPX/1/1', localName, '');
-    w.b1u(text);
-    w.f1u('http://www.topografix.com/GPX/1/1', localName, '');
+    w.c1u('http://www.topografix.com/GPX/1/1', localName, '');
+    w.d1u(text);
+    w.h1u('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeNamespaced($this, w, namespace, localName, prefix, text) {
-    w.a1u(namespace, localName, prefix);
-    w.b1u(text);
-    w.f1u(namespace, localName, prefix);
+    w.c1u(namespace, localName, prefix);
+    w.d1u(text);
+    w.h1u(namespace, localName, prefix);
   }
   function GpxWriter() {
-    this.l2d_1 = 'http://www.topografix.com/GPX/1/1';
-    this.m2d_1 = 'http://www.w3.org/2001/XMLSchema-instance';
-    this.n2d_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
-    this.o2d_1 = 'https://github.com/glandais/vcyclist/xmlschemas/v1';
-    this.p2d_1 = 'vc';
-    this.q2d_1 = 'xsi';
-    this.r2d_1 = 'gpxtpx';
-    this.s2d_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
-    this.t2d_1 = '@glandais/vcyclist';
-  }
-  protoOf(GpxWriter).u2d = function (document, writeExtensions) {
+    this.n2d_1 = 'http://www.topografix.com/GPX/1/1';
+    this.o2d_1 = 'http://www.w3.org/2001/XMLSchema-instance';
+    this.p2d_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
+    this.q2d_1 = 'https://github.com/glandais/vcyclist/xmlschemas/v1';
+    this.r2d_1 = 'vc';
+    this.s2d_1 = 'xsi';
+    this.t2d_1 = 'gpxtpx';
+    this.u2d_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
+    this.v2d_1 = '@glandais/vcyclist';
+  }
+  protoOf(GpxWriter).w2d = function (document, writeExtensions) {
     var out = StringBuilder_init_$Create$();
     out.x6('<?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.g1s();
+      writer.i1s();
     }
     return out.toString();
   };
@@ -2256,11 +2256,11 @@
     while (i < refs.o()) {
       var high = refs.p(i);
       var low = getOrNull(refs, i + 1 | 0);
-      if (!(low == null) && high.w2d_1 === low.v2d_1 && isHighSurrogate_0($this, high.x2d_1) && isLowSurrogate_0($this, low.x2d_1)) {
-        sb.ba(xml, copiedUpTo, high.v2d_1);
-        var codePoint = (65536 + imul(high.x2d_1 - 55296 | 0, 1024) | 0) + (low.x2d_1 - 56320 | 0) | 0;
+      if (!(low == null) && high.y2d_1 === low.x2d_1 && isHighSurrogate_0($this, high.z2d_1) && isLowSurrogate_0($this, low.z2d_1)) {
+        sb.ba(xml, copiedUpTo, high.x2d_1);
+        var codePoint = (65536 + imul(high.z2d_1 - 55296 | 0, 1024) | 0) + (low.z2d_1 - 56320 | 0) | 0;
         sb.x6('&#').da(codePoint).y6(_Char___init__impl__6a9atx(59));
-        copiedUpTo = low.w2d_1;
+        copiedUpTo = low.y2d_1;
         count = count + 1 | 0;
         i = i + 2 | 0;
       } else {
@@ -2273,17 +2273,17 @@
     return new Pair(sb.toString(), count);
   }
   function NumericRef(start, end, value) {
-    this.v2d_1 = start;
-    this.w2d_1 = end;
-    this.x2d_1 = value;
+    this.x2d_1 = start;
+    this.y2d_1 = end;
+    this.z2d_1 = value;
   }
   protoOf(NumericRef).toString = function () {
-    return 'NumericRef(start=' + this.v2d_1 + ', end=' + this.w2d_1 + ', value=' + this.x2d_1 + ')';
+    return 'NumericRef(start=' + this.x2d_1 + ', end=' + this.y2d_1 + ', value=' + this.z2d_1 + ')';
   };
   protoOf(NumericRef).hashCode = function () {
-    var result = this.v2d_1;
-    result = imul(result, 31) + this.w2d_1 | 0;
-    result = imul(result, 31) + this.x2d_1 | 0;
+    var result = this.x2d_1;
+    result = imul(result, 31) + this.y2d_1 | 0;
+    result = imul(result, 31) + this.z2d_1 | 0;
     return result;
   };
   protoOf(NumericRef).equals = function (other) {
@@ -2291,11 +2291,11 @@
       return true;
     if (!(other instanceof NumericRef))
       return false;
-    if (!(this.v2d_1 === other.v2d_1))
+    if (!(this.x2d_1 === other.x2d_1))
       return false;
-    if (!(this.w2d_1 === other.w2d_1))
+    if (!(this.y2d_1 === other.y2d_1))
       return false;
-    if (!(this.x2d_1 === other.x2d_1))
+    if (!(this.z2d_1 === other.z2d_1))
       return false;
     return true;
   };
@@ -2328,7 +2328,7 @@
   function verbatimSpanEnd($this, xml, start) {
     if (!(charCodeAt(xml, start) === _Char___init__impl__6a9atx(60)))
       return -1;
-    var _iterator__ex2g4s = $this.j2c_1.l();
+    var _iterator__ex2g4s = $this.l2c_1.l();
     while (_iterator__ex2g4s.m()) {
       var _destruct__k2r9zo = _iterator__ex2g4s.n();
       var open = _destruct__k2r9zo.md();
@@ -2402,21 +2402,21 @@
     }
     if (j >= n || !(charCodeAt(xml, j) === _Char___init__impl__6a9atx(59)))
       return -1;
-    return $this.i2c_1.m1(substring(xml, nameStart, j)) ? j : -1;
+    return $this.k2c_1.m1(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.i2c_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
-    this.j2c_1 = listOf_0([to('<![CDATA[', ']]>'), to('<!--', '-->'), to('<?', '?>')]);
-    this.k2c_1 = 20;
+    this.k2c_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
+    this.l2c_1 = listOf_0([to('<![CDATA[', ']]>'), to('<!--', '-->'), to('<?', '?>')]);
+    this.m2c_1 = 20;
   }
-  protoOf(GpxXmlRepair).l2c = function (xml) {
-    return this.a2e(xml).y2d_1;
+  protoOf(GpxXmlRepair).n2c = function (xml) {
+    return this.c2e(xml).a2e_1;
   };
-  protoOf(GpxXmlRepair).a2e = function (xml) {
+  protoOf(GpxXmlRepair).c2e = function (xml) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var repairs = ArrayList_init_$Create$();
     var current = xml;
@@ -2475,15 +2475,15 @@
     return GpxXmlRepair_instance;
   }
   function RepairResult(xml, repairs) {
-    this.y2d_1 = xml;
-    this.z2d_1 = repairs;
+    this.a2e_1 = xml;
+    this.b2e_1 = repairs;
   }
   protoOf(RepairResult).toString = function () {
-    return 'RepairResult(xml=' + this.y2d_1 + ', repairs=' + toString_0(this.z2d_1) + ')';
+    return 'RepairResult(xml=' + this.a2e_1 + ', repairs=' + toString_0(this.b2e_1) + ')';
   };
   protoOf(RepairResult).hashCode = function () {
-    var result = getStringHashCode(this.y2d_1);
-    result = imul(result, 31) + hashCode(this.z2d_1) | 0;
+    var result = getStringHashCode(this.a2e_1);
+    result = imul(result, 31) + hashCode(this.b2e_1) | 0;
     return result;
   };
   protoOf(RepairResult).equals = function (other) {
@@ -2491,17 +2491,17 @@
       return true;
     if (!(other instanceof RepairResult))
       return false;
-    if (!(this.y2d_1 === other.y2d_1))
+    if (!(this.a2e_1 === other.a2e_1))
       return false;
-    if (!equals(this.z2d_1, other.z2d_1))
+    if (!equals(this.b2e_1, other.b2e_1))
       return false;
     return true;
   };
   function OsmHighway() {
     OsmHighway_instance = this;
-    this.v2c_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.x2c_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).w2c = function (highway) {
+  protoOf(OsmHighway).y2c = function (highway) {
     var tmp;
     if (highway == null) {
       tmp = null;
@@ -2522,7 +2522,7 @@
     // Inline function 'kotlin.text.isNullOrEmpty' call
     if (key == null || charSequenceLength(key) === 0)
       return null;
-    return this.v2c_1.t1(key);
+    return this.x2c_1.t1(key);
   };
   var OsmHighway_instance;
   function OsmHighway_getInstance() {
@@ -2547,9 +2547,9 @@
     var negative = value < 0.0;
     // Inline function 'kotlin.math.abs' call
     var absValue = Math.abs(value);
-    var scale = toNumber($this.c2e_1[decimals]);
+    var scale = toNumber($this.e2e_1[decimals]);
     var scaledLong = numberToLong(round(absValue * scale));
-    var whole = $this.c2e_1[decimals];
+    var whole = $this.e2e_1[decimals];
     var intPart = divide(scaledLong, whole);
     var sign = negative && !equalsLong(scaledLong, new Long(0, 0)) ? '-' : '';
     var tmp;
@@ -2563,7 +2563,7 @@
   }
   function CsvNumberFormat() {
     CsvNumberFormat_instance = this;
-    this.b2e_1 = 12;
+    this.d2e_1 = 12;
     var tmp = this;
     // Inline function 'kotlin.also' call
     var this_0 = longArray(13);
@@ -2578,9 +2578,9 @@
         p = multiply(p, new Long(10, 0));
       }
        while (inductionVariable <= last);
-    tmp.c2e_1 = this_0;
+    tmp.e2e_1 = this_0;
   }
-  protoOf(CsvNumberFormat).d2e = function (value, decimals) {
+  protoOf(CsvNumberFormat).f2e = function (value, decimals) {
     if (isNaN_0(value))
       return '';
     if (isInfinite(value))
@@ -2610,21 +2610,21 @@
     unitsInHeader = unitsInHeader === VOID ? true : unitsInHeader;
     decimals = decimals === VOID ? null : decimals;
     lineSeparator = lineSeparator === VOID ? '\n' : lineSeparator;
-    this.e2e_1 = fields;
-    this.f2e_1 = separator;
-    this.g2e_1 = unitsInHeader;
-    this.h2e_1 = decimals;
-    this.i2e_1 = lineSeparator;
+    this.g2e_1 = fields;
+    this.h2e_1 = separator;
+    this.i2e_1 = unitsInHeader;
+    this.j2e_1 = decimals;
+    this.k2e_1 = lineSeparator;
   }
   protoOf(CsvOptions).toString = function () {
-    return 'CsvOptions(fields=' + toString(this.e2e_1) + ', separator=' + toString_1(this.f2e_1) + ', unitsInHeader=' + this.g2e_1 + ', decimals=' + this.h2e_1 + ', lineSeparator=' + this.i2e_1 + ')';
+    return 'CsvOptions(fields=' + toString(this.g2e_1) + ', separator=' + toString_1(this.h2e_1) + ', unitsInHeader=' + this.i2e_1 + ', decimals=' + this.j2e_1 + ', lineSeparator=' + this.k2e_1 + ')';
   };
   protoOf(CsvOptions).hashCode = function () {
-    var result = this.e2e_1 == null ? 0 : hashCode(this.e2e_1);
-    result = imul(result, 31) + Char__hashCode_impl_otmys(this.f2e_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.g2e_1) | 0;
-    result = imul(result, 31) + (this.h2e_1 == null ? 0 : this.h2e_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.i2e_1) | 0;
+    var result = this.g2e_1 == null ? 0 : hashCode(this.g2e_1);
+    result = imul(result, 31) + Char__hashCode_impl_otmys(this.h2e_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.i2e_1) | 0;
+    result = imul(result, 31) + (this.j2e_1 == null ? 0 : this.j2e_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.k2e_1) | 0;
     return result;
   };
   protoOf(CsvOptions).equals = function (other) {
@@ -2632,20 +2632,20 @@
       return true;
     if (!(other instanceof CsvOptions))
       return false;
-    if (!equals(this.e2e_1, other.e2e_1))
+    if (!equals(this.g2e_1, other.g2e_1))
       return false;
-    if (!(this.f2e_1 === other.f2e_1))
+    if (!(this.h2e_1 === other.h2e_1))
       return false;
-    if (!(this.g2e_1 === other.g2e_1))
+    if (!(this.i2e_1 === other.i2e_1))
       return false;
-    if (!(this.h2e_1 == other.h2e_1))
+    if (!(this.j2e_1 == other.j2e_1))
       return false;
-    if (!(this.i2e_1 === other.i2e_1))
+    if (!(this.k2e_1 === other.k2e_1))
       return false;
     return true;
   };
   function headerFor($this, field, unitsInHeader) {
-    return unitsInHeader ? field.l2e_1 + ' (' + field.m2e_1 + ')' : field.l2e_1;
+    return unitsInHeader ? field.n2e_1 + ' (' + field.o2e_1 + ')' : field.n2e_1;
   }
   function appendRow($this, sb, cells, options) {
     var iterator = cells.l();
@@ -2655,9 +2655,9 @@
       index = index + 1 | 0;
       var cell = iterator.n();
       if (i > 0) {
-        sb.y6(options.f2e_1);
+        sb.y6(options.h2e_1);
       }
-      sb.x6(escapeCsvCell($this, cell, options.f2e_1));
+      sb.x6(escapeCsvCell($this, cell, options.h2e_1));
     }
   }
   function escapeCsvCell($this, cell, separator) {
@@ -2686,8 +2686,8 @@
   }
   function CsvWriter() {
   }
-  protoOf(CsvWriter).s2e = function (path, options) {
-    var tmp0_elvis_lhs = options.e2e_1;
+  protoOf(CsvWriter).u2e = function (path, options) {
+    var tmp0_elvis_lhs = options.g2e_1;
     var fields = tmp0_elvis_lhs == null ? get_entries_3() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
     // Inline function 'kotlin.collections.map' call
@@ -2696,24 +2696,24 @@
     var _iterator__ex2g4s = fields.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.g2e_1);
+      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.i2e_1);
       destination.k(tmp$ret$2);
     }
     appendRow(this, sb, destination, options);
     var inductionVariable = 0;
-    var last = path.q2b_1;
+    var last = path.s2b_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        sb.x6(options.i2e_1);
+        sb.x6(options.k2e_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().d2e(path.t2e(i, item_0), options.h2e_1);
+          var tmp$ret$5 = CsvNumberFormat_getInstance().f2e(path.v2e(i, item_0), options.j2e_1);
           destination_0.k(tmp$ret$5);
         }
         appendRow(this, sb, destination_0, options);
@@ -2730,19 +2730,19 @@
     pretty = pretty === VOID ? false : pretty;
     decimals = decimals === VOID ? null : decimals;
     includeMeta = includeMeta === VOID ? true : includeMeta;
-    this.u2e_1 = fields;
-    this.v2e_1 = pretty;
-    this.w2e_1 = decimals;
-    this.x2e_1 = includeMeta;
+    this.w2e_1 = fields;
+    this.x2e_1 = pretty;
+    this.y2e_1 = decimals;
+    this.z2e_1 = includeMeta;
   }
   protoOf(JsonOptions).toString = function () {
-    return 'JsonOptions(fields=' + toString(this.u2e_1) + ', pretty=' + this.v2e_1 + ', decimals=' + this.w2e_1 + ', includeMeta=' + this.x2e_1 + ')';
+    return 'JsonOptions(fields=' + toString(this.w2e_1) + ', pretty=' + this.x2e_1 + ', decimals=' + this.y2e_1 + ', includeMeta=' + this.z2e_1 + ')';
   };
   protoOf(JsonOptions).hashCode = function () {
-    var result = this.u2e_1 == null ? 0 : hashCode(this.u2e_1);
-    result = imul(result, 31) + getBooleanHashCode(this.v2e_1) | 0;
-    result = imul(result, 31) + (this.w2e_1 == null ? 0 : this.w2e_1) | 0;
+    var result = this.w2e_1 == null ? 0 : hashCode(this.w2e_1);
     result = imul(result, 31) + getBooleanHashCode(this.x2e_1) | 0;
+    result = imul(result, 31) + (this.y2e_1 == null ? 0 : this.y2e_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.z2e_1) | 0;
     return result;
   };
   protoOf(JsonOptions).equals = function (other) {
@@ -2750,13 +2750,13 @@
       return true;
     if (!(other instanceof JsonOptions))
       return false;
-    if (!equals(this.u2e_1, other.u2e_1))
+    if (!equals(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 (!(this.w2e_1 == other.w2e_1))
+    if (!(this.y2e_1 == other.y2e_1))
       return false;
-    if (!(this.x2e_1 === other.x2e_1))
+    if (!(this.z2e_1 === other.z2e_1))
       return false;
     return true;
   };
@@ -2764,17 +2764,17 @@
     var inner = indent + indent;
     appendKeyRaw($this, sb, indent, 'meta', colon);
     sb.y6(_Char___init__impl__6a9atx(123)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.a2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.c2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.i2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.k2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.d2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.f2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.e2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.g2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationGainFiltered', numberOrNull($this, path.f2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationGainFiltered', numberOrNull($this, path.h2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationLossFiltered', numberOrNull($this, path.g2d_1, decimals), colon);
+    appendKeyValueRaw($this, sb, inner, 'elevationLossFiltered', numberOrNull($this, path.i2d_1, decimals), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
     appendKeyRaw($this, sb, inner, 'units', colon);
     sb.y6(_Char___init__impl__6a9atx(123)).x6(nl);
@@ -2785,7 +2785,7 @@
       var i = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyValueRaw($this, sb, innerUnits, $this.y2e(field.l2e_1), '"' + $this.y2e(field.m2e_1) + '"', colon);
+      appendKeyValueRaw($this, sb, innerUnits, $this.a2f(field.n2e_1), '"' + $this.a2f(field.o2e_1) + '"', colon);
       if (!(i === get_lastIndex(fields))) {
         sb.y6(_Char___init__impl__6a9atx(44));
       }
@@ -2803,10 +2803,10 @@
       var fi = index;
       index = index + 1 | 0;
       var field = iterator.n();
-      appendKeyRaw($this, sb, inner, $this.y2e(field.l2e_1), colon);
+      appendKeyRaw($this, sb, inner, $this.a2f(field.n2e_1), colon);
       sb.y6(_Char___init__impl__6a9atx(91));
       var inductionVariable = 0;
-      var last = path.q2b_1;
+      var last = path.s2b_1;
       if (inductionVariable < last)
         do {
           var i = inductionVariable;
@@ -2814,7 +2814,7 @@
           if (i > 0) {
             sb.y6(_Char___init__impl__6a9atx(44));
           }
-          sb.x6(numberOrNull($this, path.t2e(i, field), options.w2e_1));
+          sb.x6(numberOrNull($this, path.v2e(i, field), options.y2e_1));
         }
          while (inductionVariable < last);
       sb.y6(_Char___init__impl__6a9atx(93));
@@ -2831,7 +2831,7 @@
     if (isNaN_0(value) || isInfinite(value)) {
       tmp = 'null';
     } else {
-      tmp = CsvNumberFormat_getInstance().d2e(value, decimals);
+      tmp = CsvNumberFormat_getInstance().f2e(value, decimals);
     }
     return tmp;
   }
@@ -2844,18 +2844,18 @@
   }
   function JsonWriter() {
   }
-  protoOf(JsonWriter).z2e = function (path, options) {
-    var tmp0_elvis_lhs = options.u2e_1;
+  protoOf(JsonWriter).b2f = function (path, options) {
+    var tmp0_elvis_lhs = options.w2e_1;
     var fields = tmp0_elvis_lhs == null ? get_entries_3() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
-    var indent = options.v2e_1 ? '  ' : '';
-    var nl = options.v2e_1 ? '\n' : '';
-    var colon = options.v2e_1 ? ': ' : ':';
+    var indent = options.x2e_1 ? '  ' : '';
+    var nl = options.x2e_1 ? '\n' : '';
+    var colon = options.x2e_1 ? ': ' : ':';
     sb.y6(_Char___init__impl__6a9atx(123)).x6(nl);
-    appendKeyValueRaw(this, sb, indent, 'size', path.q2b_1.toString(), colon);
+    appendKeyValueRaw(this, sb, indent, 'size', path.s2b_1.toString(), colon);
     sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
-    if (options.x2e_1) {
-      appendMeta(this, sb, path, fields, options.w2e_1, indent, nl, colon);
+    if (options.z2e_1) {
+      appendMeta(this, sb, path, fields, options.y2e_1, indent, nl, colon);
       sb.y6(_Char___init__impl__6a9atx(44)).x6(nl);
     }
     appendKeyRaw(this, sb, indent, 'fields', colon);
@@ -2863,7 +2863,7 @@
     sb.x6(nl).y6(_Char___init__impl__6a9atx(125));
     return sb.toString();
   };
-  protoOf(JsonWriter).y2e = function (value) {
+  protoOf(JsonWriter).a2f = function (value) {
     var sb = StringBuilder_init_$Create$_0(value.length);
     var inductionVariable = 0;
     var last = value.length;
@@ -2899,17 +2899,17 @@
     return JsonWriter_instance;
   }
   function DeckDetection(accepted, rejected, tallRunsTooShort) {
-    this.a2f_1 = accepted;
-    this.b2f_1 = rejected;
-    this.c2f_1 = tallRunsTooShort;
+    this.c2f_1 = accepted;
+    this.d2f_1 = rejected;
+    this.e2f_1 = tallRunsTooShort;
   }
   protoOf(DeckDetection).toString = function () {
-    return 'DeckDetection(accepted=' + toString_0(this.a2f_1) + ', rejected=' + toString_0(this.b2f_1) + ', tallRunsTooShort=' + this.c2f_1 + ')';
+    return 'DeckDetection(accepted=' + toString_0(this.c2f_1) + ', rejected=' + toString_0(this.d2f_1) + ', tallRunsTooShort=' + this.e2f_1 + ')';
   };
   protoOf(DeckDetection).hashCode = function () {
-    var result = hashCode(this.a2f_1);
-    result = imul(result, 31) + hashCode(this.b2f_1) | 0;
-    result = imul(result, 31) + this.c2f_1 | 0;
+    var result = hashCode(this.c2f_1);
+    result = imul(result, 31) + hashCode(this.d2f_1) | 0;
+    result = imul(result, 31) + this.e2f_1 | 0;
     return result;
   };
   protoOf(DeckDetection).equals = function (other) {
@@ -2917,34 +2917,34 @@
       return true;
     if (!(other instanceof DeckDetection))
       return false;
-    if (!equals(this.a2f_1, other.a2f_1))
+    if (!equals(this.c2f_1, other.c2f_1))
       return false;
-    if (!equals(this.b2f_1, other.b2f_1))
+    if (!equals(this.d2f_1, other.d2f_1))
       return false;
-    if (!(this.c2f_1 === other.c2f_1))
+    if (!(this.e2f_1 === other.e2f_1))
       return false;
     return true;
   };
   function DeckCandidate(first, last, startM, endM, metrics, rejection, deckRanges) {
-    this.d2f_1 = first;
-    this.e2f_1 = last;
-    this.f2f_1 = startM;
-    this.g2f_1 = endM;
-    this.h2f_1 = metrics;
-    this.i2f_1 = rejection;
-    this.j2f_1 = deckRanges;
+    this.f2f_1 = first;
+    this.g2f_1 = last;
+    this.h2f_1 = startM;
+    this.i2f_1 = endM;
+    this.j2f_1 = metrics;
+    this.k2f_1 = rejection;
+    this.l2f_1 = deckRanges;
   }
   protoOf(DeckCandidate).toString = function () {
-    return 'DeckCandidate(first=' + this.d2f_1 + ', last=' + this.e2f_1 + ', startM=' + this.f2f_1 + ', endM=' + this.g2f_1 + ', metrics=' + toString(this.h2f_1) + ', rejection=' + toString(this.i2f_1) + ', deckRanges=' + toString_0(this.j2f_1) + ')';
+    return 'DeckCandidate(first=' + this.f2f_1 + ', last=' + this.g2f_1 + ', startM=' + this.h2f_1 + ', endM=' + this.i2f_1 + ', metrics=' + toString(this.j2f_1) + ', rejection=' + toString(this.k2f_1) + ', deckRanges=' + toString_0(this.l2f_1) + ')';
   };
   protoOf(DeckCandidate).hashCode = function () {
-    var result = this.d2f_1;
-    result = imul(result, 31) + this.e2f_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.g2f_1) | 0;
-    result = imul(result, 31) + (this.h2f_1 == null ? 0 : this.h2f_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.i2f_1 == null ? 0 : this.i2f_1.hashCode()) | 0;
-    result = imul(result, 31) + hashCode(this.j2f_1) | 0;
+    var result = this.f2f_1;
+    result = imul(result, 31) + this.g2f_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h2f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i2f_1) | 0;
+    result = imul(result, 31) + (this.j2f_1 == null ? 0 : this.j2f_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.k2f_1 == null ? 0 : this.k2f_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.l2f_1) | 0;
     return result;
   };
   protoOf(DeckCandidate).equals = function (other) {
@@ -2952,13 +2952,9 @@
       return true;
     if (!(other instanceof DeckCandidate))
       return false;
-    if (!(this.d2f_1 === other.d2f_1))
-      return false;
-    if (!(this.e2f_1 === other.e2f_1))
-      return false;
-    if (!equals(this.f2f_1, other.f2f_1))
+    if (!(this.f2f_1 === other.f2f_1))
       return false;
-    if (!equals(this.g2f_1, other.g2f_1))
+    if (!(this.g2f_1 === other.g2f_1))
       return false;
     if (!equals(this.h2f_1, other.h2f_1))
       return false;
@@ -2966,11 +2962,15 @@
       return false;
     if (!equals(this.j2f_1, other.j2f_1))
       return false;
+    if (!equals(this.k2f_1, other.k2f_1))
+      return false;
+    if (!equals(this.l2f_1, other.l2f_1))
+      return false;
     return true;
   };
   function Companion_1() {
   }
-  protoOf(Companion_1).k2f = function (mnsM, mntM) {
+  protoOf(Companion_1).m2f = function (mnsM, mntM) {
     // Inline function 'kotlin.require' call
     if (!(mnsM.length === mntM.length)) {
       var message = 'MNS and MNT sizes differ: ' + mnsM.length + ', ' + mntM.length;
@@ -2991,23 +2991,23 @@
     return Companion_instance_2;
   }
   function DeckProfile(mnhM, mnsM, mntM) {
-    this.l2f_1 = mnhM;
-    this.m2f_1 = mnsM;
-    this.n2f_1 = mntM;
+    this.n2f_1 = mnhM;
+    this.o2f_1 = mnsM;
+    this.p2f_1 = mntM;
     // Inline function 'kotlin.require' call
-    if (!(this.l2f_1.length === this.m2f_1.length && this.m2f_1.length === this.n2f_1.length)) {
-      var message = 'MNH, MNS and MNT must have one sample per station: ' + this.l2f_1.length + ', ' + this.m2f_1.length + ', ' + this.n2f_1.length;
+    if (!(this.n2f_1.length === this.o2f_1.length && this.o2f_1.length === this.p2f_1.length)) {
+      var message = 'MNH, MNS and MNT must have one sample per station: ' + this.n2f_1.length + ', ' + this.o2f_1.length + ', ' + this.p2f_1.length;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   protoOf(DeckProfile).o = function () {
-    return this.l2f_1.length;
+    return this.n2f_1.length;
   };
   function SurfaceState(mnh, mf, rough, clean) {
-    this.o2f_1 = mnh;
-    this.p2f_1 = mf;
-    this.q2f_1 = rough;
-    this.r2f_1 = clean;
+    this.q2f_1 = mnh;
+    this.r2f_1 = mf;
+    this.s2f_1 = rough;
+    this.t2f_1 = clean;
   }
   function roughness($this, mns, mf, half) {
     var tmp = 0;
@@ -3021,7 +3021,7 @@
       tmp = tmp + 1 | 0;
     }
     var sq = tmp_1;
-    var mean = $this.s2f(sq, half);
+    var mean = $this.u2f(sq, half);
     var tmp_3 = 0;
     var tmp_4 = mns.length;
     var tmp_5 = new Float64Array(tmp_4);
@@ -3066,7 +3066,7 @@
     if (tmp_0) {
       tmp = NaN;
     } else {
-      tmp = $this.t2f(values, 0.95);
+      tmp = $this.v2f(values, 0.95);
     }
     return tmp;
   }
@@ -3095,16 +3095,16 @@
     return tmp;
   }
   function sam$kotlin_Comparator$0(function_0) {
-    this.u2f_1 = function_0;
+    this.w2f_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).mb = function (a, b) {
-    return this.u2f_1(a, b);
+    return this.w2f_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.mb(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).h2 = function () {
-    return this.u2f_1;
+    return this.w2f_1;
   };
   protoOf(sam$kotlin_Comparator$0).equals = function (other) {
     var tmp;
@@ -3127,8 +3127,8 @@
   function detect$classify($options, slope, clean, mns, mnh, rough, mnt, n, step, mf, span, fraction) {
     var a = span.v_1;
     var b = span.w_1;
-    var short = (b - a | 0) <= $options.u2g();
-    var h = $options.v2g();
+    var short = (b - a | 0) <= $options.w2g();
+    var h = $options.x2g();
     var tmp;
     if (short) {
       tmp = new Float64Array(0);
@@ -3148,8 +3148,8 @@
       tmp = tmp_2;
     }
     var rawSlopes = tmp;
-    var cleanFraction = short ? NaN : DeckDetector_instance.w2g(clean, a, b, h);
-    var cleanSlopes = !short && $options.n2g_1 ? DeckDetector_instance.x2g(mns, mnh, clean, cleanFraction, a, b, $options) : null;
+    var cleanFraction = short ? NaN : DeckDetector_instance.y2g(clean, a, b, h);
+    var cleanSlopes = !short && $options.p2g_1 ? DeckDetector_instance.z2g(mns, mnh, clean, cleanFraction, a, b, $options) : null;
     var slopes = cleanSlopes == null ? rawSlopes : cleanSlopes;
     var slopeP95 = p95OrNaN(DeckDetector_instance, slopes);
     var tmp_4;
@@ -3169,7 +3169,7 @@
       do {
         var element = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        if (mnh[element] > $options.w2f_1) {
+        if (mnh[element] > $options.y2f_1) {
           destination.k(element);
         }
       }
@@ -3329,7 +3329,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.j2g_1) ? DeckRejection_NO_CANYON_getInstance() : short && isNaN_0(roughness) ? DeckRejection_NO_DATA_getInstance() : short ? roughness < $options.i2g_1 ? null : DeckRejection_SHORT_ROUGH_getInstance() : isNaN_0(slopeP95) ? DeckRejection_NO_DATA_getInstance() : slopeP95 <= $options.f2g_1 && (b - a | 0) * step >= $options.g2g_1 ? null : DeckRejection_STEEP_getInstance();
+    var rejection = stoppedOnNaN || isNaN_0(mntDrop) ? DeckRejection_NO_DATA_getInstance() : !(mntDrop > $options.l2g_1) ? DeckRejection_NO_CANYON_getInstance() : short && isNaN_0(roughness) ? DeckRejection_NO_DATA_getInstance() : short ? roughness < $options.k2g_1 ? null : DeckRejection_SHORT_ROUGH_getInstance() : isNaN_0(slopeP95) ? DeckRejection_NO_DATA_getInstance() : slopeP95 <= $options.h2g_1 && (b - a | 0) * step >= $options.i2g_1 ? null : DeckRejection_STEEP_getInstance();
     return to(metrics, rejection);
   }
   function DeckDetector$detect$lambda($mf) {
@@ -3339,8 +3339,8 @@
   }
   function DeckDetector$detect$lambda_0(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.d2f_1;
-    var tmp$ret$2 = b.d2f_1;
+    var tmp = a.f2f_1;
+    var tmp$ret$2 = b.f2f_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckDetector$detect$lambda_1($this) {
@@ -3351,8 +3351,8 @@
         tmp = previousCompare;
       } else {
         // Inline function 'kotlin.comparisons.compareValuesBy' call
-        var tmp_0 = a.e2f_1;
-        var tmp$ret$2 = b.e2f_1;
+        var tmp_0 = a.g2f_1;
+        var tmp$ret$2 = b.g2f_1;
         tmp = compareValues(tmp_0, tmp$ret$2);
       }
       return tmp;
@@ -3371,33 +3371,33 @@
   }
   function DeckDetector() {
   }
-  protoOf(DeckDetector).y2g = function (profile, options) {
+  protoOf(DeckDetector).a2h = function (profile, options) {
     var n = profile.o();
-    var mns = profile.m2f_1;
-    var mnt = profile.n2f_1;
-    var step = options.v2f_1;
+    var mns = profile.o2f_1;
+    var mnt = profile.p2f_1;
+    var step = options.x2f_1;
     if (n === 0)
       return new DeckDetection(emptyList(), emptyList(), 0);
-    var state = this.z2g(profile, options);
-    var mnh = state.o2f_1;
-    var mf = state.p2f_1;
-    var rough = state.q2f_1;
+    var state = this.b2h(profile, options);
+    var mnh = state.q2f_1;
+    var mf = state.r2f_1;
+    var rough = state.s2f_1;
     var tmp = 0;
     var tmp_0 = booleanArray(n);
     while (tmp < n) {
       var tmp_1 = tmp;
-      tmp_0[tmp_1] = mnh[tmp_1] > options.w2f_1;
+      tmp_0[tmp_1] = mnh[tmp_1] > options.y2f_1;
       tmp = tmp + 1 | 0;
     }
     var tall = tmp_0;
-    var tallRuns = this.a2h(tall);
+    var tallRuns = this.c2h(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.w_1 - element.v_1 | 0) + 1 | 0) >= options.b2h()) {
+      if (((element.w_1 - element.v_1 | 0) + 1 | 0) >= options.d2h()) {
         destination.k(element);
       }
     }
@@ -3430,7 +3430,7 @@
           do {
             var element_0 = inductionVariable;
             inductionVariable = inductionVariable + 1 | 0;
-            if (rough[element_0] < options.a2g_1) {
+            if (rough[element_0] < options.c2g_1) {
               count = count + 1 | 0;
               checkCountOverflow(count);
             }
@@ -3470,11 +3470,11 @@
       }
       var unknown = tmp$ret$6;
       var fraction = smooth / len;
-      if (fraction >= options.b2g_1) {
+      if (fraction >= options.d2g_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element_2 = to(r, fraction);
         kept.k(element_2);
-      } else if ((smooth + unknown | 0) / len >= options.b2g_1) {
+      } else if ((smooth + unknown | 0) / len >= options.d2g_1) {
         // Inline function 'kotlin.collections.plusAssign' call
         noDataRuns.k(r);
       } else {
@@ -3482,7 +3482,7 @@
         roughRuns.k(r);
       }
     }
-    var gap = options.c2h();
+    var gap = options.e2h();
     var merged = ArrayList_init_$Create$();
     var _iterator__ex2g4s_1 = kept.l();
     while (_iterator__ex2g4s_1.m()) {
@@ -3503,15 +3503,15 @@
         merged.k(element_3);
       }
     }
-    var island = options.d2h();
+    var island = options.f2h();
     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.md();
       var f_0 = _destruct__k2r9zo_0.nd();
-      var a_0 = this.f2h(mnh, r_1.v_1, -1, options.d2g_1, island, options.e2h());
-      var b = this.f2h(mnh, r_1.w_1, 1, options.d2g_1, island, options.e2h());
+      var a_0 = this.h2h(mnh, r_1.v_1, -1, options.f2g_1, island, options.g2h());
+      var b = this.h2h(mnh, r_1.w_1, 1, options.f2g_1, island, options.g2h());
       var prev_0 = lastOrNull(spans);
       if (!(prev_0 == null) && a_0 <= prev_0.kd_1.w_1) {
         var tmp_6 = spans.o() - 1 | 0;
@@ -3529,16 +3529,16 @@
         spans.k(element_4);
       }
     }
-    var slope = this.g2h(mf, options.v2g(), step);
-    var clean = state.r2f_1;
+    var slope = this.i2h(mf, options.x2g(), step);
+    var clean = state.t2f_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.md();
       var f_1 = _destruct__k2r9zo_1.nd();
-      var a_3 = this.f2h(mnh, r_2.v_1, -1, options.d2g_1, island, options.e2h());
-      var b_0 = this.f2h(mnh, r_2.w_1, 1, options.d2g_1, island, options.e2h());
+      var a_3 = this.h2h(mnh, r_2.v_1, -1, options.f2g_1, island, options.g2h());
+      var b_0 = this.h2h(mnh, r_2.w_1, 1, options.f2g_1, island, options.g2h());
       var prev_1 = lastOrNull(parts);
       if (!(prev_1 == null) && a_3 <= prev_1.kd_1.w_1) {
         var tmp_8 = parts.o() - 1 | 0;
@@ -3566,7 +3566,7 @@
       var metrics = _destruct__k2r9zo_3.md();
       var rejection = _destruct__k2r9zo_3.nd();
       var tmp_10;
-      if (options.t2g_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
+      if (options.v2g_1 && equals(rejection, DeckRejection_STEEP_getInstance())) {
         // Inline function 'kotlin.collections.filter' call
         // Inline function 'kotlin.collections.filterTo' call
         var destination_0 = ArrayList_init_$Create$();
@@ -3606,7 +3606,7 @@
     var tmp_12 = booleanArray(n);
     while (tmp_11 < n) {
       var tmp_13 = tmp_11;
-      tmp_12[tmp_13] = mnh[tmp_13] > options.d2g_1;
+      tmp_12[tmp_13] = mnh[tmp_13] > options.f2g_1;
       tmp_11 = tmp_11 + 1 | 0;
     }
     var deckMask = tmp_12;
@@ -3616,10 +3616,10 @@
       var span_0 = _destruct__k2r9zo_5.md();
       var rejection_0 = _destruct__k2r9zo_5.gi();
       if (rejection_0 == null) {
-        this.h2h(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
+        this.j2h(deckMask, span_0, island, DeckDetector$detect$lambda(mf));
       }
     }
-    var deckRuns = this.a2h(deckMask);
+    var deckRuns = this.c2h(deckMask);
     var accepted = ArrayList_init_$Create$();
     var rejected = ArrayList_init_$Create$();
     var _iterator__ex2g4s_8 = classified.l();
@@ -3640,7 +3640,7 @@
         var _iterator__ex2g4s_9 = deckRuns.l();
         while (_iterator__ex2g4s_9.m()) {
           var element_9 = _iterator__ex2g4s_9.n();
-          if ((((element_9.w_1 - element_9.v_1 | 0) + 1 | 0) >= options.i2h() || (b_1 - a_6 | 0) <= options.j2h()) && element_9.v_1 <= b_1 && element_9.w_1 >= a_6) {
+          if ((((element_9.w_1 - element_9.v_1 | 0) + 1 | 0) >= options.k2h() || (b_1 - a_6 | 0) <= options.l2h()) && element_9.v_1 <= b_1 && element_9.w_1 >= a_6) {
             destination_1.k(element_9);
           }
         }
@@ -3671,14 +3671,14 @@
         rejected.k(candidate);
       }
     }
-    var _iterator__ex2g4s_11 = this.k2h(roughRuns, gap).l();
+    var _iterator__ex2g4s_11 = this.m2h(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.v_1, g.w_1, g.v_1 * step, g.w_1 * step, null, DeckRejection_ROUGH_getInstance(), emptyList());
       rejected.k(element_10);
     }
-    var _iterator__ex2g4s_12 = this.k2h(noDataRuns, gap).l();
+    var _iterator__ex2g4s_12 = this.m2h(noDataRuns, gap).l();
     while (_iterator__ex2g4s_12.m()) {
       var g_0 = _iterator__ex2g4s_12.n();
       // Inline function 'kotlin.collections.plusAssign' call
@@ -3694,40 +3694,40 @@
     sortWith(rejected, tmp$ret$40);
     return new DeckDetection(accepted, rejected, tooShort);
   };
-  protoOf(DeckDetector).z2g = function (profile, options) {
+  protoOf(DeckDetector).b2h = function (profile, options) {
     var n = profile.o();
-    var mns = profile.m2f_1;
-    var mnt = profile.n2f_1;
+    var mns = profile.o2f_1;
+    var mnt = profile.p2f_1;
     var tmp;
-    if (options.q2g_1) {
-      var tol = options.r2g_1;
+    if (options.s2g_1) {
+      var tol = options.t2g_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.l2f_1[tmp_2];
+        tmp_1[tmp_2] = mnt[tmp_2] > mns[tmp_2] + tol ? Infinity : profile.n2f_1[tmp_2];
         tmp_0 = tmp_0 + 1 | 0;
       }
       tmp = tmp_1;
     } else {
-      tmp = profile.l2f_1;
+      tmp = profile.n2f_1;
     }
     var mnh = tmp;
-    var mf = this.m2h(mns, options.l2h() / 2 | 0);
-    var rough = roughness(this, mns, mf, options.n2h() / 2 | 0);
+    var mf = this.o2h(mns, options.n2h() / 2 | 0);
+    var rough = roughness(this, mns, mf, options.p2h() / 2 | 0);
     // Inline function 'kotlin.let' call
-    var m = this.o2h(rough, options.n2h() / 2 | 0);
+    var m = this.q2h(rough, options.p2h() / 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.a2g_1;
+      tmp_4[tmp_5] = m[tmp_5] < options.c2g_1;
       tmp_3 = tmp_3 + 1 | 0;
     }
     var clean = tmp_4;
     return new SurfaceState(mnh, mf, rough, clean);
   };
-  protoOf(DeckDetector).w2g = function (clean, a, b, h) {
+  protoOf(DeckDetector).y2g = function (clean, a, b, h) {
     var tmp;
     if ((b - h | 0) < (a + h | 0)) {
       tmp = NaN;
@@ -3765,9 +3765,9 @@
     }
     return tmp;
   };
-  protoOf(DeckDetector).x2g = function (mns, mnh, clean, cleanFraction, a, b, options) {
+  protoOf(DeckDetector).z2g = function (mns, mnh, clean, cleanFraction, a, b, options) {
     var n = mns.length;
-    var h = options.v2g();
+    var h = options.x2g();
     if ((b - h | 0) < (a + h | 0))
       return null;
     // Inline function 'kotlin.collections.filter' call
@@ -3786,11 +3786,11 @@
       }
        while (!(element === last));
     var inSpan = destination;
-    if (inSpan.o() < options.p2g_1)
+    if (inSpan.o() < options.r2g_1)
       return null;
-    if (!(cleanFraction >= options.o2g_1))
+    if (!(cleanFraction >= options.q2g_1))
       return null;
-    var medianHalf = options.l2h() / 2 | 0;
+    var medianHalf = options.n2h() / 2 | 0;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - medianHalf | 0;
     var lo = Math.max(0, b_0);
@@ -3827,7 +3827,7 @@
             do {
               var element_0 = inductionVariable_1;
               inductionVariable_1 = inductionVariable_1 + 1 | 0;
-              if (mnh[element_0] <= options.s2g_1) {
+              if (mnh[element_0] <= options.u2g_1) {
                 tmp$ret$5 = true;
                 break $l$block_0;
               }
@@ -3847,7 +3847,7 @@
            while (inductionVariable_2 < c1);
       }
        while (inductionVariable_0 < last_0);
-    var mfClean = this.m2h(x, medianHalf);
+    var mfClean = this.o2h(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);
@@ -3855,13 +3855,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.v2f_1);
+      var x_0 = (mfClean[(k_0 + h | 0) - lo | 0] - mfClean[(k_0 - h | 0) - lo | 0]) / (imul(2, h) * options.x2f_1);
       tmp_2[tmp_3] = Math.abs(x_0);
       tmp_0 = tmp_0 + 1 | 0;
     }
     return tmp_2;
   };
-  protoOf(DeckDetector).f2h = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
+  protoOf(DeckDetector).h2h = function (mnh, from, dir, threshold, maxIsland, maxSteps) {
     var n = mnh.length;
     var ok = DeckDetector$extend$lambda(n, mnh, threshold);
     var k = from;
@@ -3895,7 +3895,7 @@
     }
     return abs(k - from | 0) > maxSteps ? from : k;
   };
-  protoOf(DeckDetector).h2h = function (mask, span, maxHole, fill) {
+  protoOf(DeckDetector).j2h = function (mask, span, maxHole, fill) {
     var k = span.v_1;
     $l$loop: while (k <= span.w_1) {
       if (mask[k]) {
@@ -3955,7 +3955,7 @@
       k = end + 1 | 0;
     }
   };
-  protoOf(DeckDetector).m2h = function (x, half) {
+  protoOf(DeckDetector).o2h = function (x, half) {
     var n = x.length;
     var window_0 = new Float64Array(imul(2, half) + 1 | 0);
     var tmp = 0;
@@ -3989,7 +3989,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).s2f = function (x, half) {
+  protoOf(DeckDetector).u2f = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4010,7 +4010,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).o2h = function (x, half) {
+  protoOf(DeckDetector).q2h = function (x, half) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4041,7 +4041,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).g2h = function (x, h, stepM) {
+  protoOf(DeckDetector).i2h = function (x, h, stepM) {
     var n = x.length;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
@@ -4058,7 +4058,7 @@
     }
     return tmp_0;
   };
-  protoOf(DeckDetector).a2h = function (mask) {
+  protoOf(DeckDetector).c2h = function (mask) {
     var out = ArrayList_init_$Create$();
     var start = -1;
     var inductionVariable = 0;
@@ -4084,7 +4084,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).k2h = function (rs, gapStations) {
+  protoOf(DeckDetector).m2h = function (rs, gapStations) {
     var out = ArrayList_init_$Create$();
     var _iterator__ex2g4s = rs.l();
     while (_iterator__ex2g4s.m()) {
@@ -4104,7 +4104,7 @@
     }
     return out;
   };
-  protoOf(DeckDetector).t2f = function (values, q) {
+  protoOf(DeckDetector).v2f = function (values, q) {
     var s = sortedArray(values);
     var rank = (s.length - 1 | 0) * q;
     // Inline function 'kotlin.math.floor' call
@@ -4121,33 +4121,33 @@
     return DeckDetector_instance;
   }
   function DeckMetrics(lengthM, slopeP95, slopeMax, rawSlopeP95, cleanFraction, slopeOnCleanDeck, roughnessM, smoothFraction, canyonM, mntDropM, deckTopM) {
-    this.p2h_1 = lengthM;
-    this.q2h_1 = slopeP95;
-    this.r2h_1 = slopeMax;
-    this.s2h_1 = rawSlopeP95;
-    this.t2h_1 = cleanFraction;
-    this.u2h_1 = slopeOnCleanDeck;
-    this.v2h_1 = roughnessM;
-    this.w2h_1 = smoothFraction;
-    this.x2h_1 = canyonM;
-    this.y2h_1 = mntDropM;
-    this.z2h_1 = deckTopM;
+    this.r2h_1 = lengthM;
+    this.s2h_1 = slopeP95;
+    this.t2h_1 = slopeMax;
+    this.u2h_1 = rawSlopeP95;
+    this.v2h_1 = cleanFraction;
+    this.w2h_1 = slopeOnCleanDeck;
+    this.x2h_1 = roughnessM;
+    this.y2h_1 = smoothFraction;
+    this.z2h_1 = canyonM;
+    this.a2i_1 = mntDropM;
+    this.b2i_1 = deckTopM;
   }
   protoOf(DeckMetrics).toString = function () {
-    return 'DeckMetrics(lengthM=' + this.p2h_1 + ', slopeP95=' + this.q2h_1 + ', slopeMax=' + this.r2h_1 + ', rawSlopeP95=' + this.s2h_1 + ', cleanFraction=' + this.t2h_1 + ', slopeOnCleanDeck=' + this.u2h_1 + ', roughnessM=' + this.v2h_1 + ', smoothFraction=' + this.w2h_1 + ', canyonM=' + this.x2h_1 + ', mntDropM=' + this.y2h_1 + ', deckTopM=' + this.z2h_1 + ')';
+    return 'DeckMetrics(lengthM=' + this.r2h_1 + ', slopeP95=' + this.s2h_1 + ', slopeMax=' + this.t2h_1 + ', rawSlopeP95=' + this.u2h_1 + ', cleanFraction=' + this.v2h_1 + ', slopeOnCleanDeck=' + this.w2h_1 + ', roughnessM=' + this.x2h_1 + ', smoothFraction=' + this.y2h_1 + ', canyonM=' + this.z2h_1 + ', mntDropM=' + this.a2i_1 + ', deckTopM=' + this.b2i_1 + ')';
   };
   protoOf(DeckMetrics).hashCode = function () {
-    var result = getNumberHashCode(this.p2h_1);
-    result = imul(result, 31) + getNumberHashCode(this.q2h_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r2h_1) | 0;
+    var result = getNumberHashCode(this.r2h_1);
     result = imul(result, 31) + getNumberHashCode(this.s2h_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.t2h_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.u2h_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u2h_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.v2h_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w2h_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.w2h_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.x2h_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.y2h_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.z2h_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.a2i_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.b2i_1) | 0;
     return result;
   };
   protoOf(DeckMetrics).equals = function (other) {
@@ -4155,21 +4155,17 @@
       return true;
     if (!(other instanceof DeckMetrics))
       return false;
-    if (!equals(this.p2h_1, other.p2h_1))
-      return false;
-    if (!equals(this.q2h_1, other.q2h_1))
-      return false;
     if (!equals(this.r2h_1, other.r2h_1))
       return false;
     if (!equals(this.s2h_1, other.s2h_1))
       return false;
     if (!equals(this.t2h_1, other.t2h_1))
       return false;
-    if (!(this.u2h_1 === other.u2h_1))
+    if (!equals(this.u2h_1, other.u2h_1))
       return false;
     if (!equals(this.v2h_1, other.v2h_1))
       return false;
-    if (!equals(this.w2h_1, other.w2h_1))
+    if (!(this.w2h_1 === other.w2h_1))
       return false;
     if (!equals(this.x2h_1, other.x2h_1))
       return false;
@@ -4177,6 +4173,10 @@
       return false;
     if (!equals(this.z2h_1, other.z2h_1))
       return false;
+    if (!equals(this.a2i_1, other.a2i_1))
+      return false;
+    if (!equals(this.b2i_1, other.b2i_1))
+      return false;
     return true;
   };
   var static_init_called_1;
@@ -4219,21 +4219,21 @@
     return DeckRejection_NO_DATA_instance;
   }
   function stations($this, metres, name) {
-    var r = metres / $this.v2f_1;
+    var r = metres / $this.x2f_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.v2f_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.x2f_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
   function Companion_2() {
     Companion_instance_3 = this;
-    this.a2i_1 = new DeckDetectorOptions();
-    this.b2i_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.c2i_1 = new DeckDetectorOptions();
+    this.d2i_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() {
@@ -4268,37 +4268,37 @@
     mntAboveMnsToleranceM = mntAboveMnsToleranceM === VOID ? 0.5 : mntAboveMnsToleranceM;
     cleanGapGroundMnhM = cleanGapGroundMnhM === VOID ? 1.0 : cleanGapGroundMnhM;
     splitSteepMerged = splitSteepMerged === VOID ? true : splitSteepMerged;
-    this.v2f_1 = stepM;
-    this.w2f_1 = tallMnhM;
-    this.x2f_1 = minTallRunM;
-    this.y2f_1 = surfaceMedianWindowM;
-    this.z2f_1 = roughnessWindowM;
-    this.a2g_1 = maxRoughnessM;
-    this.b2g_1 = minSmoothFraction;
-    this.c2g_1 = mergeGapM;
-    this.d2g_1 = deckMnhM;
-    this.e2g_1 = slopeHalfWindowM;
-    this.f2g_1 = maxSlopeP95;
-    this.g2g_1 = minLengthM;
-    this.h2g_1 = shortSpanM;
-    this.i2g_1 = maxShortRoughnessM;
-    this.j2g_1 = minCanyonDropM;
-    this.k2g_1 = deckMinRunM;
-    this.l2g_1 = smallSpanM;
-    this.m2g_1 = maxAbutmentM;
-    this.n2g_1 = slopeOnCleanDeck;
-    this.o2g_1 = minCleanFraction;
-    this.p2g_1 = minCleanStationsCount;
-    this.q2g_1 = mntAboveMnsAsTall;
-    this.r2g_1 = mntAboveMnsToleranceM;
-    this.s2g_1 = cleanGapGroundMnhM;
-    this.t2g_1 = splitSteepMerged;
+    this.x2f_1 = stepM;
+    this.y2f_1 = tallMnhM;
+    this.z2f_1 = minTallRunM;
+    this.a2g_1 = surfaceMedianWindowM;
+    this.b2g_1 = roughnessWindowM;
+    this.c2g_1 = maxRoughnessM;
+    this.d2g_1 = minSmoothFraction;
+    this.e2g_1 = mergeGapM;
+    this.f2g_1 = deckMnhM;
+    this.g2g_1 = slopeHalfWindowM;
+    this.h2g_1 = maxSlopeP95;
+    this.i2g_1 = minLengthM;
+    this.j2g_1 = shortSpanM;
+    this.k2g_1 = maxShortRoughnessM;
+    this.l2g_1 = minCanyonDropM;
+    this.m2g_1 = deckMinRunM;
+    this.n2g_1 = smallSpanM;
+    this.o2g_1 = maxAbutmentM;
+    this.p2g_1 = slopeOnCleanDeck;
+    this.q2g_1 = minCleanFraction;
+    this.r2g_1 = minCleanStationsCount;
+    this.s2g_1 = mntAboveMnsAsTall;
+    this.t2g_1 = mntAboveMnsToleranceM;
+    this.u2g_1 = cleanGapGroundMnhM;
+    this.v2g_1 = splitSteepMerged;
     // Inline function 'kotlin.require' call
-    if (!(this.v2f_1 > 0.0 && isFinite(this.v2f_1))) {
-      var message = 'stepM must be positive, got ' + this.v2f_1;
+    if (!(this.x2f_1 > 0.0 && isFinite(this.x2f_1))) {
+      var message = 'stepM must be positive, got ' + this.x2f_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    var thresholds = mapOf([to('tallMnhM', this.w2f_1), to('minTallRunM', this.x2f_1), to('surfaceMedianWindowM', this.y2f_1), to('roughnessWindowM', this.z2f_1), to('maxRoughnessM', this.a2g_1), to('minSmoothFraction', this.b2g_1), to('mergeGapM', this.c2g_1), to('deckMnhM', this.d2g_1), to('slopeHalfWindowM', this.e2g_1), to('maxSlopeP95', this.f2g_1), to('minLengthM', this.g2g_1), to('shortSpanM', this.h2g_1), to('maxShortRoughnessM', this.i2g_1), to('minCanyonDropM', this.j2g_1), to('deckMinRunM', this.k2g_1), to('smallSpanM', this.l2g_1), to('maxAbutmentM', this.m2g_1), to('minCleanFraction', this.o2g_1), to('mntAboveMnsToleranceM', this.r2g_1), to('cleanGapGroundMnhM', this.s2g_1)]);
+    var thresholds = mapOf([to('tallMnhM', this.y2f_1), to('minTallRunM', this.z2f_1), to('surfaceMedianWindowM', this.a2g_1), to('roughnessWindowM', this.b2g_1), to('maxRoughnessM', this.c2g_1), to('minSmoothFraction', this.d2g_1), to('mergeGapM', this.e2g_1), to('deckMnhM', this.f2g_1), to('slopeHalfWindowM', this.g2g_1), to('maxSlopeP95', this.h2g_1), to('minLengthM', this.i2g_1), to('shortSpanM', this.j2g_1), to('maxShortRoughnessM', this.k2g_1), to('minCanyonDropM', this.l2g_1), to('deckMinRunM', this.m2g_1), to('smallSpanM', this.n2g_1), to('maxAbutmentM', this.o2g_1), to('minCleanFraction', this.q2g_1), to('mntAboveMnsToleranceM', this.t2g_1), to('cleanGapGroundMnhM', this.u2g_1)]);
     // Inline function 'kotlin.collections.forEach' call
     // Inline function 'kotlin.collections.iterator' call
     var _iterator__ex2g4s = thresholds.w1().l();
@@ -4315,99 +4315,97 @@
       }
     }
     // Inline function 'kotlin.require' call
-    if (!((this.l2h() % 2 | 0) === 1)) {
+    if (!((this.n2h() % 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.n2h() % 2 | 0) === 1)) {
+    if (!((this.p2h() % 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.b2h() >= 1)) {
+    if (!(this.d2h() >= 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.v2g() >= 1)) {
+    if (!(this.x2g() >= 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.c2h() >= 0 && this.i2h() >= 1)) {
+    if (!(this.e2h() >= 0 && this.k2h() >= 1)) {
       var message_5 = 'negative window';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_5));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.u2g() >= 0 && this.j2h() >= 0)) {
+    if (!(this.w2g() >= 0 && this.l2h() >= 0)) {
       var message_6 = 'negative span threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.e2h() >= 0)) {
+    if (!(this.g2h() >= 0)) {
       var message_7 = 'negative maxAbutmentM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_7));
     }
-    var containsArg = this.o2g_1;
+    var containsArg = this.q2g_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.o2g_1;
+      var message_8 = 'minCleanFraction must be in 0..1, got ' + this.q2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_8));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.r2g_1 >= 0.0)) {
-      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.r2g_1;
+    if (!(this.t2g_1 >= 0.0)) {
+      var message_9 = 'mntAboveMnsToleranceM must be non-negative, got ' + this.t2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_9));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.p2g_1 >= 2)) {
-      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.p2g_1;
+    if (!(this.r2g_1 >= 2)) {
+      var message_10 = 'minCleanStationsCount must be at least 2, got ' + this.r2g_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_10));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.u2g() >= (imul(2, this.v2g()) - 1 | 0))) {
+    if (!(this.w2g() >= (imul(2, this.x2g()) - 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).b2h = function () {
-    return stations(this, this.x2f_1, 'minTallRunM');
-  };
-  protoOf(DeckDetectorOptions).l2h = function () {
-    return stations(this, this.y2f_1, 'surfaceMedianWindowM');
+  protoOf(DeckDetectorOptions).d2h = function () {
+    return stations(this, this.z2f_1, 'minTallRunM');
   };
   protoOf(DeckDetectorOptions).n2h = function () {
-    return stations(this, this.z2f_1, 'roughnessWindowM');
+    return stations(this, this.a2g_1, 'surfaceMedianWindowM');
   };
-  protoOf(DeckDetectorOptions).c2h = function () {
-    return stations(this, this.c2g_1, 'mergeGapM');
+  protoOf(DeckDetectorOptions).p2h = function () {
+    return stations(this, this.b2g_1, 'roughnessWindowM');
   };
-  protoOf(DeckDetectorOptions).v2g = function () {
-    return stations(this, this.e2g_1, 'slopeHalfWindowM');
+  protoOf(DeckDetectorOptions).e2h = function () {
+    return stations(this, this.e2g_1, 'mergeGapM');
   };
-  protoOf(DeckDetectorOptions).u2g = function () {
-    return stations(this, this.h2g_1, 'shortSpanM');
+  protoOf(DeckDetectorOptions).x2g = function () {
+    return stations(this, this.g2g_1, 'slopeHalfWindowM');
   };
-  protoOf(DeckDetectorOptions).i2h = function () {
-    return stations(this, this.k2g_1, 'deckMinRunM');
+  protoOf(DeckDetectorOptions).w2g = function () {
+    return stations(this, this.j2g_1, 'shortSpanM');
   };
-  protoOf(DeckDetectorOptions).e2h = function () {
-    return stations(this, this.m2g_1, 'maxAbutmentM');
+  protoOf(DeckDetectorOptions).k2h = function () {
+    return stations(this, this.m2g_1, 'deckMinRunM');
   };
-  protoOf(DeckDetectorOptions).d2h = function () {
-    return this.l2h() / 2 | 0;
+  protoOf(DeckDetectorOptions).g2h = function () {
+    return stations(this, this.o2g_1, 'maxAbutmentM');
   };
-  protoOf(DeckDetectorOptions).j2h = function () {
-    return stations(this, this.l2g_1, 'smallSpanM');
+  protoOf(DeckDetectorOptions).f2h = function () {
+    return this.n2h() / 2 | 0;
+  };
+  protoOf(DeckDetectorOptions).l2h = function () {
+    return stations(this, this.n2g_1, 'smallSpanM');
   };
   protoOf(DeckDetectorOptions).toString = function () {
-    return 'DeckDetectorOptions(stepM=' + this.v2f_1 + ', tallMnhM=' + this.w2f_1 + ', minTallRunM=' + this.x2f_1 + ', surfaceMedianWindowM=' + this.y2f_1 + ', roughnessWindowM=' + this.z2f_1 + ', maxRoughnessM=' + this.a2g_1 + ', minSmoothFraction=' + this.b2g_1 + ', mergeGapM=' + this.c2g_1 + ', deckMnhM=' + this.d2g_1 + ', slopeHalfWindowM=' + this.e2g_1 + ', maxSlopeP95=' + this.f2g_1 + ', minLengthM=' + this.g2g_1 + ', shortSpanM=' + this.h2g_1 + ', maxShortRoughnessM=' + this.i2g_1 + ', minCanyonDropM=' + this.j2g_1 + ', deckMinRunM=' + this.k2g_1 + ', smallSpanM=' + this.l2g_1 + ', maxAbutmentM=' + this.m2g_1 + ', slopeOnCleanDeck=' + this.n2g_1 + ', minCleanFraction=' + this.o2g_1 + ', minCleanStationsCount=' + this.p2g_1 + ', mntAboveMnsAsTall=' + this.q2g_1 + ', mntAboveMnsToleranceM=' + this.r2g_1 + ', cleanGapGroundMnhM=' + this.s2g_1 + ', splitSteepMerged=' + this.t2g_1 + ')';
+    return 'DeckDetectorOptions(stepM=' + this.x2f_1 + ', tallMnhM=' + this.y2f_1 + ', minTallRunM=' + this.z2f_1 + ', surfaceMedianWindowM=' + this.a2g_1 + ', roughnessWindowM=' + this.b2g_1 + ', maxRoughnessM=' + this.c2g_1 + ', minSmoothFraction=' + this.d2g_1 + ', mergeGapM=' + this.e2g_1 + ', deckMnhM=' + this.f2g_1 + ', slopeHalfWindowM=' + this.g2g_1 + ', maxSlopeP95=' + this.h2g_1 + ', minLengthM=' + this.i2g_1 + ', shortSpanM=' + this.j2g_1 + ', maxShortRoughnessM=' + this.k2g_1 + ', minCanyonDropM=' + this.l2g_1 + ', deckMinRunM=' + this.m2g_1 + ', smallSpanM=' + this.n2g_1 + ', maxAbutmentM=' + this.o2g_1 + ', slopeOnCleanDeck=' + this.p2g_1 + ', minCleanFraction=' + this.q2g_1 + ', minCleanStationsCount=' + this.r2g_1 + ', mntAboveMnsAsTall=' + this.s2g_1 + ', mntAboveMnsToleranceM=' + this.t2g_1 + ', cleanGapGroundMnhM=' + this.u2g_1 + ', splitSteepMerged=' + this.v2g_1 + ')';
   };
   protoOf(DeckDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.v2f_1);
-    result = imul(result, 31) + getNumberHashCode(this.w2f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x2f_1) | 0;
+    var result = getNumberHashCode(this.x2f_1);
     result = imul(result, 31) + getNumberHashCode(this.y2f_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.z2f_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.a2g_1) | 0;
@@ -4423,13 +4421,15 @@
     result = imul(result, 31) + getNumberHashCode(this.k2g_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.l2g_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.m2g_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.n2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n2g_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.o2g_1) | 0;
-    result = imul(result, 31) + this.p2g_1 | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.q2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.r2g_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.s2g_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.t2g_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.p2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.q2g_1) | 0;
+    result = imul(result, 31) + this.r2g_1 | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.s2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.t2g_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.u2g_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.v2g_1) | 0;
     return result;
   };
   protoOf(DeckDetectorOptions).equals = function (other) {
@@ -4437,10 +4437,6 @@
       return true;
     if (!(other instanceof DeckDetectorOptions))
       return false;
-    if (!equals(this.v2f_1, other.v2f_1))
-      return false;
-    if (!equals(this.w2f_1, other.w2f_1))
-      return false;
     if (!equals(this.x2f_1, other.x2f_1))
       return false;
     if (!equals(this.y2f_1, other.y2f_1))
@@ -4473,83 +4469,87 @@
       return false;
     if (!equals(this.m2g_1, other.m2g_1))
       return false;
-    if (!(this.n2g_1 === other.n2g_1))
+    if (!equals(this.n2g_1, other.n2g_1))
       return false;
     if (!equals(this.o2g_1, other.o2g_1))
       return false;
     if (!(this.p2g_1 === other.p2g_1))
       return false;
-    if (!(this.q2g_1 === other.q2g_1))
+    if (!equals(this.q2g_1, other.q2g_1))
+      return false;
+    if (!(this.r2g_1 === other.r2g_1))
       return false;
-    if (!equals(this.r2g_1, other.r2g_1))
+    if (!(this.s2g_1 === other.s2g_1))
       return false;
-    if (!equals(this.s2g_1, other.s2g_1))
+    if (!equals(this.t2g_1, other.t2g_1))
       return false;
-    if (!(this.t2g_1 === other.t2g_1))
+    if (!equals(this.u2g_1, other.u2g_1))
+      return false;
+    if (!(this.v2g_1 === other.v2g_1))
       return false;
     return true;
   };
   function DeckReplacement(first, last, spanFirst, spanLast, anchorFirst, anchorLast, anchors, elevationM, spans) {
-    this.c2i_1 = first;
-    this.d2i_1 = last;
-    this.e2i_1 = spanFirst;
-    this.f2i_1 = spanLast;
-    this.g2i_1 = anchorFirst;
-    this.h2i_1 = anchorLast;
-    this.i2i_1 = anchors;
-    this.j2i_1 = elevationM;
-    this.k2i_1 = spans;
-  }
-  protoOf(DeckReplacement).l2i = function () {
-    return this.c2i_1 < this.e2i_1;
-  };
-  protoOf(DeckReplacement).m2i = function () {
-    return this.d2i_1 > this.f2i_1;
-  };
-  protoOf(DeckReplacement).n2i = function (startM, endM) {
+    this.e2i_1 = first;
+    this.f2i_1 = last;
+    this.g2i_1 = spanFirst;
+    this.h2i_1 = spanLast;
+    this.i2i_1 = anchorFirst;
+    this.j2i_1 = anchorLast;
+    this.k2i_1 = anchors;
+    this.l2i_1 = elevationM;
+    this.m2i_1 = spans;
+  }
+  protoOf(DeckReplacement).n2i = function () {
+    return this.e2i_1 < this.g2i_1;
+  };
+  protoOf(DeckReplacement).o2i = function () {
+    return this.f2i_1 > this.h2i_1;
+  };
+  protoOf(DeckReplacement).p2i = function (startM, endM) {
     // Inline function 'kotlin.collections.copyOf' call
     // Inline function 'kotlin.js.asDynamic' call
-    var z = this.j2i_1.slice();
-    if (this.l2i()) {
+    var z = this.l2i_1.slice();
+    if (this.n2i()) {
       z[0] = startM;
     }
-    if (this.m2i()) {
+    if (this.o2i()) {
       z[z.length - 1 | 0] = endM;
     }
     fillLinear(z);
     return z;
   };
   protoOf(DeckReplacement).toString = function () {
-    var tmp = 'DeckReplacement(first=' + this.c2i_1 + ', last=' + this.d2i_1 + ', span=' + this.e2i_1 + '..' + this.f2i_1 + ', anchors=' + this.g2i_1 + '..' + this.h2i_1 + ' ';
-    var tmp_0 = this.i2i_1.length;
+    var tmp = 'DeckReplacement(first=' + this.e2i_1 + ', last=' + this.f2i_1 + ', span=' + this.g2i_1 + '..' + this.h2i_1 + ', anchors=' + this.i2i_1 + '..' + this.j2i_1 + ' ';
+    var tmp_0 = this.k2i_1.length;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.k2i_1;
+    var this_0 = this.m2i_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.d2f_1, item.e2f_1);
+      var tmp$ret$2 = numberRangeToNumber(item.f2f_1, item.g2f_1);
       destination.k(tmp$ret$2);
     }
     return tmp + ('(' + tmp_0 + '), spans=' + toString_0(destination) + ')');
   };
   function DeckProfiles(replacements, dropped) {
-    this.o2i_1 = replacements;
-    this.p2i_1 = dropped;
+    this.q2i_1 = replacements;
+    this.r2i_1 = dropped;
   }
   function joins($this, previous, next, mns, mnt, options) {
     var a = previous.md();
     var aAnchors = previous.nd();
     var b = next.md();
     var bAnchors = next.nd();
-    if (((b.d2f_1 - a.e2f_1 | 0) - 1 | 0) >= options.c2h())
+    if (((b.f2f_1 - a.g2f_1 | 0) - 1 | 0) >= options.e2h())
       return false;
     if (aAnchors.r() || bAnchors.r())
       return false;
     var c0 = last(aAnchors);
     var c1 = first(bAnchors);
-    var tmp0 = until(a.e2f_1 + 1 | 0, b.d2f_1);
+    var tmp0 = until(a.g2f_1 + 1 | 0, b.f2f_1);
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.none' call
@@ -4571,7 +4571,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.j2g_1)) {
+          if (!(line - mnt[k] > options.l2g_1)) {
             tmp$ret$0 = false;
             break $l$block_0;
           }
@@ -4584,7 +4584,7 @@
   function replacement($this, spans, anchors, mns, n, options) {
     var u = first_0(anchors);
     var v = last_0(anchors);
-    var half = options.l2h() / 2 | 0;
+    var half = options.n2h() / 2 | 0;
     var tmp = 0;
     var tmp_0 = ((v - u | 0) + 1 | 0) + imul(2, half) | 0;
     var tmp_1 = new Float64Array(tmp_0);
@@ -4611,7 +4611,7 @@
            while (!(k === c1));
       }
        while (inductionVariable < last_2);
-    var median = DeckDetector_instance.m2h(x, half);
+    var median = DeckDetector_instance.o2h(x, half);
     var tmp_2 = 0;
     var tmp_3 = (v - u | 0) + 1 | 0;
     var tmp_4 = new Float64Array(tmp_3);
@@ -4621,9 +4621,9 @@
       tmp_2 = tmp_2 + 1 | 0;
     }
     var deck = tmp_4;
-    $this.q2i(deck, options.f2g_1 * options.v2f_1);
-    var spanFirst = first(spans).d2f_1;
-    var spanLast = last(spans).e2f_1;
+    $this.s2i(deck, options.h2g_1 * options.x2f_1);
+    var spanFirst = first(spans).f2f_1;
+    var spanLast = last(spans).g2f_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b = spanFirst - 1 | 0;
     var first_2 = Math.max(0, b);
@@ -4644,16 +4644,16 @@
     return new DeckReplacement(first_2, last_3, spanFirst, spanLast, u, v, anchors, z, spans);
   }
   function sam$kotlin_Comparator$0_0(function_0) {
-    this.r2i_1 = function_0;
+    this.t2i_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0_0).mb = function (a, b) {
-    return this.r2i_1(a, b);
+    return this.t2i_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0_0).compare = function (a, b) {
     return this.mb(a, b);
   };
   protoOf(sam$kotlin_Comparator$0_0).h2 = function () {
-    return this.r2i_1;
+    return this.t2i_1;
   };
   protoOf(sam$kotlin_Comparator$0_0).equals = function (other) {
     var tmp;
@@ -4675,7 +4675,7 @@
   };
   function build$anchorsOf(state, mns, span) {
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp0 = span.j2f_1;
+    var tmp0 = span.l2f_1;
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.l();
@@ -4692,9 +4692,9 @@
       var element_0 = _iterator__ex2g4s_0.n();
       var tmp;
       var tmp_0;
-      var containsLower = span.d2f_1;
-      if (element_0 <= span.e2f_1 ? containsLower <= element_0 : false) {
-        tmp_0 = state.r2f_1[element_0];
+      var containsLower = span.f2f_1;
+      if (element_0 <= span.g2f_1 ? containsLower <= element_0 : false) {
+        tmp_0 = state.t2f_1[element_0];
       } else {
         tmp_0 = false;
       }
@@ -4711,21 +4711,21 @@
   }
   function DeckProfileBuilder$build$lambda(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
-    var tmp = a.d2f_1;
-    var tmp$ret$2 = b.d2f_1;
+    var tmp = a.f2f_1;
+    var tmp$ret$2 = b.f2f_1;
     return compareValues(tmp, tmp$ret$2);
   }
   function DeckProfileBuilder() {
   }
-  protoOf(DeckProfileBuilder).s2i = function (profile, detection, options) {
+  protoOf(DeckProfileBuilder).u2i = function (profile, detection, options) {
     var n = profile.o();
-    if (n === 0 || detection.a2f_1.r())
+    if (n === 0 || detection.c2f_1.r())
       return new DeckProfiles(emptyList(), emptyList());
-    var state = DeckDetector_instance.z2g(profile, options);
-    var mns = profile.m2f_1;
-    var mnt = profile.n2f_1;
+    var state = DeckDetector_instance.b2h(profile, options);
+    var mns = profile.o2f_1;
+    var mnt = profile.p2f_1;
     // Inline function 'kotlin.collections.sortedBy' call
-    var this_0 = detection.a2f_1;
+    var this_0 = detection.c2f_1;
     // Inline function 'kotlin.comparisons.compareBy' call
     var tmp = DeckProfileBuilder$build$lambda;
     var tmp$ret$1 = new sam$kotlin_Comparator$0_0(tmp);
@@ -4782,7 +4782,7 @@
     }
     return new DeckProfiles(replacements, dropped);
   };
-  protoOf(DeckProfileBuilder).q2i = function (z, maxRise) {
+  protoOf(DeckProfileBuilder).s2i = function (z, maxRise) {
     var inductionVariable = 1;
     var last = z.length;
     if (inductionVariable < last)
@@ -4836,25 +4836,25 @@
        while (inductionVariable <= last);
   }
   function TerrainProvenance(ignLidarHdKm, mapterhornMeasuredKm, mapterhornKm, otherKm, noDataKm, fallbackAfterErrorKm, failedTiles) {
-    this.t2i_1 = ignLidarHdKm;
-    this.u2i_1 = mapterhornMeasuredKm;
-    this.v2i_1 = mapterhornKm;
-    this.w2i_1 = otherKm;
-    this.x2i_1 = noDataKm;
-    this.y2i_1 = fallbackAfterErrorKm;
-    this.z2i_1 = failedTiles;
+    this.v2i_1 = ignLidarHdKm;
+    this.w2i_1 = mapterhornMeasuredKm;
+    this.x2i_1 = mapterhornKm;
+    this.y2i_1 = otherKm;
+    this.z2i_1 = noDataKm;
+    this.a2j_1 = fallbackAfterErrorKm;
+    this.b2j_1 = failedTiles;
   }
   protoOf(TerrainProvenance).toString = function () {
-    return 'TerrainProvenance(ignLidarHdKm=' + this.t2i_1 + ', mapterhornMeasuredKm=' + this.u2i_1 + ', mapterhornKm=' + this.v2i_1 + ', otherKm=' + this.w2i_1 + ', noDataKm=' + this.x2i_1 + ', fallbackAfterErrorKm=' + this.y2i_1 + ', failedTiles=' + this.z2i_1 + ')';
+    return 'TerrainProvenance(ignLidarHdKm=' + this.v2i_1 + ', mapterhornMeasuredKm=' + this.w2i_1 + ', mapterhornKm=' + this.x2i_1 + ', otherKm=' + this.y2i_1 + ', noDataKm=' + this.z2i_1 + ', fallbackAfterErrorKm=' + this.a2j_1 + ', failedTiles=' + this.b2j_1 + ')';
   };
   protoOf(TerrainProvenance).hashCode = function () {
-    var result = getNumberHashCode(this.t2i_1);
-    result = imul(result, 31) + getNumberHashCode(this.u2i_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v2i_1) | 0;
+    var result = getNumberHashCode(this.v2i_1);
     result = imul(result, 31) + getNumberHashCode(this.w2i_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.x2i_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.y2i_1) | 0;
-    result = imul(result, 31) + this.z2i_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z2i_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.a2j_1) | 0;
+    result = imul(result, 31) + this.b2j_1 | 0;
     return result;
   };
   protoOf(TerrainProvenance).equals = function (other) {
@@ -4862,10 +4862,6 @@
       return true;
     if (!(other instanceof TerrainProvenance))
       return false;
-    if (!equals(this.t2i_1, other.t2i_1))
-      return false;
-    if (!equals(this.u2i_1, other.u2i_1))
-      return false;
     if (!equals(this.v2i_1, other.v2i_1))
       return false;
     if (!equals(this.w2i_1, other.w2i_1))
@@ -4874,33 +4870,40 @@
       return false;
     if (!equals(this.y2i_1, other.y2i_1))
       return false;
-    if (!(this.z2i_1 === other.z2i_1))
+    if (!equals(this.z2i_1, other.z2i_1))
+      return false;
+    if (!equals(this.a2j_1, other.a2j_1))
+      return false;
+    if (!(this.b2j_1 === other.b2j_1))
       return false;
     return true;
   };
-  function ElevationCorrections(bridgeDecks, bridgeDecksApplied, bridgeDecksDropped, tunnels, tunnelsApplied, tunnelsDropped, warnings, terrain) {
+  function ElevationCorrections(bridgeDecks, bridgeDecksApplied, bridgeDecksDropped, tunnels, tunnelsApplied, tunnelsDropped, warnings, terrain, tunnelsOutOfScope) {
     terrain = terrain === VOID ? null : terrain;
-    this.a2j_1 = bridgeDecks;
-    this.b2j_1 = bridgeDecksApplied;
-    this.c2j_1 = bridgeDecksDropped;
-    this.d2j_1 = tunnels;
-    this.e2j_1 = tunnelsApplied;
-    this.f2j_1 = tunnelsDropped;
-    this.g2j_1 = warnings;
-    this.h2j_1 = terrain;
+    tunnelsOutOfScope = tunnelsOutOfScope === VOID ? 0 : tunnelsOutOfScope;
+    this.c2j_1 = bridgeDecks;
+    this.d2j_1 = bridgeDecksApplied;
+    this.e2j_1 = bridgeDecksDropped;
+    this.f2j_1 = tunnels;
+    this.g2j_1 = tunnelsApplied;
+    this.h2j_1 = tunnelsDropped;
+    this.i2j_1 = warnings;
+    this.j2j_1 = terrain;
+    this.k2j_1 = tunnelsOutOfScope;
   }
   protoOf(ElevationCorrections).toString = function () {
-    return 'ElevationCorrections(bridgeDecks=' + this.a2j_1.toString() + ', bridgeDecksApplied=' + this.b2j_1 + ', bridgeDecksDropped=' + this.c2j_1 + ', tunnels=' + this.d2j_1.toString() + ', tunnelsApplied=' + this.e2j_1 + ', tunnelsDropped=' + this.f2j_1 + ', warnings=' + toString_0(this.g2j_1) + ', terrain=' + toString(this.h2j_1) + ')';
+    return 'ElevationCorrections(bridgeDecks=' + this.c2j_1.toString() + ', bridgeDecksApplied=' + this.d2j_1 + ', bridgeDecksDropped=' + this.e2j_1 + ', tunnels=' + this.f2j_1.toString() + ', tunnelsApplied=' + this.g2j_1 + ', tunnelsDropped=' + this.h2j_1 + ', warnings=' + toString_0(this.i2j_1) + ', terrain=' + toString(this.j2j_1) + ', tunnelsOutOfScope=' + this.k2j_1 + ')';
   };
   protoOf(ElevationCorrections).hashCode = function () {
-    var result = this.a2j_1.hashCode();
-    result = imul(result, 31) + this.b2j_1 | 0;
-    result = imul(result, 31) + this.c2j_1 | 0;
-    result = imul(result, 31) + this.d2j_1.hashCode() | 0;
+    var result = this.c2j_1.hashCode();
+    result = imul(result, 31) + this.d2j_1 | 0;
     result = imul(result, 31) + this.e2j_1 | 0;
-    result = imul(result, 31) + this.f2j_1 | 0;
-    result = imul(result, 31) + hashCode(this.g2j_1) | 0;
-    result = imul(result, 31) + (this.h2j_1 == null ? 0 : this.h2j_1.hashCode()) | 0;
+    result = imul(result, 31) + this.f2j_1.hashCode() | 0;
+    result = imul(result, 31) + this.g2j_1 | 0;
+    result = imul(result, 31) + this.h2j_1 | 0;
+    result = imul(result, 31) + hashCode(this.i2j_1) | 0;
+    result = imul(result, 31) + (this.j2j_1 == null ? 0 : this.j2j_1.hashCode()) | 0;
+    result = imul(result, 31) + this.k2j_1 | 0;
     return result;
   };
   protoOf(ElevationCorrections).equals = function (other) {
@@ -4908,21 +4911,23 @@
       return true;
     if (!(other instanceof ElevationCorrections))
       return false;
-    if (!this.a2j_1.equals(other.a2j_1))
+    if (!this.c2j_1.equals(other.c2j_1))
       return false;
-    if (!(this.b2j_1 === other.b2j_1))
+    if (!(this.d2j_1 === other.d2j_1))
       return false;
-    if (!(this.c2j_1 === other.c2j_1))
+    if (!(this.e2j_1 === other.e2j_1))
       return false;
-    if (!this.d2j_1.equals(other.d2j_1))
+    if (!this.f2j_1.equals(other.f2j_1))
       return false;
-    if (!(this.e2j_1 === other.e2j_1))
+    if (!(this.g2j_1 === other.g2j_1))
       return false;
-    if (!(this.f2j_1 === other.f2j_1))
+    if (!(this.h2j_1 === other.h2j_1))
       return false;
-    if (!equals(this.g2j_1, other.g2j_1))
+    if (!equals(this.i2j_1, other.i2j_1))
       return false;
-    if (!equals(this.h2j_1, other.h2j_1))
+    if (!equals(this.j2j_1, other.j2j_1))
+      return false;
+    if (!(this.k2j_1 === other.k2j_1))
       return false;
     return true;
   };
@@ -4958,10 +4963,10 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var item = _iterator__ex2g4s.n();
-      var tmp$ret$2 = item.k2j_1;
+      var tmp$ret$2 = item.n2j_1;
       destination.k(tmp$ret$2);
     }
-    tmp.l2j_1 = destination;
+    tmp.o2j_1 = destination;
   }
   var Companion_instance_4;
   function values_1() {
@@ -4977,7 +4982,7 @@
   var $ENTRIES_1;
   function ElevationCorrectionStatus(name, ordinal, id) {
     Enum.call(this, name, ordinal);
-    this.k2j_1 = id;
+    this.n2j_1 = id;
   }
   function ElevationCorrectionStatus_NOT_RUN_getInstance() {
     static_init_2();
@@ -5005,33 +5010,33 @@
   }
   function Companion_4() {
   }
-  protoOf(Companion_4).m2j = function (options) {
-    return new ElevationGainResult(0.0, 0.0, 0.0, 0.0, options.p2j_1, options.q2j_1, 0);
+  protoOf(Companion_4).p2j = function (options) {
+    return new ElevationGainResult(0.0, 0.0, 0.0, 0.0, options.s2j_1, options.t2j_1, 0);
   };
   var Companion_instance_5;
   function Companion_getInstance_4() {
     return Companion_instance_5;
   }
   function ElevationGainResult(gainM, lossM, rawGainM, rawLossM, thresholdM, smoothWindowM, legCount) {
-    this.r2j_1 = gainM;
-    this.s2j_1 = lossM;
-    this.t2j_1 = rawGainM;
-    this.u2j_1 = rawLossM;
-    this.v2j_1 = thresholdM;
-    this.w2j_1 = smoothWindowM;
-    this.x2j_1 = legCount;
+    this.u2j_1 = gainM;
+    this.v2j_1 = lossM;
+    this.w2j_1 = rawGainM;
+    this.x2j_1 = rawLossM;
+    this.y2j_1 = thresholdM;
+    this.z2j_1 = smoothWindowM;
+    this.a2k_1 = legCount;
   }
   protoOf(ElevationGainResult).toString = function () {
-    return 'ElevationGainResult(gainM=' + this.r2j_1 + ', lossM=' + this.s2j_1 + ', rawGainM=' + this.t2j_1 + ', rawLossM=' + this.u2j_1 + ', thresholdM=' + this.v2j_1 + ', smoothWindowM=' + this.w2j_1 + ', legCount=' + this.x2j_1 + ')';
+    return 'ElevationGainResult(gainM=' + this.u2j_1 + ', lossM=' + this.v2j_1 + ', rawGainM=' + this.w2j_1 + ', rawLossM=' + this.x2j_1 + ', thresholdM=' + this.y2j_1 + ', smoothWindowM=' + this.z2j_1 + ', legCount=' + this.a2k_1 + ')';
   };
   protoOf(ElevationGainResult).hashCode = function () {
-    var result = getNumberHashCode(this.r2j_1);
-    result = imul(result, 31) + getNumberHashCode(this.s2j_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.t2j_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.u2j_1) | 0;
+    var result = getNumberHashCode(this.u2j_1);
     result = imul(result, 31) + getNumberHashCode(this.v2j_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.w2j_1) | 0;
-    result = imul(result, 31) + this.x2j_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.x2j_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.y2j_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.z2j_1) | 0;
+    result = imul(result, 31) + this.a2k_1 | 0;
     return result;
   };
   protoOf(ElevationGainResult).equals = function (other) {
@@ -5039,26 +5044,26 @@
       return true;
     if (!(other instanceof ElevationGainResult))
       return false;
-    if (!equals(this.r2j_1, other.r2j_1))
-      return false;
-    if (!equals(this.s2j_1, other.s2j_1))
-      return false;
-    if (!equals(this.t2j_1, other.t2j_1))
-      return false;
     if (!equals(this.u2j_1, other.u2j_1))
       return false;
     if (!equals(this.v2j_1, other.v2j_1))
       return false;
     if (!equals(this.w2j_1, other.w2j_1))
       return false;
-    if (!(this.x2j_1 === other.x2j_1))
+    if (!equals(this.x2j_1, other.x2j_1))
+      return false;
+    if (!equals(this.y2j_1, other.y2j_1))
+      return false;
+    if (!equals(this.z2j_1, other.z2j_1))
+      return false;
+    if (!(this.a2k_1 === other.a2k_1))
       return false;
     return true;
   };
   function Banked(gainM, lossM, legCount) {
-    this.y2j_1 = gainM;
-    this.z2j_1 = lossM;
-    this.a2k_1 = legCount;
+    this.b2k_1 = gainM;
+    this.c2k_1 = lossM;
+    this.d2k_1 = legCount;
   }
   function accumulate($this, h, threshold) {
     var gain = 0.0;
@@ -5140,45 +5145,45 @@
   }
   function ElevationGain() {
   }
-  protoOf(ElevationGain).b2k = function (path, options) {
-    if (path.q2b_1 < 2)
-      return Companion_instance_5.m2j(options);
+  protoOf(ElevationGain).e2k = function (path, options) {
+    if (path.s2b_1 < 2)
+      return Companion_instance_5.p2j(options);
     var tmp = 0;
-    var tmp_0 = path.q2b_1;
+    var tmp_0 = path.s2b_1;
     var tmp_1 = new Float64Array(tmp_0);
     while (tmp < tmp_0) {
       var tmp_2 = tmp;
-      tmp_1[tmp_2] = path.c2k(tmp_2);
+      tmp_1[tmp_2] = path.f2k(tmp_2);
       tmp = tmp + 1 | 0;
     }
     var distanceM = tmp_1;
     var tmp_3 = 0;
-    var tmp_4 = path.q2b_1;
+    var tmp_4 = path.s2b_1;
     var tmp_5 = new Float64Array(tmp_4);
     while (tmp_3 < tmp_4) {
       var tmp_6 = tmp_3;
-      var source = path.d2k(tmp_6);
-      tmp_5[tmp_6] = isNaN_0(source) ? path.v2b(tmp_6) : source;
+      var source = path.g2k(tmp_6);
+      tmp_5[tmp_6] = isNaN_0(source) ? path.x2b(tmp_6) : source;
       tmp_3 = tmp_3 + 1 | 0;
     }
     var elevationM = tmp_5;
-    return this.e2k(distanceM, elevationM, options);
+    return this.h2k(distanceM, elevationM, options);
   };
-  protoOf(ElevationGain).f2k = function (path, options) {
-    var result = this.b2k(path, options);
-    path.f2d_1 = result.r2j_1;
-    path.g2d_1 = result.s2j_1;
+  protoOf(ElevationGain).i2k = function (path, options) {
+    var result = this.e2k(path, options);
+    path.h2d_1 = result.u2j_1;
+    path.i2d_1 = result.v2j_1;
     return result;
   };
-  protoOf(ElevationGain).e2k = function (distanceM, elevationM, options) {
+  protoOf(ElevationGain).h2k = 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_5.m2j(options);
-    var profile = ElevationSmoother_instance.a1b(distanceM, elevationM, options.q2j_1);
+      return Companion_instance_5.p2j(options);
+    var profile = ElevationSmoother_instance.b1b(distanceM, elevationM, options.t2j_1);
     var rawGain = 0.0;
     var rawLoss = 0.0;
     var inductionVariable = 1;
@@ -5194,18 +5199,18 @@
           rawLoss = rawLoss + d;
       }
        while (inductionVariable < last);
-    if (options.p2j_1 <= 0.0) {
-      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.q2j_1, 0);
+    if (options.s2j_1 <= 0.0) {
+      return new ElevationGainResult(rawGain, rawLoss, rawGain, rawLoss, 0.0, options.t2j_1, 0);
     }
-    var banked = accumulate(this, profile, options.p2j_1);
-    return new ElevationGainResult(banked.y2j_1, banked.z2j_1, rawGain, rawLoss, options.p2j_1, options.q2j_1, banked.a2k_1);
+    var banked = accumulate(this, profile, options.s2j_1);
+    return new ElevationGainResult(banked.b2k_1, banked.c2k_1, rawGain, rawLoss, options.s2j_1, options.t2j_1, banked.d2k_1);
   };
   var ElevationGain_instance;
   function ElevationGain_getInstance() {
     return ElevationGain_instance;
   }
   function ElevationGainPreset$Companion$byId$lambda(it) {
-    return it.k2k();
+    return it.n2k();
   }
   var static_init_called_3;
   function static_init_3() {
@@ -5227,7 +5232,7 @@
   var ElevationGainPreset_GPS_instance;
   function Companion_5() {
   }
-  protoOf(Companion_5).g1b = function (name) {
+  protoOf(Companion_5).i1b = function (name) {
     var tmp0 = get_entries_2();
     var tmp$ret$0;
     $l$block: {
@@ -5235,7 +5240,7 @@
       var _iterator__ex2g4s = tmp0.l();
       while (_iterator__ex2g4s.m()) {
         var element = _iterator__ex2g4s.n();
-        if (equals_0(element.k2k(), name, true) || equals_0(element.x1_1, name, true)) {
+        if (equals_0(element.n2k(), name, true) || equals_0(element.x1_1, name, true)) {
           tmp$ret$0 = element;
           break $l$block;
         }
@@ -5269,10 +5274,10 @@
   var $ENTRIES_2;
   function ElevationGainPreset(name, ordinal, thresholdM, smoothWindowM) {
     Enum.call(this, name, ordinal);
-    this.i2k_1 = thresholdM;
-    this.j2k_1 = smoothWindowM;
+    this.l2k_1 = thresholdM;
+    this.m2k_1 = smoothWindowM;
   }
-  protoOf(ElevationGainPreset).k2k = function () {
+  protoOf(ElevationGainPreset).n2k = function () {
     var tmp;
     switch (this.y1_1) {
       case 0:
@@ -5295,8 +5300,8 @@
   };
   function Companion_6() {
     Companion_instance_7 = this;
-    this.l2k_1 = new ElevationGainOptions();
-    this.m2k_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
+    this.o2k_1 = new ElevationGainOptions();
+    this.p2k_1 = new ElevationGainOptions(VOID, ElevationGainPreset_RAW_getInstance());
   }
   var Companion_instance_7;
   function Companion_getInstance_6() {
@@ -5308,31 +5313,31 @@
     Companion_getInstance_6();
     enabled = enabled === VOID ? true : enabled;
     preset = preset === VOID ? ElevationGainPreset_DEM_getInstance() : preset;
-    thresholdM = thresholdM === VOID ? preset.i2k_1 : thresholdM;
-    smoothWindowM = smoothWindowM === VOID ? preset.j2k_1 : smoothWindowM;
-    this.n2j_1 = enabled;
-    this.o2j_1 = preset;
-    this.p2j_1 = thresholdM;
-    this.q2j_1 = smoothWindowM;
+    thresholdM = thresholdM === VOID ? preset.l2k_1 : thresholdM;
+    smoothWindowM = smoothWindowM === VOID ? preset.m2k_1 : smoothWindowM;
+    this.q2j_1 = enabled;
+    this.r2j_1 = preset;
+    this.s2j_1 = thresholdM;
+    this.t2j_1 = smoothWindowM;
     // Inline function 'kotlin.require' call
-    if (!(this.p2j_1 >= 0.0 && isFinite(this.p2j_1))) {
-      var message = 'thresholdM must be finite and >= 0, was ' + this.p2j_1;
+    if (!(this.s2j_1 >= 0.0 && isFinite(this.s2j_1))) {
+      var message = 'thresholdM must be finite and >= 0, was ' + this.s2j_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.q2j_1 >= 0.0 && isFinite(this.q2j_1))) {
-      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.q2j_1;
+    if (!(this.t2j_1 >= 0.0 && isFinite(this.t2j_1))) {
+      var message_0 = 'smoothWindowM must be finite and >= 0, was ' + this.t2j_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_0));
     }
   }
   protoOf(ElevationGainOptions).toString = function () {
-    return 'ElevationGainOptions(enabled=' + this.n2j_1 + ', preset=' + this.o2j_1.toString() + ', thresholdM=' + this.p2j_1 + ', smoothWindowM=' + this.q2j_1 + ')';
+    return 'ElevationGainOptions(enabled=' + this.q2j_1 + ', preset=' + this.r2j_1.toString() + ', thresholdM=' + this.s2j_1 + ', smoothWindowM=' + this.t2j_1 + ')';
   };
   protoOf(ElevationGainOptions).hashCode = function () {
-    var result = getBooleanHashCode(this.n2j_1);
-    result = imul(result, 31) + this.o2j_1.hashCode() | 0;
-    result = imul(result, 31) + getNumberHashCode(this.p2j_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.q2j_1) | 0;
+    var result = getBooleanHashCode(this.q2j_1);
+    result = imul(result, 31) + this.r2j_1.hashCode() | 0;
+    result = imul(result, 31) + getNumberHashCode(this.s2j_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.t2j_1) | 0;
     return result;
   };
   protoOf(ElevationGainOptions).equals = function (other) {
@@ -5340,13 +5345,13 @@
       return true;
     if (!(other instanceof ElevationGainOptions))
       return false;
-    if (!(this.n2j_1 === other.n2j_1))
+    if (!(this.q2j_1 === other.q2j_1))
       return false;
-    if (!this.o2j_1.equals(other.o2j_1))
+    if (!this.r2j_1.equals(other.r2j_1))
       return false;
-    if (!equals(this.p2j_1, other.p2j_1))
+    if (!equals(this.s2j_1, other.s2j_1))
       return false;
-    if (!equals(this.q2j_1, other.q2j_1))
+    if (!equals(this.t2j_1, other.t2j_1))
       return false;
     return true;
   };
@@ -5367,9 +5372,9 @@
     return ElevationGainPreset_GPS_instance;
   }
   function copyAllSlots($this, source) {
-    var out = new Path(source.q2b_1);
+    var out = new Path(source.s2b_1);
     var inductionVariable = 0;
-    var last = source.q2b_1;
+    var last = source.s2b_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
@@ -5377,7 +5382,7 @@
         var _iterator__ex2g4s = get_entries_3().l();
         while (_iterator__ex2g4s.m()) {
           var field = _iterator__ex2g4s.n();
-          out.n2k(i, field, source.t2e(i, field));
+          out.q2k(i, field, source.v2e(i, field));
         }
       }
        while (inductionVariable < last);
@@ -5385,9 +5390,9 @@
   }
   function $fixElevationWithOriginsCOROUTINE$(_this__u8e3s4, source, provider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.w2k_1 = _this__u8e3s4;
-    this.x2k_1 = source;
-    this.y2k_1 = provider;
+    this.z2k_1 = _this__u8e3s4;
+    this.a2l_1 = source;
+    this.b2l_1 = provider;
   }
   protoOf($fixElevationWithOriginsCOROUTINE$).r7 = function () {
     var suspendResult = this.l7_1;
@@ -5397,21 +5402,21 @@
         switch (tmp) {
           case 0:
             this.k7_1 = 2;
-            if (this.x2k_1.q2b_1 === 0)
+            if (this.a2l_1.s2b_1 === 0)
               return to(new Path(0), emptyList());
-            var size = this.x2k_1.q2b_1;
+            var size = this.a2l_1.s2b_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.x2k_1.t2b(index) * 57.29577951308232, this.x2k_1.u2b(index) * 57.29577951308232));
+                list.k(new LatLon(this.a2l_1.v2b(index) * 57.29577951308232, this.a2l_1.w2b(index) * 57.29577951308232));
               }
                while (inductionVariable < size);
             var coords = list;
             this.j7_1 = 1;
-            suspendResult = this.y2k_1.u19(coords, VOID, this);
+            suspendResult = this.b2l_1.v19(coords, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -5419,17 +5424,17 @@
             continue $sm;
           case 1:
             var samples = suspendResult;
-            var out = copyAllSlots(this.w2k_1, this.x2k_1);
+            var out = copyAllSlots(this.z2k_1, this.a2l_1);
             var inductionVariable_0 = 0;
-            var last = out.q2b_1;
+            var last = out.s2b_1;
             if (inductionVariable_0 < last)
               do {
                 var i = inductionVariable_0;
                 inductionVariable_0 = inductionVariable_0 + 1 | 0;
-                out.p2c(i, samples.p(i).k19_1);
+                out.r2c(i, samples.p(i).l19_1);
               }
                while (inductionVariable_0 < last);
-            out.k2d();
+            out.m2d();
             return to(out, samples);
           case 2:
             throw this.m7_1;
@@ -5446,20 +5451,20 @@
      while (true);
   };
   function ElevationStep() {
-    this.z2k_1 = 150.0;
+    this.c2l_1 = 150.0;
   }
-  protoOf(ElevationStep).a2l = function (source, provider, $completion) {
+  protoOf(ElevationStep).d2l = function (source, provider, $completion) {
     var tmp = new $fixElevationWithOriginsCOROUTINE$(this, source, provider, $completion);
     tmp.l7_1 = Unit_instance;
     tmp.m7_1 = null;
     return tmp.r7();
   };
-  protoOf(ElevationStep).b2l = function (source, windowM) {
-    if (source.q2b_1 === 0)
+  protoOf(ElevationStep).e2l = function (source, windowM) {
+    if (source.s2b_1 === 0)
       return new Path(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = source.q2b_1;
+    var size = source.s2b_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -5467,7 +5472,7 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$4 = source.c2l(index);
+        var tmp$ret$4 = source.f2l(index);
         list.k(tmp$ret$4);
       }
        while (inductionVariable < size);
@@ -5475,19 +5480,19 @@
     var smoothed = ElevationSmoother_instance.h12(coords, windowM);
     var out = copyAllSlots(this, source);
     var inductionVariable_0 = 0;
-    var last = out.q2b_1;
+    var last = out.s2b_1;
     if (inductionVariable_0 < last)
       do {
         var i = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        if (isNaN_0(out.d2k(i))) {
-          out.d2l(i, source.v2b(i));
+        if (isNaN_0(out.g2k(i))) {
+          out.g2l(i, source.x2b(i));
         }
-        out.p2c(i, smoothed.p(i).s12());
+        out.r2c(i, smoothed.p(i).s12());
       }
        while (inductionVariable_0 < last);
-    out.k2d();
-    out.h2d_1 = source.h2d_1;
+    out.m2d();
+    out.j2d_1 = source.j2d_1;
     return out;
   };
   var ElevationStep_instance;
@@ -5496,21 +5501,21 @@
   }
   function FieldInterpolation() {
     FieldInterpolation_instance = this;
-    this.e2l_1 = 6.283185307179586;
-    this.f2l_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.h2l_1 = 6.283185307179586;
+    this.i2l_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).g2l = function (src, i1, i2, coef, dst, dstIdx) {
+  protoOf(FieldInterpolation).j2l = function (src, i1, i2, coef, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.n2k(dstIdx, field, this.h2l(field, src.t2e(i1, field), src.t2e(i2, field), coef));
+      dst.q2k(dstIdx, field, this.k2l(field, src.v2e(i1, field), src.v2e(i2, field), coef));
     }
   };
-  protoOf(FieldInterpolation).h2l = function (field, v1, v2, coef) {
+  protoOf(FieldInterpolation).k2l = function (field, v1, v2, coef) {
     if (isNaN_0(v1) || isNaN_0(v2))
       return NaN;
     var delta = v2 - v1;
-    if (!this.f2l_1.m1(field) || (delta >= -3.141592653589793 && delta <= 3.141592653589793))
+    if (!this.i2l_1.m1(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;
@@ -5524,235 +5529,235 @@
     return FieldInterpolation_instance;
   }
   function GeneratedPath(size) {
-    this.q2b_1 = size;
+    this.s2b_1 = size;
     // Inline function 'kotlin.require' call
-    if (!(this.q2b_1 >= 0)) {
-      var message = 'Negative size: ' + this.q2b_1;
+    if (!(this.s2b_1 >= 0)) {
+      var message = 'Negative size: ' + this.s2b_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    this.r2b_1 = new Float64Array(imul(this.q2b_1, 44));
+    this.t2b_1 = new Float64Array(imul(this.s2b_1, 44));
     var inductionVariable = 0;
-    var last = this.q2b_1;
+    var last = this.s2b_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        this.r2b_1[imul(i, 44) + 38 | 0] = NaN;
-        this.r2b_1[imul(i, 44) + 39 | 0] = NaN;
-        this.r2b_1[imul(i, 44) + 40 | 0] = NaN;
-        this.r2b_1[imul(i, 44) + 41 | 0] = NaN;
-        this.r2b_1[imul(i, 44) + 42 | 0] = NaN;
-        this.r2b_1[imul(i, 44) + 43 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 38 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 39 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 40 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 41 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 42 | 0] = NaN;
+        this.t2b_1[imul(i, 44) + 43 | 0] = NaN;
       }
        while (inductionVariable < last);
   }
-  protoOf(GeneratedPath).t2e = function (i, field) {
-    return this.r2b_1[imul(i, 44) + field.y1_1 | 0];
-  };
-  protoOf(GeneratedPath).n2k = function (i, field, v) {
-    this.r2b_1[imul(i, 44) + field.y1_1 | 0] = v;
-  };
-  protoOf(GeneratedPath).t2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 0 | 0];
-  };
-  protoOf(GeneratedPath).n2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 0 | 0] = v;
-  };
-  protoOf(GeneratedPath).u2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 1 | 0];
+  protoOf(GeneratedPath).v2e = function (i, field) {
+    return this.t2b_1[imul(i, 44) + field.y1_1 | 0];
   };
-  protoOf(GeneratedPath).o2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 1 | 0] = v;
+  protoOf(GeneratedPath).q2k = function (i, field, v) {
+    this.t2b_1[imul(i, 44) + field.y1_1 | 0] = v;
   };
-  protoOf(GeneratedPath).c2k = function (i) {
-    return this.r2b_1[imul(i, 44) + 2 | 0];
-  };
-  protoOf(GeneratedPath).i2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 2 | 0] = v;
+  protoOf(GeneratedPath).v2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 0 | 0];
   };
-  protoOf(GeneratedPath).j2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 3 | 0] = v;
+  protoOf(GeneratedPath).p2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 0 | 0] = v;
   };
-  protoOf(GeneratedPath).s2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 4 | 0];
+  protoOf(GeneratedPath).w2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 1 | 0];
   };
   protoOf(GeneratedPath).q2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 4 | 0] = v;
+    this.t2b_1[imul(i, 44) + 1 | 0] = v;
   };
-  protoOf(GeneratedPath).k2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 5 | 0];
+  protoOf(GeneratedPath).f2k = function (i) {
+    return this.t2b_1[imul(i, 44) + 2 | 0];
   };
   protoOf(GeneratedPath).l2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 5 | 0] = v;
+    this.t2b_1[imul(i, 44) + 2 | 0] = v;
   };
-  protoOf(GeneratedPath).m2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 6 | 0];
+  protoOf(GeneratedPath).m2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 3 | 0] = v;
   };
-  protoOf(GeneratedPath).n2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 6 | 0] = v;
+  protoOf(GeneratedPath).u2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 4 | 0];
   };
-  protoOf(GeneratedPath).o2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 7 | 0];
+  protoOf(GeneratedPath).s2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 4 | 0] = v;
   };
-  protoOf(GeneratedPath).p2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 7 | 0] = v;
+  protoOf(GeneratedPath).n2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 5 | 0];
   };
-  protoOf(GeneratedPath).v2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 8 | 0];
+  protoOf(GeneratedPath).o2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 5 | 0] = v;
   };
-  protoOf(GeneratedPath).p2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 8 | 0] = v;
+  protoOf(GeneratedPath).p2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 6 | 0];
+  };
+  protoOf(GeneratedPath).q2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 6 | 0] = v;
   };
-  protoOf(GeneratedPath).q2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 9 | 0];
+  protoOf(GeneratedPath).r2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 7 | 0];
   };
-  protoOf(GeneratedPath).r2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 9 | 0] = v;
+  protoOf(GeneratedPath).s2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 7 | 0] = v;
   };
-  protoOf(GeneratedPath).s2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 10 | 0];
+  protoOf(GeneratedPath).x2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 8 | 0];
+  };
+  protoOf(GeneratedPath).r2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 8 | 0] = v;
   };
-  protoOf(GeneratedPath).t2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 10 | 0] = v;
+  protoOf(GeneratedPath).t2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 9 | 0];
   };
   protoOf(GeneratedPath).u2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 11 | 0] = v;
+    this.t2b_1[imul(i, 44) + 9 | 0] = v;
   };
-  protoOf(GeneratedPath).v2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 12 | 0] = v;
+  protoOf(GeneratedPath).v2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 10 | 0];
   };
-  protoOf(GeneratedPath).w2l = function (i) {
-    return this.r2b_1[imul(i, 44) + 13 | 0];
+  protoOf(GeneratedPath).w2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 10 | 0] = v;
   };
   protoOf(GeneratedPath).x2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 13 | 0] = v;
+    this.t2b_1[imul(i, 44) + 11 | 0] = v;
   };
   protoOf(GeneratedPath).y2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 14 | 0] = v;
+    this.t2b_1[imul(i, 44) + 12 | 0] = v;
   };
-  protoOf(GeneratedPath).z2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 15 | 0] = v;
+  protoOf(GeneratedPath).z2l = function (i) {
+    return this.t2b_1[imul(i, 44) + 13 | 0];
   };
   protoOf(GeneratedPath).a2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 16 | 0] = v;
+    this.t2b_1[imul(i, 44) + 13 | 0] = v;
   };
   protoOf(GeneratedPath).b2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 17 | 0] = v;
-  };
-  protoOf(GeneratedPath).z2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 18 | 0];
-  };
-  protoOf(GeneratedPath).r2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 18 | 0] = v;
+    this.t2b_1[imul(i, 44) + 14 | 0] = v;
   };
   protoOf(GeneratedPath).c2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 19 | 0] = v;
+    this.t2b_1[imul(i, 44) + 15 | 0] = v;
   };
   protoOf(GeneratedPath).d2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 20 | 0] = v;
+    this.t2b_1[imul(i, 44) + 16 | 0] = v;
   };
   protoOf(GeneratedPath).e2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 21 | 0] = v;
+    this.t2b_1[imul(i, 44) + 17 | 0] = v;
+  };
+  protoOf(GeneratedPath).b2c = function (i) {
+    return this.t2b_1[imul(i, 44) + 18 | 0];
+  };
+  protoOf(GeneratedPath).t2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 18 | 0] = v;
   };
   protoOf(GeneratedPath).f2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 22 | 0] = v;
+    this.t2b_1[imul(i, 44) + 19 | 0] = v;
   };
   protoOf(GeneratedPath).g2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 23 | 0] = v;
+    this.t2b_1[imul(i, 44) + 20 | 0] = v;
   };
   protoOf(GeneratedPath).h2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 24 | 0] = v;
+    this.t2b_1[imul(i, 44) + 21 | 0] = v;
   };
   protoOf(GeneratedPath).i2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 25 | 0] = v;
-  };
-  protoOf(GeneratedPath).a2c = function (i) {
-    return this.r2b_1[imul(i, 44) + 26 | 0];
+    this.t2b_1[imul(i, 44) + 22 | 0] = v;
   };
   protoOf(GeneratedPath).j2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 26 | 0] = v;
+    this.t2b_1[imul(i, 44) + 23 | 0] = v;
   };
-  protoOf(GeneratedPath).k2m = function (i) {
-    return this.r2b_1[imul(i, 44) + 27 | 0];
+  protoOf(GeneratedPath).k2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 24 | 0] = v;
   };
   protoOf(GeneratedPath).l2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 27 | 0] = v;
+    this.t2b_1[imul(i, 44) + 25 | 0] = v;
   };
-  protoOf(GeneratedPath).m2m = function (i) {
-    return this.r2b_1[imul(i, 44) + 28 | 0];
+  protoOf(GeneratedPath).c2c = function (i) {
+    return this.t2b_1[imul(i, 44) + 26 | 0];
   };
-  protoOf(GeneratedPath).n2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 28 | 0] = v;
-  };
-  protoOf(GeneratedPath).o2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 29 | 0] = v;
+  protoOf(GeneratedPath).m2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 26 | 0] = v;
   };
-  protoOf(GeneratedPath).p2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 30 | 0] = v;
+  protoOf(GeneratedPath).n2m = function (i) {
+    return this.t2b_1[imul(i, 44) + 27 | 0];
   };
-  protoOf(GeneratedPath).y2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 31 | 0];
+  protoOf(GeneratedPath).o2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 27 | 0] = v;
   };
-  protoOf(GeneratedPath).u2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 31 | 0] = v;
+  protoOf(GeneratedPath).p2m = function (i) {
+    return this.t2b_1[imul(i, 44) + 28 | 0];
   };
-  protoOf(GeneratedPath).q2m = function (i) {
-    return this.r2b_1[imul(i, 44) + 32 | 0];
+  protoOf(GeneratedPath).q2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 28 | 0] = v;
   };
   protoOf(GeneratedPath).r2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 32 | 0] = v;
+    this.t2b_1[imul(i, 44) + 29 | 0] = v;
   };
   protoOf(GeneratedPath).s2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 33 | 0] = v;
+    this.t2b_1[imul(i, 44) + 30 | 0] = v;
   };
-  protoOf(GeneratedPath).w2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 34 | 0];
+  protoOf(GeneratedPath).a2c = function (i) {
+    return this.t2b_1[imul(i, 44) + 31 | 0];
   };
-  protoOf(GeneratedPath).s2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 34 | 0] = v;
+  protoOf(GeneratedPath).w2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 31 | 0] = v;
   };
-  protoOf(GeneratedPath).x2b = function (i) {
-    return this.r2b_1[imul(i, 44) + 35 | 0];
+  protoOf(GeneratedPath).t2m = function (i) {
+    return this.t2b_1[imul(i, 44) + 32 | 0];
   };
-  protoOf(GeneratedPath).t2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 35 | 0] = v;
+  protoOf(GeneratedPath).u2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 32 | 0] = v;
   };
-  protoOf(GeneratedPath).t2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 36 | 0] = v;
+  protoOf(GeneratedPath).v2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 33 | 0] = v;
   };
-  protoOf(GeneratedPath).u2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 37 | 0] = v;
+  protoOf(GeneratedPath).y2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 34 | 0];
   };
-  protoOf(GeneratedPath).v2m = function (i) {
-    return this.r2b_1[imul(i, 44) + 38 | 0];
+  protoOf(GeneratedPath).u2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 34 | 0] = v;
   };
-  protoOf(GeneratedPath).w2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 38 | 0] = v;
+  protoOf(GeneratedPath).z2b = function (i) {
+    return this.t2b_1[imul(i, 44) + 35 | 0];
+  };
+  protoOf(GeneratedPath).v2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 35 | 0] = v;
   };
-  protoOf(GeneratedPath).x2m = function (i) {
-    return this.r2b_1[imul(i, 44) + 39 | 0];
+  protoOf(GeneratedPath).w2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 36 | 0] = v;
   };
-  protoOf(GeneratedPath).x2c = function (i, v) {
-    this.r2b_1[imul(i, 44) + 39 | 0] = v;
+  protoOf(GeneratedPath).x2m = function (i, v) {
+    this.t2b_1[imul(i, 44) + 37 | 0] = v;
   };
-  protoOf(GeneratedPath).y2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 40 | 0] = v;
+  protoOf(GeneratedPath).y2m = function (i) {
+    return this.t2b_1[imul(i, 44) + 38 | 0];
   };
   protoOf(GeneratedPath).z2m = function (i, v) {
-    this.r2b_1[imul(i, 44) + 41 | 0] = v;
+    this.t2b_1[imul(i, 44) + 38 | 0] = v;
+  };
+  protoOf(GeneratedPath).a2n = function (i) {
+    return this.t2b_1[imul(i, 44) + 39 | 0];
+  };
+  protoOf(GeneratedPath).z2c = function (i, v) {
+    this.t2b_1[imul(i, 44) + 39 | 0] = v;
   };
-  protoOf(GeneratedPath).a2n = function (i, v) {
-    this.r2b_1[imul(i, 44) + 42 | 0] = v;
+  protoOf(GeneratedPath).b2n = function (i, v) {
+    this.t2b_1[imul(i, 44) + 40 | 0] = v;
   };
-  protoOf(GeneratedPath).d2k = function (i) {
-    return this.r2b_1[imul(i, 44) + 43 | 0];
+  protoOf(GeneratedPath).c2n = function (i, v) {
+    this.t2b_1[imul(i, 44) + 41 | 0] = v;
   };
-  protoOf(GeneratedPath).d2l = function (i, v) {
-    this.r2b_1[imul(i, 44) + 43 | 0] = v;
+  protoOf(GeneratedPath).d2n = function (i, v) {
+    this.t2b_1[imul(i, 44) + 42 | 0] = v;
+  };
+  protoOf(GeneratedPath).g2k = function (i) {
+    return this.t2b_1[imul(i, 44) + 43 | 0];
+  };
+  protoOf(GeneratedPath).g2l = function (i, v) {
+    this.t2b_1[imul(i, 44) + 43 | 0] = v;
   };
   function Companion_7() {
     Companion_instance_8 = this;
-    this.b2n_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
+    this.e2n_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
   }
   var Companion_instance_8;
   function Companion_getInstance_7() {
@@ -5762,19 +5767,19 @@
   }
   function BoundsRad(minLat, maxLat, minLon, maxLon) {
     Companion_getInstance_7();
-    this.c2n_1 = minLat;
-    this.d2n_1 = maxLat;
-    this.e2n_1 = minLon;
-    this.f2n_1 = maxLon;
+    this.f2n_1 = minLat;
+    this.g2n_1 = maxLat;
+    this.h2n_1 = minLon;
+    this.i2n_1 = maxLon;
   }
   protoOf(BoundsRad).toString = function () {
-    return 'BoundsRad(minLat=' + this.c2n_1 + ', maxLat=' + this.d2n_1 + ', minLon=' + this.e2n_1 + ', maxLon=' + this.f2n_1 + ')';
+    return 'BoundsRad(minLat=' + this.f2n_1 + ', maxLat=' + this.g2n_1 + ', minLon=' + this.h2n_1 + ', maxLon=' + this.i2n_1 + ')';
   };
   protoOf(BoundsRad).hashCode = function () {
-    var result = getNumberHashCode(this.c2n_1);
-    result = imul(result, 31) + getNumberHashCode(this.d2n_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e2n_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f2n_1) | 0;
+    var result = getNumberHashCode(this.f2n_1);
+    result = imul(result, 31) + getNumberHashCode(this.g2n_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.h2n_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i2n_1) | 0;
     return result;
   };
   protoOf(BoundsRad).equals = function (other) {
@@ -5782,19 +5787,17 @@
       return true;
     if (!(other instanceof BoundsRad))
       return false;
-    if (!equals(this.c2n_1, other.c2n_1))
+    if (!equals(this.f2n_1, other.f2n_1))
       return false;
-    if (!equals(this.d2n_1, other.d2n_1))
+    if (!equals(this.g2n_1, other.g2n_1))
       return false;
-    if (!equals(this.e2n_1, other.e2n_1))
+    if (!equals(this.h2n_1, other.h2n_1))
       return false;
-    if (!equals(this.f2n_1, other.f2n_1))
+    if (!equals(this.i2n_1, other.i2n_1))
       return false;
     return true;
   };
   function copyStatsFrom($this, other) {
-    $this.a2d_1 = other.a2d_1;
-    $this.b2d_1 = other.b2d_1;
     $this.c2d_1 = other.c2d_1;
     $this.d2d_1 = other.d2d_1;
     $this.e2d_1 = other.e2d_1;
@@ -5803,22 +5806,24 @@
     $this.h2d_1 = other.h2d_1;
     $this.i2d_1 = other.i2d_1;
     $this.j2d_1 = other.j2d_1;
+    $this.k2d_1 = other.k2d_1;
+    $this.l2d_1 = other.l2d_1;
   }
   function resetStats($this) {
-    $this.a2d_1 = 0.0;
-    $this.b2d_1 = 0.0;
     $this.c2d_1 = 0.0;
     $this.d2d_1 = 0.0;
     $this.e2d_1 = 0.0;
-    $this.f2d_1 = NaN;
-    $this.g2d_1 = NaN;
-    $this.i2d_1 = 0.0;
-    $this.j2d_1 = Companion_getInstance_7().b2n_1;
+    $this.f2d_1 = 0.0;
+    $this.g2d_1 = 0.0;
+    $this.h2d_1 = NaN;
+    $this.i2d_1 = NaN;
+    $this.k2d_1 = 0.0;
+    $this.l2d_1 = Companion_getInstance_7().e2n_1;
   }
   function computeBearing($this, from, to) {
-    var lat1 = $this.t2b(from);
-    var lat2 = $this.t2b(to);
-    var dLon = $this.u2b(to) - $this.u2b(from);
+    var lat1 = $this.v2b(from);
+    var lat2 = $this.v2b(to);
+    var dLon = $this.w2b(to) - $this.w2b(from);
     if (dLon > 3.141592653589793) {
       dLon = dLon - 2 * 3.141592653589793;
     } else if (dLon <= -3.141592653589793) {
@@ -5841,41 +5846,41 @@
   }
   function Path(size) {
     GeneratedPath.call(this, size);
-    this.a2d_1 = 0.0;
-    this.b2d_1 = 0.0;
     this.c2d_1 = 0.0;
     this.d2d_1 = 0.0;
     this.e2d_1 = 0.0;
-    this.f2d_1 = NaN;
-    this.g2d_1 = NaN;
-    this.h2d_1 = null;
-    this.i2d_1 = 0.0;
-    this.j2d_1 = Companion_getInstance_7().b2n_1;
+    this.f2d_1 = 0.0;
+    this.g2d_1 = 0.0;
+    this.h2d_1 = NaN;
+    this.i2d_1 = NaN;
+    this.j2d_1 = null;
+    this.k2d_1 = 0.0;
+    this.l2d_1 = Companion_getInstance_7().e2n_1;
   }
-  protoOf(Path).g2n = function () {
-    return isNaN_0(this.f2d_1) ? this.d2d_1 : this.f2d_1;
+  protoOf(Path).j2n = function () {
+    return isNaN_0(this.h2d_1) ? this.f2d_1 : this.h2d_1;
   };
-  protoOf(Path).h2n = function () {
-    return isNaN_0(this.g2d_1) ? this.e2d_1 : this.g2d_1;
+  protoOf(Path).k2n = function () {
+    return isNaN_0(this.i2d_1) ? this.g2d_1 : this.i2d_1;
   };
-  protoOf(Path).i2n = function () {
-    return until(0, this.q2b_1);
+  protoOf(Path).l2n = function () {
+    return until(0, this.s2b_1);
   };
-  protoOf(Path).j2n = function (i) {
-    return this.t2b(i) * 57.29577951308232;
+  protoOf(Path).m2n = function (i) {
+    return this.v2b(i) * 57.29577951308232;
   };
-  protoOf(Path).k2n = function (i) {
-    return this.u2b(i) * 57.29577951308232;
+  protoOf(Path).n2n = function (i) {
+    return this.w2b(i) * 57.29577951308232;
   };
-  protoOf(Path).c2l = function (i) {
-    return new LatLonElevation(this.j2n(i), this.k2n(i), this.v2b(i));
+  protoOf(Path).f2l = function (i) {
+    return new LatLonElevation(this.m2n(i), this.n2n(i), this.x2b(i));
   };
-  protoOf(Path).l2n = function () {
-    var out = new Path(this.q2b_1);
-    var tmp0 = this.r2b_1;
-    var tmp2 = out.r2b_1;
+  protoOf(Path).o2n = function () {
+    var out = new Path(this.s2b_1);
+    var tmp0 = this.t2b_1;
+    var tmp2 = out.t2b_1;
     // Inline function 'kotlin.collections.copyInto' call
-    var endIndex = this.r2b_1.length;
+    var endIndex = this.t2b_1.length;
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
     var tmp = tmp0;
@@ -5885,11 +5890,11 @@
     copyStatsFrom(out, this);
     return out;
   };
-  protoOf(Path).k2d = function () {
+  protoOf(Path).m2d = function () {
     resetStats(this);
-    if (this.q2b_1 === 0)
+    if (this.s2b_1 === 0)
       return Unit_instance;
-    var timeStart = this.s2b(0);
+    var timeStart = this.u2b(0);
     var cumDist = 0.0;
     var minLat = Infinity;
     var maxLat = -Infinity;
@@ -5900,14 +5905,14 @@
     var gain = 0.0;
     var loss = 0.0;
     var inductionVariable = 0;
-    var last = this.q2b_1;
+    var last = this.s2b_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var lat = this.t2b(i);
-        var lon = this.u2b(i);
-        var ele = this.v2b(i);
+        var lat = this.v2b(i);
+        var lon = this.w2b(i);
+        var ele = this.x2b(i);
         // Inline function 'kotlin.math.min' call
         var a = minLat;
         minLat = Math.min(a, lat);
@@ -5927,67 +5932,67 @@
         var a_4 = maxEle;
         maxEle = Math.max(a_4, ele);
         if (i > 0) {
-          var prevCoord = new LatLon(this.j2n(i - 1 | 0), this.k2n(i - 1 | 0));
-          var curCoord = new LatLon(this.j2n(i), this.k2n(i));
+          var prevCoord = new LatLon(this.m2n(i - 1 | 0), this.n2n(i - 1 | 0));
+          var curCoord = new LatLon(this.m2n(i), this.n2n(i));
           cumDist = cumDist + Distance_instance.n12(prevCoord, curCoord);
-          var dEle = ele - this.v2b(i - 1 | 0);
+          var dEle = ele - this.x2b(i - 1 | 0);
           if (dEle > 0)
             gain = gain + dEle;
           else
             loss = loss + dEle;
         }
-        this.i2l(i, cumDist);
+        this.l2l(i, cumDist);
       }
        while (inductionVariable < last);
-    this.a2d_1 = cumDist;
-    this.b2d_1 = minEle === Infinity ? 0.0 : minEle;
-    this.c2d_1 = maxEle === -Infinity ? 0.0 : maxEle;
-    this.d2d_1 = gain;
-    this.e2d_1 = loss;
-    this.j2d_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
-    this.i2d_1 = this.q2b_1 >= 2 ? this.s2b(this.q2b_1 - 1 | 0) - timeStart : 0.0;
+    this.c2d_1 = cumDist;
+    this.d2d_1 = minEle === Infinity ? 0.0 : minEle;
+    this.e2d_1 = maxEle === -Infinity ? 0.0 : maxEle;
+    this.f2d_1 = gain;
+    this.g2d_1 = loss;
+    this.l2d_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
+    this.k2d_1 = this.s2b_1 >= 2 ? this.u2b(this.s2b_1 - 1 | 0) - timeStart : 0.0;
     var inductionVariable_0 = 0;
-    var last_0 = this.q2b_1;
+    var last_0 = this.s2b_1;
     if (inductionVariable_0 < last_0)
       $l$loop: do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        this.l2l(i_0, (this.s2b(i_0) - timeStart) / 1000.0);
-        if (this.q2b_1 <= 1)
+        this.o2l(i_0, (this.u2b(i_0) - timeStart) / 1000.0);
+        if (this.s2b_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.q2b_1 - 1 | 0;
+        var tmp0 = this.s2b_1 - 1 | 0;
         // Inline function 'kotlin.math.min' call
         var b_0 = i_0 + 1 | 0;
         var ip1 = Math.min(tmp0, b_0);
-        this.p2l(i_0, computeBearing(this, im1, ip1));
-        var dDist = (this.c2k(ip1) - this.c2k(im1)) / 2.0;
-        var dEle_0 = (this.v2b(ip1) - this.v2b(im1)) / 2.0;
+        this.s2l(i_0, computeBearing(this, im1, ip1));
+        var dDist = (this.f2k(ip1) - this.f2k(im1)) / 2.0;
+        var dEle_0 = (this.x2b(ip1) - this.x2b(im1)) / 2.0;
         var grade = dDist === 0.0 ? 0.0 : dEle_0 / dDist;
-        this.r2l(i_0, grade);
-        var dTime = (this.s2b(ip1) - this.s2b(im1)) / 2000.0;
-        this.j2l(i_0, dDist);
-        this.n2l(i_0, dTime);
-        this.l2m(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
+        this.u2l(i_0, grade);
+        var dTime = (this.u2b(ip1) - this.u2b(im1)) / 2000.0;
+        this.m2l(i_0, dDist);
+        this.q2l(i_0, dTime);
+        this.o2m(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
       }
        while (inductionVariable_0 < last_0);
   };
   function PathSimplifier() {
   }
-  protoOf(PathSimplifier).m2n = function (path, toleranceM, zExaggeration) {
-    if (path.q2b_1 <= 2)
-      return path.l2n();
-    var coords = ArrayList_init_$Create$_0(path.q2b_1);
+  protoOf(PathSimplifier).p2n = function (path, toleranceM, zExaggeration) {
+    if (path.s2b_1 <= 2)
+      return path.o2n();
+    var coords = ArrayList_init_$Create$_0(path.s2b_1);
     var inductionVariable = 0;
-    var last = path.q2b_1;
+    var last = path.s2b_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.collections.plusAssign' call
-        var element = new LatLonElevation(path.t2b(i) * 57.29577951308232, path.u2b(i) * 57.29577951308232, path.v2b(i));
+        var element = new LatLonElevation(path.v2b(i) * 57.29577951308232, path.w2b(i) * 57.29577951308232, path.x2b(i));
         coords.k(element);
       }
        while (inductionVariable < last);
@@ -6020,13 +6025,13 @@
       var _iterator__ex2g4s_0 = get_entries_3().l();
       while (_iterator__ex2g4s_0.m()) {
         var field = _iterator__ex2g4s_0.n();
-        out.n2k(dstIdx, field, path.t2e(srcIdx, field));
+        out.q2k(dstIdx, field, path.v2e(srcIdx, field));
       }
     }
-    out.k2d();
-    out.f2d_1 = path.f2d_1;
-    out.g2d_1 = path.g2d_1;
+    out.m2d();
     out.h2d_1 = path.h2d_1;
+    out.i2d_1 = path.i2d_1;
+    out.j2d_1 = path.j2d_1;
     return out;
   };
   var PathSimplifier_instance;
@@ -6133,7 +6138,7 @@
   var PointField_SOURCE_ELEVATION_instance;
   function Companion_9() {
     Companion_instance_10 = this;
-    this.n2n_1 = 44;
+    this.q2n_1 = 44;
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
     var this_0 = get_entries_3();
@@ -6143,13 +6148,13 @@
     var _iterator__ex2g4s = this_0.l();
     while (_iterator__ex2g4s.m()) {
       var element = _iterator__ex2g4s.n();
-      var tmp$ret$2 = element.l2e_1;
+      var tmp$ret$2 = element.n2e_1;
       destination.v3(tmp$ret$2, element);
     }
-    tmp.o2n_1 = destination;
+    tmp.r2n_1 = destination;
   }
-  protoOf(Companion_9).p2n = function (prop) {
-    return this.o2n_1.t1(prop);
+  protoOf(Companion_9).s2n = function (prop) {
+    return this.r2n_1.t1(prop);
   };
   var Companion_instance_10;
   function Companion_getInstance_9() {
@@ -6172,13 +6177,13 @@
     anglesInRadians = anglesInRadians === VOID ? false : anglesInRadians;
     nanDefault = nanDefault === VOID ? false : nanDefault;
     Enum.call(this, name, ordinal);
-    this.l2e_1 = prop;
-    this.m2e_1 = unit;
-    this.n2e_1 = shortDescription;
-    this.o2e_1 = category;
-    this.p2e_1 = notSelectable;
-    this.q2e_1 = anglesInRadians;
-    this.r2e_1 = nanDefault;
+    this.n2e_1 = prop;
+    this.o2e_1 = unit;
+    this.p2e_1 = shortDescription;
+    this.q2e_1 = category;
+    this.r2e_1 = notSelectable;
+    this.s2e_1 = anglesInRadians;
+    this.t2e_1 = nanDefault;
   }
   function PointField_LATITUDE_getInstance() {
     static_init_4();
@@ -6394,8 +6399,8 @@
   var PointFieldCategory_ROAD_instance;
   function PointFieldCategory(name, ordinal, id, displayName) {
     Enum.call(this, name, ordinal);
-    this.s2n_1 = id;
-    this.t2n_1 = displayName;
+    this.v2n_1 = id;
+    this.w2n_1 = displayName;
   }
   function PointFieldCategory_COORDINATES_getInstance() {
     static_init_5();
@@ -6458,35 +6463,35 @@
     return PointFieldCategory_ROAD_instance;
   }
   function Copy(sourceIndex) {
-    this.u2n_1 = sourceIndex;
+    this.x2n_1 = sourceIndex;
   }
   protoOf(Copy).toString = function () {
-    return 'Copy(sourceIndex=' + this.u2n_1 + ')';
+    return 'Copy(sourceIndex=' + this.x2n_1 + ')';
   };
   protoOf(Copy).hashCode = function () {
-    return this.u2n_1;
+    return this.x2n_1;
   };
   protoOf(Copy).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy))
       return false;
-    if (!(this.u2n_1 === other.u2n_1))
+    if (!(this.x2n_1 === other.x2n_1))
       return false;
     return true;
   };
   function Interpolate(from, to, coef) {
-    this.v2n_1 = from;
-    this.w2n_1 = to;
-    this.x2n_1 = coef;
+    this.y2n_1 = from;
+    this.z2n_1 = to;
+    this.a2o_1 = coef;
   }
   protoOf(Interpolate).toString = function () {
-    return 'Interpolate(from=' + this.v2n_1 + ', to=' + this.w2n_1 + ', coef=' + this.x2n_1 + ')';
+    return 'Interpolate(from=' + this.y2n_1 + ', to=' + this.z2n_1 + ', coef=' + this.a2o_1 + ')';
   };
   protoOf(Interpolate).hashCode = function () {
-    var result = this.v2n_1;
-    result = imul(result, 31) + this.w2n_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.x2n_1) | 0;
+    var result = this.y2n_1;
+    result = imul(result, 31) + this.z2n_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.a2o_1) | 0;
     return result;
   };
   protoOf(Interpolate).equals = function (other) {
@@ -6494,28 +6499,28 @@
       return true;
     if (!(other instanceof Interpolate))
       return false;
-    if (!(this.v2n_1 === other.v2n_1))
+    if (!(this.y2n_1 === other.y2n_1))
       return false;
-    if (!(this.w2n_1 === other.w2n_1))
+    if (!(this.z2n_1 === other.z2n_1))
       return false;
-    if (!equals(this.x2n_1, other.x2n_1))
+    if (!equals(this.a2o_1, other.a2o_1))
       return false;
     return true;
   };
   function buildPlan($this, source, minDistanceM, maxDistanceM) {
-    var n = source.q2b_1;
+    var n = source.s2b_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.c2k(0);
+    var lastAddedDistance = source.f2k(0);
     var lastAddedIndex = 0;
     var inductionVariable = 1;
     if (inductionVariable < n)
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var curDist = source.c2k(i);
+        var curDist = source.f2k(i);
         var gap = curDist - lastAddedDistance;
         if (gap < minDistanceM)
           continue $l$loop;
@@ -6538,11 +6543,11 @@
               var j = inductionVariable_0;
               inductionVariable_0 = inductionVariable_0 + 1 | 0;
               var targetDistance = lastAddedDistance + j * spacing;
-              while (index1 < (i - 1 | 0) && source.c2k(index1 + 1 | 0) < targetDistance) {
+              while (index1 < (i - 1 | 0) && source.f2k(index1 + 1 | 0) < targetDistance) {
                 index1 = index1 + 1 | 0;
               }
-              var dist1 = source.c2k(index1);
-              var dist2 = source.c2k(index1 + 1 | 0);
+              var dist1 = source.f2k(index1);
+              var dist2 = source.f2k(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);
@@ -6568,42 +6573,42 @@
       index = index + 1 | 0;
       var op = iterator.n();
       if (op instanceof Copy) {
-        copyFields($this, source, op.u2n_1, out, dstIdx);
+        copyFields($this, source, op.x2n_1, out, dstIdx);
       } else {
         if (op instanceof Interpolate) {
-          FieldInterpolation_getInstance().g2l(source, op.v2n_1, op.w2n_1, op.x2n_1, out, dstIdx);
+          FieldInterpolation_getInstance().j2l(source, op.y2n_1, op.z2n_1, op.a2o_1, out, dstIdx);
         } else {
           noWhenBranchMatchedException();
         }
       }
     }
-    out.k2d();
+    out.m2d();
     return out;
   }
   function copyFields($this, src, srcIdx, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.n2k(dstIdx, field, src.t2e(srcIdx, field));
+      dst.q2k(dstIdx, field, src.v2e(srcIdx, field));
     }
   }
   function PointPerDistance() {
   }
-  protoOf(PointPerDistance).y2n = function (source, minDistanceM, maxDistanceM) {
-    return this.z2n(source, minDistanceM, maxDistanceM);
+  protoOf(PointPerDistance).b2o = function (source, minDistanceM, maxDistanceM) {
+    return this.c2o(source, minDistanceM, maxDistanceM);
   };
-  protoOf(PointPerDistance).z2n = function (source, minDistanceM, maxDistanceM) {
+  protoOf(PointPerDistance).c2o = 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.q2b_1 === 0)
+    if (source.s2b_1 === 0)
       return new Path(0);
-    if (source.q2b_1 === 1) {
+    if (source.s2b_1 === 1) {
       var out = new Path(1);
       copyFields(this, source, 0, out, 0);
-      out.k2d();
+      out.m2d();
       return out;
     }
     var plan = buildPlan(this, source, minDistanceM, maxDistanceM);
@@ -6614,35 +6619,35 @@
     return PointPerDistance_instance;
   }
   function Copy_0(sourceIndex) {
-    this.a2o_1 = sourceIndex;
+    this.d2o_1 = sourceIndex;
   }
   protoOf(Copy_0).toString = function () {
-    return 'Copy(sourceIndex=' + this.a2o_1 + ')';
+    return 'Copy(sourceIndex=' + this.d2o_1 + ')';
   };
   protoOf(Copy_0).hashCode = function () {
-    return this.a2o_1;
+    return this.d2o_1;
   };
   protoOf(Copy_0).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy_0))
       return false;
-    if (!(this.a2o_1 === other.a2o_1))
+    if (!(this.d2o_1 === other.d2o_1))
       return false;
     return true;
   };
   function Interpolate_0(from, to, coef) {
-    this.b2o_1 = from;
-    this.c2o_1 = to;
-    this.d2o_1 = coef;
+    this.e2o_1 = from;
+    this.f2o_1 = to;
+    this.g2o_1 = coef;
   }
   protoOf(Interpolate_0).toString = function () {
-    return 'Interpolate(from=' + this.b2o_1 + ', to=' + this.c2o_1 + ', coef=' + this.d2o_1 + ')';
+    return 'Interpolate(from=' + this.e2o_1 + ', to=' + this.f2o_1 + ', coef=' + this.g2o_1 + ')';
   };
   protoOf(Interpolate_0).hashCode = function () {
-    var result = this.b2o_1;
-    result = imul(result, 31) + this.c2o_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.d2o_1) | 0;
+    var result = this.e2o_1;
+    result = imul(result, 31) + this.f2o_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.g2o_1) | 0;
     return result;
   };
   protoOf(Interpolate_0).equals = function (other) {
@@ -6650,23 +6655,23 @@
       return true;
     if (!(other instanceof Interpolate_0))
       return false;
-    if (!(this.b2o_1 === other.b2o_1))
+    if (!(this.e2o_1 === other.e2o_1))
       return false;
-    if (!(this.c2o_1 === other.c2o_1))
+    if (!(this.f2o_1 === other.f2o_1))
       return false;
-    if (!equals(this.d2o_1, other.d2o_1))
+    if (!equals(this.g2o_1, other.g2o_1))
       return false;
     return true;
   };
   function buildPlan_0($this, source) {
     var plan = LinkedHashMap_init_$Create$_0();
-    var n = source.q2b_1;
+    var n = source.s2b_1;
     var inductionVariable = 0;
     if (inductionVariable < n)
       $l$loop_0: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var time1 = source.s2b(i);
+        var time1 = source.u2b(i);
         // Inline function 'kotlin.math.floor' call
         var x = time1 / 1000.0;
         var tmp$ret$0 = Math.floor(x);
@@ -6687,7 +6692,7 @@
           }
           continue $l$loop_0;
         }
-        var time2 = source.s2b(i + 1 | 0);
+        var time2 = source.u2b(i + 1 | 0);
         // Inline function 'kotlin.math.floor' call
         var x_0 = time2 / 1000.0;
         var tmp$ret$4 = Math.floor(x_0);
@@ -6732,30 +6737,30 @@
       }
       var data = tmp;
       if (data instanceof Copy_0) {
-        copyFields_0($this, source, data.a2o_1, out, idx);
+        copyFields_0($this, source, data.d2o_1, out, idx);
       } else {
         if (data instanceof Interpolate_0) {
-          FieldInterpolation_getInstance().g2l(source, data.b2o_1, data.c2o_1, data.d2o_1, out, idx);
+          FieldInterpolation_getInstance().j2l(source, data.e2o_1, data.f2o_1, data.g2o_1, out, idx);
         } else {
           noWhenBranchMatchedException();
         }
       }
-      out.q2c(idx, toNumber(multiply(epoch, new Long(1000, 0))));
+      out.s2c(idx, toNumber(multiply(epoch, new Long(1000, 0))));
     }
-    out.k2d();
+    out.m2d();
     return out;
   }
   function copyFields_0($this, src, srcIdx, dst, dstIdx) {
     var _iterator__ex2g4s = get_entries_3().l();
     while (_iterator__ex2g4s.m()) {
       var field = _iterator__ex2g4s.n();
-      dst.n2k(dstIdx, field, src.t2e(srcIdx, field));
+      dst.q2k(dstIdx, field, src.v2e(srcIdx, field));
     }
   }
   function PointPerSecond() {
   }
-  protoOf(PointPerSecond).e2o = function (source) {
-    if (source.q2b_1 === 0)
+  protoOf(PointPerSecond).h2o = function (source) {
+    if (source.s2b_1 === 0)
       return new Path(0);
     var plan = buildPlan_0(this, source);
     return materialize_0(this, source, plan);
@@ -6765,33 +6770,33 @@
     return PointPerSecond_instance;
   }
   function TunnelSpan(first, last, chordGrade, heightM, riseGrade, fallGrade, straightness, stepM) {
-    this.f2o_1 = first;
-    this.g2o_1 = last;
-    this.h2o_1 = chordGrade;
-    this.i2o_1 = heightM;
-    this.j2o_1 = riseGrade;
-    this.k2o_1 = fallGrade;
-    this.l2o_1 = straightness;
-    this.m2o_1 = stepM;
+    this.i2o_1 = first;
+    this.j2o_1 = last;
+    this.k2o_1 = chordGrade;
+    this.l2o_1 = heightM;
+    this.m2o_1 = riseGrade;
+    this.n2o_1 = fallGrade;
+    this.o2o_1 = straightness;
+    this.p2o_1 = stepM;
   }
-  protoOf(TunnelSpan).n2o = function () {
-    return this.f2o_1 * this.m2o_1;
+  protoOf(TunnelSpan).q2o = function () {
+    return this.i2o_1 * this.p2o_1;
   };
-  protoOf(TunnelSpan).o2o = function () {
-    return this.g2o_1 * this.m2o_1;
+  protoOf(TunnelSpan).r2o = function () {
+    return this.j2o_1 * this.p2o_1;
   };
   protoOf(TunnelSpan).toString = function () {
-    return 'TunnelSpan(first=' + this.f2o_1 + ', last=' + this.g2o_1 + ', chordGrade=' + this.h2o_1 + ', heightM=' + this.i2o_1 + ', riseGrade=' + this.j2o_1 + ', fallGrade=' + this.k2o_1 + ', straightness=' + this.l2o_1 + ', stepM=' + this.m2o_1 + ')';
+    return 'TunnelSpan(first=' + this.i2o_1 + ', last=' + this.j2o_1 + ', chordGrade=' + this.k2o_1 + ', heightM=' + this.l2o_1 + ', riseGrade=' + this.m2o_1 + ', fallGrade=' + this.n2o_1 + ', straightness=' + this.o2o_1 + ', stepM=' + this.p2o_1 + ')';
   };
   protoOf(TunnelSpan).hashCode = function () {
-    var result = this.f2o_1;
-    result = imul(result, 31) + this.g2o_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h2o_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i2o_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.j2o_1) | 0;
+    var result = this.i2o_1;
+    result = imul(result, 31) + this.j2o_1 | 0;
     result = imul(result, 31) + getNumberHashCode(this.k2o_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.l2o_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.m2o_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.n2o_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.o2o_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.p2o_1) | 0;
     return result;
   };
   protoOf(TunnelSpan).equals = function (other) {
@@ -6799,15 +6804,9 @@
       return true;
     if (!(other instanceof TunnelSpan))
       return false;
-    if (!(this.f2o_1 === other.f2o_1))
-      return false;
-    if (!(this.g2o_1 === other.g2o_1))
+    if (!(this.i2o_1 === other.i2o_1))
       return false;
-    if (!equals(this.h2o_1, other.h2o_1))
-      return false;
-    if (!equals(this.i2o_1, other.i2o_1))
-      return false;
-    if (!equals(this.j2o_1, other.j2o_1))
+    if (!(this.j2o_1 === other.j2o_1))
       return false;
     if (!equals(this.k2o_1, other.k2o_1))
       return false;
@@ -6815,30 +6814,36 @@
       return false;
     if (!equals(this.m2o_1, other.m2o_1))
       return false;
+    if (!equals(this.n2o_1, other.n2o_1))
+      return false;
+    if (!equals(this.o2o_1, other.o2o_1))
+      return false;
+    if (!equals(this.p2o_1, other.p2o_1))
+      return false;
     return true;
   };
   function Stations(options) {
-    this.p2o_1 = options.i2p();
-    this.q2o_1 = options.j2p();
-    this.r2o_1 = options.k2p();
     this.s2o_1 = options.l2p();
+    this.t2o_1 = options.m2p();
+    this.u2o_1 = options.n2p();
+    this.v2o_1 = options.o2p();
   }
   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.q2o_1;
-    var z = profile.m2p_1;
+    var w = stations.t2o_1;
+    var z = profile.p2p_1;
     var n = z.length;
-    var step = options.t2o_1;
+    var step = options.w2o_1;
     var length = (b - a | 0) * step;
-    if (length < options.f2p_1 - 1.0E-9)
+    if (length < options.i2p_1 - 1.0E-9)
       return null;
-    var chord = Distance_instance.n12(new LatLon(profile.n2p_1[a], profile.o2p_1[a]), new LatLon(profile.n2p_1[b], profile.o2p_1[b]));
+    var chord = Distance_instance.n12(new LatLon(profile.q2p_1[a], profile.r2p_1[a]), new LatLon(profile.q2p_1[b], profile.r2p_1[b]));
     var straightness = chord / length;
-    if (!(straightness >= options.h2p_1))
+    if (!(straightness >= options.k2p_1))
       return null;
-    var w0 = stations.q2o_1;
+    var w0 = stations.t2o_1;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_0 = a - w0 | 0;
     var inductionVariable = Math.max(0, b_0);
@@ -6869,7 +6874,7 @@
        while (!(k_0 === last));
     var c = (z[b] - z[a]) / length;
     // Inline function 'kotlin.math.abs' call
-    if (!(Math.abs(c) <= options.a2p_1))
+    if (!(Math.abs(c) <= options.d2p_1))
       return null;
     var height = -Infinity;
     var inductionVariable_1 = a;
@@ -6878,15 +6883,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.d2p_1)
+        if (isNaN_0(h) || h < -options.g2p_1)
           return null;
         if (h > height)
           height = h;
       }
        while (!(k_1 === b));
-    if (height < options.b2p_1)
+    if (height < options.e2p_1)
       return null;
-    var f = stations.s2o_1;
+    var f = stations.v2o_1;
     var nearEntry = -Infinity;
     var inductionVariable_2 = a;
     // Inline function 'kotlin.comparisons.minOf' call
@@ -6916,9 +6921,9 @@
         nearExit = Math.max(tmp0_1, b_5);
       }
        while (!(k_3 === b));
-    if (nearEntry < options.b2p_1 || nearExit < options.b2p_1)
+    if (nearEntry < options.e2p_1 || nearExit < options.e2p_1)
       return null;
-    var s = stations.r2o_1;
+    var s = stations.u2o_1;
     var rise = -Infinity;
     // Inline function 'kotlin.comparisons.maxOf' call
     var b_6 = a - (w / 2 | 0) | 0;
@@ -6950,7 +6955,7 @@
           fall = g_0;
       }
        while (!(k_5 === last_2));
-    if (rise < options.y2o_1 || fall > -options.y2o_1)
+    if (rise < options.b2p_1 || fall > -options.b2p_1)
       return null;
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
@@ -6987,7 +6992,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.e2p_1)
+            if (z[k_6] - (z[a] + c * (k_6 - a | 0) * step) < options.h2p_1)
               return null;
           }
            while (!(k_6 === y));
@@ -6996,15 +7001,15 @@
     return new TunnelSpan(a, b, c, height, rise, fall, straightness, step);
   }
   function TunnelDetector() {
-    this.p2p_1 = 1.0E-6;
+    this.s2p_1 = 1.0E-6;
   }
-  protoOf(TunnelDetector).q2p = function (profile, options) {
-    var z = profile.m2p_1;
+  protoOf(TunnelDetector).t2p = function (profile, options) {
+    var z = profile.p2p_1;
     if (z.length < 2)
       return emptyList();
     var stations = new Stations(options);
-    var entries = this.r2p(z, options, true, stations);
-    var exits = this.r2p(z, options, false, stations);
+    var entries = this.u2p(z, options, true, stations);
+    var exits = this.u2p(z, options, false, stations);
     var out = ArrayList_init_$Create$();
     var next = -1;
     var _iterator__ex2g4s = entries.l();
@@ -7018,7 +7023,7 @@
         var b = _iterator__ex2g4s_0.n();
         if (b <= a)
           continue $l$loop_2;
-        if ((b - a | 0) * options.t2o_1 > options.g2p_1 + 1.0E-9)
+        if ((b - a | 0) * options.w2o_1 > options.j2p_1 + 1.0E-9)
           break $l$loop_2;
         var tmp0_elvis_lhs = judge(this, profile, a, b, entries, exits, options, stations);
         var tmp;
@@ -7028,23 +7033,23 @@
           tmp = tmp0_elvis_lhs;
         }
         var span = tmp;
-        if (best == null || span.i2o_1 > best.i2o_1 + 1.0E-9)
+        if (best == null || span.l2o_1 > best.l2o_1 + 1.0E-9)
           best = span;
       }
       if (!(best == null)) {
         // Inline function 'kotlin.collections.plusAssign' call
         var element = best;
         out.k(element);
-        next = best.g2o_1;
+        next = best.j2o_1;
       }
     }
     return out;
   };
-  protoOf(TunnelDetector).r2p = function (z, options, entry, stations) {
+  protoOf(TunnelDetector).u2p = function (z, options, entry, stations) {
     var n = z.length;
-    var m = stations.p2o_1;
-    var w = stations.q2o_1;
-    var step = options.t2o_1;
+    var m = stations.s2o_1;
+    var w = stations.t2o_1;
+    var step = options.w2o_1;
     var tmp = 0;
     var tmp_0 = new Float64Array(n);
     while (tmp < n) {
@@ -7067,14 +7072,14 @@
           var tmp_2;
           var tmp_3;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(back) <= options.w2o_1) {
+          if (Math.abs(back) <= options.z2o_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_3 = Math.abs(outer) <= options.w2o_1;
+            tmp_3 = Math.abs(outer) <= options.z2o_1;
           } else {
             tmp_3 = false;
           }
           if (tmp_3) {
-            tmp_2 = ahead >= options.x2o_1;
+            tmp_2 = ahead >= options.a2p_1;
           } else {
             tmp_2 = false;
           }
@@ -7084,14 +7089,14 @@
           var tmp_4;
           var tmp_5;
           // Inline function 'kotlin.math.abs' call
-          if (Math.abs(ahead) <= options.w2o_1) {
+          if (Math.abs(ahead) <= options.z2o_1) {
             // Inline function 'kotlin.math.abs' call
-            tmp_5 = Math.abs(outer_0) <= options.w2o_1;
+            tmp_5 = Math.abs(outer_0) <= options.z2o_1;
           } else {
             tmp_5 = false;
           }
           if (tmp_5) {
-            tmp_4 = back <= -options.x2o_1;
+            tmp_4 = back <= -options.a2p_1;
           } else {
             tmp_4 = false;
           }
@@ -7167,30 +7172,30 @@
     return TunnelDetector_instance;
   }
   function TunnelProfile(terrainM, latDeg, lonDeg) {
-    this.m2p_1 = terrainM;
-    this.n2p_1 = latDeg;
-    this.o2p_1 = lonDeg;
+    this.p2p_1 = terrainM;
+    this.q2p_1 = latDeg;
+    this.r2p_1 = lonDeg;
     // Inline function 'kotlin.require' call
-    if (!(this.m2p_1.length === this.n2p_1.length && this.n2p_1.length === this.o2p_1.length)) {
-      var message = 'terrain, latitude and longitude must have one sample per station: ' + this.m2p_1.length + ', ' + this.n2p_1.length + ', ' + this.o2p_1.length;
+    if (!(this.p2p_1.length === this.q2p_1.length && this.q2p_1.length === this.r2p_1.length)) {
+      var message = 'terrain, latitude and longitude must have one sample per station: ' + this.p2p_1.length + ', ' + this.q2p_1.length + ', ' + this.r2p_1.length;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
   }
   function stations_0($this, metres, name) {
-    var r = metres / $this.t2o_1;
+    var r = metres / $this.w2o_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.t2o_1 + ' m stations';
+      var message = name + ' = ' + metres + ' m is not a whole number of ' + $this.w2o_1 + ' m stations';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     return k;
   }
   function Companion_10() {
     Companion_instance_11 = this;
-    this.s2p_1 = new TunnelDetectorOptions();
+    this.v2p_1 = new TunnelDetectorOptions();
   }
   var Companion_instance_11;
   function Companion_getInstance_10() {
@@ -7215,85 +7220,82 @@
     minLengthM = minLengthM === VOID ? 50.0 : minLengthM;
     maxLengthM = maxLengthM === VOID ? 3000.0 : maxLengthM;
     minStraightness = minStraightness === VOID ? 0.8 : minStraightness;
-    this.t2o_1 = stepM;
-    this.u2o_1 = footWindowM;
-    this.v2o_1 = steepWindowM;
-    this.w2o_1 = maxRoadGrade;
-    this.x2o_1 = minPortalGrade;
-    this.y2o_1 = minSideGrade;
-    this.z2o_1 = sideSearchM;
-    this.a2p_1 = maxChordGrade;
-    this.b2p_1 = minHeightM;
-    this.c2p_1 = faceReachM;
-    this.d2p_1 = maxBelowChordM;
-    this.e2p_1 = minValleyHeightM;
-    this.f2p_1 = minLengthM;
-    this.g2p_1 = maxLengthM;
-    this.h2p_1 = minStraightness;
+    this.w2o_1 = stepM;
+    this.x2o_1 = footWindowM;
+    this.y2o_1 = steepWindowM;
+    this.z2o_1 = maxRoadGrade;
+    this.a2p_1 = minPortalGrade;
+    this.b2p_1 = minSideGrade;
+    this.c2p_1 = sideSearchM;
+    this.d2p_1 = maxChordGrade;
+    this.e2p_1 = minHeightM;
+    this.f2p_1 = faceReachM;
+    this.g2p_1 = maxBelowChordM;
+    this.h2p_1 = minValleyHeightM;
+    this.i2p_1 = minLengthM;
+    this.j2p_1 = maxLengthM;
+    this.k2p_1 = minStraightness;
     // Inline function 'kotlin.require' call
-    if (!(this.t2o_1 > 0.0)) {
-      var message = 'stepM must be positive, got ' + this.t2o_1;
+    if (!(this.w2o_1 > 0.0)) {
+      var message = 'stepM must be positive, got ' + this.w2o_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.i2p() >= 1 && this.j2p() >= 1)) {
+    if (!(this.l2p() >= 1 && this.m2p() >= 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.k2p() >= 0)) {
+    if (!(this.n2p() >= 0)) {
       var message_1 = 'negative sideSearchM';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_1));
     }
     // Inline function 'kotlin.require' call
-    if (!(this.l2p() >= 1)) {
+    if (!(this.o2p() >= 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.w2o_1 >= 0.0 && this.x2o_1 > 0.0 && this.y2o_1 > 0.0)) {
+    if (!(this.z2o_1 >= 0.0 && this.a2p_1 > 0.0 && this.b2p_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.a2p_1 >= 0.0 && this.b2p_1 > 0.0 && this.d2p_1 >= 0.0)) {
+    if (!(this.d2p_1 >= 0.0 && this.e2p_1 > 0.0 && this.g2p_1 >= 0.0)) {
       var message_4 = 'negative threshold';
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_4));
     }
-    var containsUpper = this.g2p_1;
-    var containsArg = this.f2p_1;
+    var containsUpper = this.j2p_1;
+    var containsArg = this.i2p_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.h2p_1;
+    var containsArg_0 = this.k2p_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.h2p_1;
+      var message_6 = 'minStraightness must be in 0..1, got ' + this.k2p_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message_6));
     }
   }
-  protoOf(TunnelDetectorOptions).i2p = function () {
-    return stations_0(this, this.u2o_1, 'footWindowM');
+  protoOf(TunnelDetectorOptions).l2p = function () {
+    return stations_0(this, this.x2o_1, 'footWindowM');
   };
-  protoOf(TunnelDetectorOptions).j2p = function () {
-    return stations_0(this, this.v2o_1, 'steepWindowM');
+  protoOf(TunnelDetectorOptions).m2p = function () {
+    return stations_0(this, this.y2o_1, 'steepWindowM');
   };
-  protoOf(TunnelDetectorOptions).k2p = function () {
-    return stations_0(this, this.z2o_1, 'sideSearchM');
+  protoOf(TunnelDetectorOptions).n2p = function () {
+    return stations_0(this, this.c2p_1, 'sideSearchM');
   };
-  protoOf(TunnelDetectorOptions).l2p = function () {
-    return stations_0(this, this.c2p_1, 'faceReachM');
+  protoOf(TunnelDetectorOptions).o2p = function () {
+    return stations_0(this, this.f2p_1, 'faceReachM');
   };
   protoOf(TunnelDetectorOptions).toString = function () {
-    return 'TunnelDetectorOptions(stepM=' + this.t2o_1 + ', footWindowM=' + this.u2o_1 + ', steepWindowM=' + this.v2o_1 + ', maxRoadGrade=' + this.w2o_1 + ', minPortalGrade=' + this.x2o_1 + ', minSideGrade=' + this.y2o_1 + ', sideSearchM=' + this.z2o_1 + ', maxChordGrade=' + this.a2p_1 + ', minHeightM=' + this.b2p_1 + ', faceReachM=' + this.c2p_1 + ', maxBelowChordM=' + this.d2p_1 + ', minValleyHeightM=' + this.e2p_1 + ', minLengthM=' + this.f2p_1 + ', maxLengthM=' + this.g2p_1 + ', minStraightness=' + this.h2p_1 + ')';
+    return 'TunnelDetectorOptions(stepM=' + this.w2o_1 + ', footWindowM=' + this.x2o_1 + ', steepWindowM=' + this.y2o_1 + ', maxRoadGrade=' + this.z2o_1 + ', minPortalGrade=' + this.a2p_1 + ', minSideGrade=' + this.b2p_1 + ', sideSearchM=' + this.c2p_1 + ', maxChordGrade=' + this.d2p_1 + ', minHeightM=' + this.e2p_1 + ', faceReachM=' + this.f2p_1 + ', maxBelowChordM=' + this.g2p_1 + ', minValleyHeightM=' + this.h2p_1 + ', minLengthM=' + this.i2p_1 + ', maxLengthM=' + this.j2p_1 + ', minStraightness=' + this.k2p_1 + ')';
   };
   protoOf(TunnelDetectorOptions).hashCode = function () {
-    var result = getNumberHashCode(this.t2o_1);
-    result = imul(result, 31) + getNumberHashCode(this.u2o_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.v2o_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.w2o_1) | 0;
+    var result = getNumberHashCode(this.w2o_1);
     result = imul(result, 31) + getNumberHashCode(this.x2o_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.y2o_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.z2o_1) | 0;
@@ -7305,6 +7307,9 @@
     result = imul(result, 31) + getNumberHashCode(this.f2p_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.g2p_1) | 0;
     result = imul(result, 31) + getNumberHashCode(this.h2p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i2p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j2p_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.k2p_1) | 0;
     return result;
   };
   protoOf(TunnelDetectorOptions).equals = function (other) {
@@ -7312,12 +7317,6 @@
       return true;
     if (!(other instanceof TunnelDetectorOptions))
       return false;
-    if (!equals(this.t2o_1, other.t2o_1))
-      return false;
-    if (!equals(this.u2o_1, other.u2o_1))
-      return false;
-    if (!equals(this.v2o_1, other.v2o_1))
-      return false;
     if (!equals(this.w2o_1, other.w2o_1))
       return false;
     if (!equals(this.x2o_1, other.x2o_1))
@@ -7342,6 +7341,12 @@
       return false;
     if (!equals(this.h2p_1, other.h2p_1))
       return false;
+    if (!equals(this.i2p_1, other.i2p_1))
+      return false;
+    if (!equals(this.j2p_1, other.j2p_1))
+      return false;
+    if (!equals(this.k2p_1, other.k2p_1))
+      return false;
     return true;
   };
   //region block: init