@glandais/vcyclist-engine 3.0.0 → 3.1.0

package/vcyclist-gpx.js

@@ -19,113 +19,114 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var enumEntries = kotlin_kotlin.$_$.h4;
-  var Unit_instance = kotlin_kotlin.$_$.t;
-  var Enum = kotlin_kotlin.$_$.z7;
-  var protoOf = kotlin_kotlin.$_$.a6;
-  var initMetadataForClass = kotlin_kotlin.$_$.l5;
+  var Unit_instance = kotlin_kotlin.$_$.f1;
+  var enumEntries = kotlin_kotlin.$_$.u4;
+  var Enum = kotlin_kotlin.$_$.v8;
+  var protoOf = kotlin_kotlin.$_$.t6;
+  var initMetadataForClass = kotlin_kotlin.$_$.e6;
   var VOID = kotlin_kotlin.$_$.a;
-  var toString = kotlin_kotlin.$_$.u8;
-  var getNumberHashCode = kotlin_kotlin.$_$.h5;
-  var getStringHashCode = kotlin_kotlin.$_$.j5;
-  var equals = kotlin_kotlin.$_$.f5;
-  var emptyList = kotlin_kotlin.$_$.p2;
-  var toString_0 = kotlin_kotlin.$_$.c6;
-  var hashCode = kotlin_kotlin.$_$.k5;
-  var listOf = kotlin_kotlin.$_$.z2;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.m5;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.x;
-  var addAll = kotlin_kotlin.$_$.e2;
-  var constructCallableReference = kotlin_kotlin.$_$.d5;
-  var lazy = kotlin_kotlin.$_$.q8;
-  var KProperty1 = kotlin_kotlin.$_$.r6;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.i5;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.j2;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.w;
-  var checkIndexOverflow = kotlin_kotlin.$_$.i2;
-  var getOrNull = kotlin_kotlin.$_$.t2;
-  var isNaN_0 = kotlin_kotlin.$_$.p8;
-  var numberToLong = kotlin_kotlin.$_$.s4;
-  var Long = kotlin_kotlin.$_$.d8;
-  var compare = kotlin_kotlin.$_$.l4;
-  var roundToLong = kotlin_kotlin.$_$.e6;
-  var add = kotlin_kotlin.$_$.k4;
-  var roundToInt = kotlin_kotlin.$_$.d6;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.r8;
+  var toString = kotlin_kotlin.$_$.w9;
+  var getNumberHashCode = kotlin_kotlin.$_$.a6;
+  var getStringHashCode = kotlin_kotlin.$_$.c6;
+  var equals = kotlin_kotlin.$_$.x5;
+  var emptyList = kotlin_kotlin.$_$.c3;
+  var toString_0 = kotlin_kotlin.$_$.w6;
+  var hashCode = kotlin_kotlin.$_$.d6;
+  var listOf = kotlin_kotlin.$_$.m3;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.f6;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.i1;
+  var addAll = kotlin_kotlin.$_$.q2;
+  var constructCallableReference = kotlin_kotlin.$_$.u5;
+  var lazy = kotlin_kotlin.$_$.q9;
+  var KProperty1 = kotlin_kotlin.$_$.l7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.b6;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.v2;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.h1;
+  var checkIndexOverflow = kotlin_kotlin.$_$.u2;
+  var getOrNull = kotlin_kotlin.$_$.g3;
+  var isNaN_0 = kotlin_kotlin.$_$.p9;
+  var numberToLong = kotlin_kotlin.$_$.h5;
+  var Long = kotlin_kotlin.$_$.z8;
+  var compare = kotlin_kotlin.$_$.z4;
+  var roundToLong = kotlin_kotlin.$_$.y6;
+  var add = kotlin_kotlin.$_$.x4;
+  var roundToInt = kotlin_kotlin.$_$.x6;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.r9;
   var get_xmlStreaming = kotlin_io_github_pdvrieze_xmlutil_core.$_$.d;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.n1;
-  var Exception = kotlin_kotlin.$_$.b8;
-  var IllegalArgumentException = kotlin_kotlin.$_$.c8;
-  var IllegalArgumentException_init_$Create$_0 = kotlin_kotlin.$_$.m1;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.z1;
+  var Exception = kotlin_kotlin.$_$.x8;
+  var IllegalArgumentException = kotlin_kotlin.$_$.y8;
+  var IllegalArgumentException_init_$Create$_0 = kotlin_kotlin.$_$.y1;
   var EventType_START_ELEMENT_getInstance = kotlin_io_github_pdvrieze_xmlutil_core.$_$.a;
-  var THROW_CCE = kotlin_kotlin.$_$.i8;
-  var isCharSequence = kotlin_kotlin.$_$.s5;
-  var trim = kotlin_kotlin.$_$.v7;
-  var charSequenceLength = kotlin_kotlin.$_$.b5;
-  var isBlank = kotlin_kotlin.$_$.e7;
-  var toDoubleOrNull = kotlin_kotlin.$_$.q7;
-  var numberToInt = kotlin_kotlin.$_$.y5;
-  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.g1;
-  var Companion_getInstance = kotlin_kotlin.$_$.r;
-  var initMetadataForObject = kotlin_kotlin.$_$.r5;
-  var firstOrNull = kotlin_kotlin.$_$.r2;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.o1;
-  var toNumber = kotlin_kotlin.$_$.u4;
-  var toSet = kotlin_kotlin.$_$.n3;
+  var THROW_CCE = kotlin_kotlin.$_$.e9;
+  var isCharSequence = kotlin_kotlin.$_$.l6;
+  var trim = kotlin_kotlin.$_$.r8;
+  var charSequenceLength = kotlin_kotlin.$_$.s5;
+  var isBlank = kotlin_kotlin.$_$.z7;
+  var toDoubleOrNull = kotlin_kotlin.$_$.l8;
+  var numberToInt = kotlin_kotlin.$_$.r6;
+  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.s1;
+  var Companion_getInstance = kotlin_kotlin.$_$.c1;
+  var initMetadataForObject = kotlin_kotlin.$_$.k6;
+  var firstOrNull = kotlin_kotlin.$_$.e3;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.a2;
+  var toNumber = kotlin_kotlin.$_$.k5;
+  var toSet = kotlin_kotlin.$_$.a4;
   var XmlDeclMode_None_getInstance = kotlin_io_github_pdvrieze_xmlutil_core.$_$.b;
   var newGenericWriter = kotlin_io_github_pdvrieze_xmlutil_core.$_$.c;
-  var charCodeAt = kotlin_kotlin.$_$.z4;
+  var charCodeAt = kotlin_kotlin.$_$.q5;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.b;
-  var substring = kotlin_kotlin.$_$.n7;
-  var isHighSurrogate = kotlin_kotlin.$_$.g7;
-  var isLowSurrogate = kotlin_kotlin.$_$.h7;
+  var substring = kotlin_kotlin.$_$.i8;
+  var isHighSurrogate = kotlin_kotlin.$_$.b8;
+  var isLowSurrogate = kotlin_kotlin.$_$.c8;
   var Char__toInt_impl_vasixd = kotlin_kotlin.$_$.f;
-  var StringBuilder_init_$Create$_0 = kotlin_kotlin.$_$.f1;
-  var Pair = kotlin_kotlin.$_$.f8;
-  var substring_0 = kotlin_kotlin.$_$.o7;
-  var toLong = kotlin_kotlin.$_$.t7;
-  var numberRangeToNumber = kotlin_kotlin.$_$.w5;
-  var ClosedRange = kotlin_kotlin.$_$.g6;
-  var isInterface = kotlin_kotlin.$_$.t5;
-  var contains = kotlin_kotlin.$_$.l6;
-  var convertToInt = kotlin_kotlin.$_$.m4;
-  var NumberFormatException = kotlin_kotlin.$_$.e8;
-  var isDigit = kotlin_kotlin.$_$.f7;
-  var isWhitespace = kotlin_kotlin.$_$.i7;
-  var setOf = kotlin_kotlin.$_$.g3;
-  var toDouble = kotlin_kotlin.$_$.r7;
-  var round = kotlin_kotlin.$_$.f6;
-  var divide = kotlin_kotlin.$_$.n4;
-  var equalsLong = kotlin_kotlin.$_$.o4;
-  var modulo = kotlin_kotlin.$_$.q4;
-  var padStart = kotlin_kotlin.$_$.j7;
-  var longArray = kotlin_kotlin.$_$.v5;
-  var multiply = kotlin_kotlin.$_$.r4;
-  var isInfinite = kotlin_kotlin.$_$.o8;
-  var charSequenceGet = kotlin_kotlin.$_$.a5;
-  var replace = kotlin_kotlin.$_$.k7;
+  var StringBuilder_init_$Create$_0 = kotlin_kotlin.$_$.r1;
+  var Pair = kotlin_kotlin.$_$.b9;
+  var substring_0 = kotlin_kotlin.$_$.j8;
+  var toLong = kotlin_kotlin.$_$.o8;
+  var numberRangeToNumber = kotlin_kotlin.$_$.p6;
+  var ClosedRange = kotlin_kotlin.$_$.a7;
+  var isInterface = kotlin_kotlin.$_$.m6;
+  var contains = kotlin_kotlin.$_$.f7;
+  var convertToInt = kotlin_kotlin.$_$.b5;
+  var NumberFormatException = kotlin_kotlin.$_$.a9;
+  var isDigit = kotlin_kotlin.$_$.a8;
+  var isWhitespace = kotlin_kotlin.$_$.d8;
+  var setOf = kotlin_kotlin.$_$.t3;
+  var toDouble = kotlin_kotlin.$_$.m8;
+  var round = kotlin_kotlin.$_$.z6;
+  var divide = kotlin_kotlin.$_$.c5;
+  var equalsLong = kotlin_kotlin.$_$.d5;
+  var modulo = kotlin_kotlin.$_$.f5;
+  var padStart = kotlin_kotlin.$_$.e8;
+  var longArray = kotlin_kotlin.$_$.o6;
+  var multiply = kotlin_kotlin.$_$.g5;
+  var isInfinite = kotlin_kotlin.$_$.o9;
+  var charSequenceGet = kotlin_kotlin.$_$.r5;
+  var replace = kotlin_kotlin.$_$.f8;
   var toString_1 = kotlin_kotlin.$_$.g;
   var Char__hashCode_impl_otmys = kotlin_kotlin.$_$.d;
-  var getBooleanHashCode = kotlin_kotlin.$_$.g5;
-  var get_lastIndex = kotlin_kotlin.$_$.w2;
-  var toString_2 = kotlin_kotlin.$_$.u7;
-  var CoroutineImpl = kotlin_kotlin.$_$.f4;
+  var getBooleanHashCode = kotlin_kotlin.$_$.z5;
+  var get_lastIndex = kotlin_kotlin.$_$.j3;
+  var toString_2 = kotlin_kotlin.$_$.p8;
+  var CoroutineImpl = kotlin_kotlin.$_$.s4;
   var LatLon = kotlin_io_github_glandais_elevation.$_$.f;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.q3;
-  var initMetadataForCoroutine = kotlin_kotlin.$_$.n5;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.d4;
+  var initMetadataForCoroutine = kotlin_kotlin.$_$.g6;
   var ElevationSmoother_instance = kotlin_io_github_glandais_elevation.$_$.c;
-  var until = kotlin_kotlin.$_$.n6;
+  var until = kotlin_kotlin.$_$.h7;
   var LatLonElevation = kotlin_io_github_glandais_elevation.$_$.e;
-  var arrayCopy = kotlin_kotlin.$_$.f2;
+  var arrayCopy = kotlin_kotlin.$_$.r2;
   var Distance_instance = kotlin_io_github_glandais_elevation.$_$.a;
   var DouglasPeucker_instance = kotlin_io_github_glandais_elevation.$_$.b;
-  var mapCapacity = kotlin_kotlin.$_$.b3;
-  var coerceAtLeast = kotlin_kotlin.$_$.h6;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.a1;
-  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.b1;
-  var subtract = kotlin_kotlin.$_$.t4;
-  var get_ONE = kotlin_kotlin.$_$.j4;
-  var sorted = kotlin_kotlin.$_$.i3;
+  var Companion_instance = kotlin_kotlin.$_$.d1;
+  var mapCapacity = kotlin_kotlin.$_$.o3;
+  var coerceAtLeast = kotlin_kotlin.$_$.b7;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.m1;
+  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.n1;
+  var subtract = kotlin_kotlin.$_$.j5;
+  var get_ONE = kotlin_kotlin.$_$.w4;
+  var sorted = kotlin_kotlin.$_$.v3;
   //endregion
   //region block: pre-declaration
   initMetadataForClass(GpxPathKind, 'GpxPathKind', VOID, Enum);
@@ -165,24 +166,26 @@
   initMetadataForClass(Interpolate_0, 'Interpolate');
   initMetadataForObject(PointPerSecond, 'PointPerSecond');
   //endregion
+  var static_init_called;
+  function static_init() {
+    if (static_init_called)
+      return Unit_instance;
+    static_init_called = true;
+    GpxPathKind_TRACK_instance = new GpxPathKind('TRACK', 0);
+    GpxPathKind_ROUTE_instance = new GpxPathKind('ROUTE', 1);
+  }
   var GpxPathKind_TRACK_instance;
   var GpxPathKind_ROUTE_instance;
   function values() {
+    static_init();
     return [GpxPathKind_TRACK_getInstance(), GpxPathKind_ROUTE_getInstance()];
   }
   function get_entries() {
+    static_init();
     if ($ENTRIES == null)
       $ENTRIES = enumEntries(values());
     return $ENTRIES;
   }
-  var GpxPathKind_entriesInitialized;
-  function GpxPathKind_initEntries() {
-    if (GpxPathKind_entriesInitialized)
-      return Unit_instance;
-    GpxPathKind_entriesInitialized = true;
-    GpxPathKind_TRACK_instance = new GpxPathKind('TRACK', 0);
-    GpxPathKind_ROUTE_instance = new GpxPathKind('ROUTE', 1);
-  }
   var $ENTRIES;
   function GpxPathKind(name, ordinal) {
     Enum.call(this, name, ordinal);
@@ -194,27 +197,27 @@
     symbol = symbol === VOID ? null : symbol;
     type = type === VOID ? null : type;
     timeEpochMs = timeEpochMs === VOID ? null : timeEpochMs;
-    this.d1q_1 = latitudeDeg;
-    this.e1q_1 = longitudeDeg;
-    this.f1q_1 = elevationM;
-    this.g1q_1 = name;
-    this.h1q_1 = description;
-    this.i1q_1 = symbol;
-    this.j1q_1 = type;
-    this.k1q_1 = timeEpochMs;
+    this.latitudeDeg_1 = latitudeDeg;
+    this.longitudeDeg_1 = longitudeDeg;
+    this.elevationM_1 = elevationM;
+    this.name_1 = name;
+    this.description_1 = description;
+    this.symbol_1 = symbol;
+    this.type_1 = type;
+    this.timeEpochMs_1 = timeEpochMs;
   }
   protoOf(GpxWaypoint).toString = function () {
-    return 'GpxWaypoint(latitudeDeg=' + this.d1q_1 + ', longitudeDeg=' + this.e1q_1 + ', elevationM=' + this.f1q_1 + ', name=' + this.g1q_1 + ', description=' + this.h1q_1 + ', symbol=' + this.i1q_1 + ', type=' + this.j1q_1 + ', timeEpochMs=' + toString(this.k1q_1) + ')';
+    return 'GpxWaypoint(latitudeDeg=' + this.latitudeDeg_1 + ', longitudeDeg=' + this.longitudeDeg_1 + ', elevationM=' + this.elevationM_1 + ', name=' + this.name_1 + ', description=' + this.description_1 + ', symbol=' + this.symbol_1 + ', type=' + this.type_1 + ', timeEpochMs=' + toString(this.timeEpochMs_1) + ')';
   };
   protoOf(GpxWaypoint).hashCode = function () {
-    var result = getNumberHashCode(this.d1q_1);
-    result = imul(result, 31) + getNumberHashCode(this.e1q_1) | 0;
-    result = imul(result, 31) + (this.f1q_1 == null ? 0 : getNumberHashCode(this.f1q_1)) | 0;
-    result = imul(result, 31) + (this.g1q_1 == null ? 0 : getStringHashCode(this.g1q_1)) | 0;
-    result = imul(result, 31) + (this.h1q_1 == null ? 0 : getStringHashCode(this.h1q_1)) | 0;
-    result = imul(result, 31) + (this.i1q_1 == null ? 0 : getStringHashCode(this.i1q_1)) | 0;
-    result = imul(result, 31) + (this.j1q_1 == null ? 0 : getStringHashCode(this.j1q_1)) | 0;
-    result = imul(result, 31) + (this.k1q_1 == null ? 0 : this.k1q_1.hashCode()) | 0;
+    var result = getNumberHashCode(this.latitudeDeg_1);
+    result = imul(result, 31) + getNumberHashCode(this.longitudeDeg_1) | 0;
+    result = imul(result, 31) + (this.elevationM_1 == null ? 0 : getNumberHashCode(this.elevationM_1)) | 0;
+    result = imul(result, 31) + (this.name_1 == null ? 0 : getStringHashCode(this.name_1)) | 0;
+    result = imul(result, 31) + (this.description_1 == null ? 0 : getStringHashCode(this.description_1)) | 0;
+    result = imul(result, 31) + (this.symbol_1 == null ? 0 : getStringHashCode(this.symbol_1)) | 0;
+    result = imul(result, 31) + (this.type_1 == null ? 0 : getStringHashCode(this.type_1)) | 0;
+    result = imul(result, 31) + (this.timeEpochMs_1 == null ? 0 : this.timeEpochMs_1.hashCode()) | 0;
     return result;
   };
   protoOf(GpxWaypoint).equals = function (other) {
@@ -222,38 +225,38 @@
       return true;
     if (!(other instanceof GpxWaypoint))
       return false;
-    if (!equals(this.d1q_1, other.d1q_1))
+    if (!equals(this.latitudeDeg_1, other.latitudeDeg_1))
       return false;
-    if (!equals(this.e1q_1, other.e1q_1))
+    if (!equals(this.longitudeDeg_1, other.longitudeDeg_1))
       return false;
-    if (!equals(this.f1q_1, other.f1q_1))
+    if (!equals(this.elevationM_1, other.elevationM_1))
       return false;
-    if (!(this.g1q_1 == other.g1q_1))
+    if (!(this.name_1 == other.name_1))
       return false;
-    if (!(this.h1q_1 == other.h1q_1))
+    if (!(this.description_1 == other.description_1))
       return false;
-    if (!(this.i1q_1 == other.i1q_1))
+    if (!(this.symbol_1 == other.symbol_1))
       return false;
-    if (!(this.j1q_1 == other.j1q_1))
+    if (!(this.type_1 == other.type_1))
       return false;
-    if (!equals(this.k1q_1, other.k1q_1))
+    if (!equals(this.timeEpochMs_1, other.timeEpochMs_1))
       return false;
     return true;
   };
   function GpxDocument(name, tracks, waypoints) {
     name = name === VOID ? 'noname' : name;
     waypoints = waypoints === VOID ? emptyList() : waypoints;
-    this.l1q_1 = name;
-    this.m1q_1 = tracks;
-    this.n1q_1 = waypoints;
+    this.name_1 = name;
+    this.tracks_1 = tracks;
+    this.waypoints_1 = waypoints;
   }
   protoOf(GpxDocument).toString = function () {
-    return 'GpxDocument(name=' + this.l1q_1 + ', tracks=' + toString_0(this.m1q_1) + ', waypoints=' + toString_0(this.n1q_1) + ')';
+    return 'GpxDocument(name=' + this.name_1 + ', tracks=' + toString_0(this.tracks_1) + ', waypoints=' + toString_0(this.waypoints_1) + ')';
   };
   protoOf(GpxDocument).hashCode = function () {
-    var result = getStringHashCode(this.l1q_1);
-    result = imul(result, 31) + hashCode(this.m1q_1) | 0;
-    result = imul(result, 31) + hashCode(this.n1q_1) | 0;
+    var result = getStringHashCode(this.name_1);
+    result = imul(result, 31) + hashCode(this.tracks_1) | 0;
+    result = imul(result, 31) + hashCode(this.waypoints_1) | 0;
     return result;
   };
   protoOf(GpxDocument).equals = function (other) {
@@ -261,39 +264,39 @@
       return true;
     if (!(other instanceof GpxDocument))
       return false;
-    if (!(this.l1q_1 === other.l1q_1))
+    if (!(this.name_1 === other.name_1))
       return false;
-    if (!equals(this.m1q_1, other.m1q_1))
+    if (!equals(this.tracks_1, other.tracks_1))
       return false;
-    if (!equals(this.n1q_1, other.n1q_1))
+    if (!equals(this.waypoints_1, other.waypoints_1))
       return false;
     return true;
   };
   function Companion() {
   }
-  protoOf(Companion).o1q = function (name, type, points, kind) {
+  protoOf(Companion).invoke_a307c9_k$ = function (name, type, points, kind) {
     return new GpxTrack(name, type, listOf(new GpxSegment(points)), kind);
   };
-  protoOf(Companion).p1q = function (name, type, points, kind, $super) {
+  protoOf(Companion).invoke$default_3oy1b8_k$ = 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.o1q(name, type, points, kind) : $super.o1q.call(this, name, type, points, kind);
+    return $super === VOID ? this.invoke_a307c9_k$(name, type, points, kind) : $super.invoke_a307c9_k$.call(this, name, type, points, kind);
   };
-  var Companion_instance;
+  var Companion_instance_0;
   function Companion_getInstance_0() {
-    return Companion_instance;
+    return Companion_instance_0;
   }
   function GpxTrack$points$delegate$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.collections.flatMap' call
-      var tmp0 = this$0.s1q_1;
+      var tmp0 = this$0.segments_1;
       // Inline function 'kotlin.collections.flatMapTo' call
       var destination = ArrayList_init_$Create$();
-      var _iterator__ex2g4s = tmp0.i();
-      while (_iterator__ex2g4s.j()) {
-        var element = _iterator__ex2g4s.k();
-        var list = element.v1q_1;
+      var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
+      while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+        var element = _iterator__ex2g4s.next_20eer_k$();
+        var list = element.points_1;
         addAll(destination, list);
       }
       return destination;
@@ -301,35 +304,35 @@
   }
   function GpxTrack$_get_points_$ref_4x48pr() {
     return constructCallableReference(function (p0) {
-      return p0.w1q();
+      return p0.get_points_i5obn0_k$();
     }, 1, 0, 5);
   }
   function GpxTrack(name, type, segments, kind) {
     name = name === VOID ? null : name;
     type = type === VOID ? null : type;
     kind = kind === VOID ? GpxPathKind_TRACK_getInstance() : kind;
-    this.q1q_1 = name;
-    this.r1q_1 = type;
-    this.s1q_1 = segments;
-    this.t1q_1 = kind;
+    this.name_1 = name;
+    this.type_1 = type;
+    this.segments_1 = segments;
+    this.kind_1 = kind;
     var tmp = this;
-    tmp.u1q_1 = lazy(GpxTrack$points$delegate$lambda(this));
+    tmp.points$delegate_1 = lazy(GpxTrack$points$delegate$lambda(this));
   }
-  protoOf(GpxTrack).w1q = function () {
-    var tmp0 = this.u1q_1;
+  protoOf(GpxTrack).get_points_i5obn0_k$ = function () {
+    var tmp0 = this.points$delegate_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('points', 1, tmp, GpxTrack$_get_points_$ref_4x48pr(), null);
-    return tmp0.i1();
+    return tmp0.get_value_j01efc_k$();
   };
   protoOf(GpxTrack).toString = function () {
-    return 'GpxTrack(name=' + this.q1q_1 + ', type=' + this.r1q_1 + ', segments=' + toString_0(this.s1q_1) + ', kind=' + this.t1q_1.toString() + ')';
+    return 'GpxTrack(name=' + this.name_1 + ', type=' + this.type_1 + ', segments=' + toString_0(this.segments_1) + ', kind=' + this.kind_1.toString() + ')';
   };
   protoOf(GpxTrack).hashCode = function () {
-    var result = this.q1q_1 == null ? 0 : getStringHashCode(this.q1q_1);
-    result = imul(result, 31) + (this.r1q_1 == null ? 0 : getStringHashCode(this.r1q_1)) | 0;
-    result = imul(result, 31) + hashCode(this.s1q_1) | 0;
-    result = imul(result, 31) + this.t1q_1.hashCode() | 0;
+    var result = this.name_1 == null ? 0 : getStringHashCode(this.name_1);
+    result = imul(result, 31) + (this.type_1 == null ? 0 : getStringHashCode(this.type_1)) | 0;
+    result = imul(result, 31) + hashCode(this.segments_1) | 0;
+    result = imul(result, 31) + this.kind_1.hashCode() | 0;
     return result;
   };
   protoOf(GpxTrack).equals = function (other) {
@@ -337,31 +340,31 @@
       return true;
     if (!(other instanceof GpxTrack))
       return false;
-    if (!(this.q1q_1 == other.q1q_1))
+    if (!(this.name_1 == other.name_1))
       return false;
-    if (!(this.r1q_1 == other.r1q_1))
+    if (!(this.type_1 == other.type_1))
       return false;
-    if (!equals(this.s1q_1, other.s1q_1))
+    if (!equals(this.segments_1, other.segments_1))
       return false;
-    if (!this.t1q_1.equals(other.t1q_1))
+    if (!this.kind_1.equals(other.kind_1))
       return false;
     return true;
   };
   function GpxSegment(points) {
-    this.v1q_1 = points;
+    this.points_1 = points;
   }
   protoOf(GpxSegment).toString = function () {
-    return 'GpxSegment(points=' + toString_0(this.v1q_1) + ')';
+    return 'GpxSegment(points=' + toString_0(this.points_1) + ')';
   };
   protoOf(GpxSegment).hashCode = function () {
-    return hashCode(this.v1q_1);
+    return hashCode(this.points_1);
   };
   protoOf(GpxSegment).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof GpxSegment))
       return false;
-    if (!equals(this.v1q_1, other.v1q_1))
+    if (!equals(this.points_1, other.points_1))
       return false;
     return true;
   };
@@ -372,27 +375,27 @@
     cadence = cadence === VOID ? null : cadence;
     temperatureC = temperatureC === VOID ? null : temperatureC;
     powerW = powerW === VOID ? null : powerW;
-    this.x1q_1 = latitudeDeg;
-    this.y1q_1 = longitudeDeg;
-    this.z1q_1 = elevationM;
-    this.a1r_1 = timeEpochMs;
-    this.b1r_1 = heartRate;
-    this.c1r_1 = cadence;
-    this.d1r_1 = temperatureC;
-    this.e1r_1 = powerW;
+    this.latitudeDeg_1 = latitudeDeg;
+    this.longitudeDeg_1 = longitudeDeg;
+    this.elevationM_1 = elevationM;
+    this.timeEpochMs_1 = timeEpochMs;
+    this.heartRate_1 = heartRate;
+    this.cadence_1 = cadence;
+    this.temperatureC_1 = temperatureC;
+    this.powerW_1 = powerW;
   }
   protoOf(GpxTrackPoint).toString = function () {
-    return 'GpxTrackPoint(latitudeDeg=' + this.x1q_1 + ', longitudeDeg=' + this.y1q_1 + ', elevationM=' + this.z1q_1 + ', timeEpochMs=' + toString(this.a1r_1) + ', heartRate=' + this.b1r_1 + ', cadence=' + this.c1r_1 + ', temperatureC=' + this.d1r_1 + ', powerW=' + this.e1r_1 + ')';
+    return 'GpxTrackPoint(latitudeDeg=' + this.latitudeDeg_1 + ', longitudeDeg=' + this.longitudeDeg_1 + ', elevationM=' + this.elevationM_1 + ', timeEpochMs=' + toString(this.timeEpochMs_1) + ', heartRate=' + this.heartRate_1 + ', cadence=' + this.cadence_1 + ', temperatureC=' + this.temperatureC_1 + ', powerW=' + this.powerW_1 + ')';
   };
   protoOf(GpxTrackPoint).hashCode = function () {
-    var result = getNumberHashCode(this.x1q_1);
-    result = imul(result, 31) + getNumberHashCode(this.y1q_1) | 0;
-    result = imul(result, 31) + (this.z1q_1 == null ? 0 : getNumberHashCode(this.z1q_1)) | 0;
-    result = imul(result, 31) + (this.a1r_1 == null ? 0 : this.a1r_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.b1r_1 == null ? 0 : this.b1r_1) | 0;
-    result = imul(result, 31) + (this.c1r_1 == null ? 0 : this.c1r_1) | 0;
-    result = imul(result, 31) + (this.d1r_1 == null ? 0 : getNumberHashCode(this.d1r_1)) | 0;
-    result = imul(result, 31) + (this.e1r_1 == null ? 0 : getNumberHashCode(this.e1r_1)) | 0;
+    var result = getNumberHashCode(this.latitudeDeg_1);
+    result = imul(result, 31) + getNumberHashCode(this.longitudeDeg_1) | 0;
+    result = imul(result, 31) + (this.elevationM_1 == null ? 0 : getNumberHashCode(this.elevationM_1)) | 0;
+    result = imul(result, 31) + (this.timeEpochMs_1 == null ? 0 : this.timeEpochMs_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.heartRate_1 == null ? 0 : this.heartRate_1) | 0;
+    result = imul(result, 31) + (this.cadence_1 == null ? 0 : this.cadence_1) | 0;
+    result = imul(result, 31) + (this.temperatureC_1 == null ? 0 : getNumberHashCode(this.temperatureC_1)) | 0;
+    result = imul(result, 31) + (this.powerW_1 == null ? 0 : getNumberHashCode(this.powerW_1)) | 0;
     return result;
   };
   protoOf(GpxTrackPoint).equals = function (other) {
@@ -400,30 +403,30 @@
       return true;
     if (!(other instanceof GpxTrackPoint))
       return false;
-    if (!equals(this.x1q_1, other.x1q_1))
+    if (!equals(this.latitudeDeg_1, other.latitudeDeg_1))
       return false;
-    if (!equals(this.y1q_1, other.y1q_1))
+    if (!equals(this.longitudeDeg_1, other.longitudeDeg_1))
       return false;
-    if (!equals(this.z1q_1, other.z1q_1))
+    if (!equals(this.elevationM_1, other.elevationM_1))
       return false;
-    if (!equals(this.a1r_1, other.a1r_1))
+    if (!equals(this.timeEpochMs_1, other.timeEpochMs_1))
       return false;
-    if (!(this.b1r_1 == other.b1r_1))
+    if (!(this.heartRate_1 == other.heartRate_1))
       return false;
-    if (!(this.c1r_1 == other.c1r_1))
+    if (!(this.cadence_1 == other.cadence_1))
       return false;
-    if (!equals(this.d1r_1, other.d1r_1))
+    if (!equals(this.temperatureC_1, other.temperatureC_1))
       return false;
-    if (!equals(this.e1r_1, other.e1r_1))
+    if (!equals(this.powerW_1, other.powerW_1))
       return false;
     return true;
   };
   function GpxPathKind_TRACK_getInstance() {
-    GpxPathKind_initEntries();
+    static_init();
     return GpxPathKind_TRACK_instance;
   }
   function GpxPathKind_ROUTE_getInstance() {
-    GpxPathKind_initEntries();
+    static_init();
     return GpxPathKind_ROUTE_instance;
   }
   function toGpxDocument(_this__u8e3s4, name, trackName, startTime, powerSource) {
@@ -444,29 +447,29 @@
     // Inline function 'kotlin.collections.mapIndexedTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(paths, 10));
     var index = 0;
-    var _iterator__ex2g4s = paths.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = paths.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
       var _unary__edvuaz = index;
       index = _unary__edvuaz + 1 | 0;
       var i = checkIndexOverflow(_unary__edvuaz);
       var tmp$ret$2 = toGpxTrack(item, trackNames == null ? null : getOrNull(trackNames, i), type, startTime, powerSource);
-      destination.h(tmp$ret$2);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     return new GpxDocument(name, destination, waypoints);
   }
-  var GpxPowerSource_INPUT_instance;
-  var GpxPowerSource_COMPUTED_instance;
-  var GpxPowerSource_COMPUTED_OR_INPUT_instance;
-  var GpxPowerSource_entriesInitialized;
-  function GpxPowerSource_initEntries() {
-    if (GpxPowerSource_entriesInitialized)
+  var static_init_called_0;
+  function static_init_0() {
+    if (static_init_called_0)
       return Unit_instance;
-    GpxPowerSource_entriesInitialized = true;
+    static_init_called_0 = true;
     GpxPowerSource_INPUT_instance = new GpxPowerSource('INPUT', 0);
     GpxPowerSource_COMPUTED_instance = new GpxPowerSource('COMPUTED', 1);
     GpxPowerSource_COMPUTED_OR_INPUT_instance = new GpxPowerSource('COMPUTED_OR_INPUT', 2);
   }
+  var GpxPowerSource_INPUT_instance;
+  var GpxPowerSource_COMPUTED_instance;
+  var GpxPowerSource_COMPUTED_OR_INPUT_instance;
   function GpxPowerSource(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
@@ -475,10 +478,10 @@
     type = type === VOID ? 'cycling' : type;
     startTime = startTime === VOID ? null : startTime;
     powerSource = powerSource === VOID ? GpxPowerSource_INPUT_getInstance() : powerSource;
-    var startTimeMs = startTime == null ? null : startTime.ud();
+    var startTimeMs = startTime == null ? null : startTime.toEpochMilliseconds_82cfls_k$();
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = _this__u8e3s4.f1r_1;
+    var size = _this__u8e3s4.size_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -486,10 +489,10 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp = _this__u8e3s4.h1r(index) * 57.29577951308232;
-        var tmp_0 = _this__u8e3s4.i1r(index) * 57.29577951308232;
+        var tmp = _this__u8e3s4.latitude_gb4iok_k$(index) * 57.29577951308232;
+        var tmp_0 = _this__u8e3s4.longitude_a9xl_k$(index) * 57.29577951308232;
         // Inline function 'kotlin.takeUnless' call
-        var this_0 = _this__u8e3s4.j1r(index);
+        var this_0 = _this__u8e3s4.elevation_iziwkb_k$(index);
         var tmp_1;
         if (!isNaN_0(this_0)) {
           tmp_1 = this_0;
@@ -498,13 +501,13 @@
         }
         var tmp_2 = tmp_1;
         var tmp_3;
-        if (isNaN_0(_this__u8e3s4.k1r(index))) {
+        if (isNaN_0(_this__u8e3s4.time_ryc845_k$(index))) {
           tmp_3 = null;
         } else if (!(startTimeMs == null)) {
-          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.k1r(index)));
+          tmp_3 = add(startTimeMs, roundToLong(_this__u8e3s4.time_ryc845_k$(index)));
         } else {
           // Inline function 'kotlin.takeIf' call
-          var this_1 = numberToLong(_this__u8e3s4.k1r(index));
+          var this_1 = numberToLong(_this__u8e3s4.time_ryc845_k$(index));
           var tmp_4;
           if (compare(this_1, new Long(0, 0)) > 0) {
             tmp_4 = this_1;
@@ -515,7 +518,7 @@
         }
         var tmp_5 = tmp_3;
         // Inline function 'kotlin.takeUnless' call
-        var this_2 = _this__u8e3s4.l1r(index);
+        var this_2 = _this__u8e3s4.heartRate_qiaqfm_k$(index);
         var tmp_6;
         if (!isNaN_0(this_2)) {
           tmp_6 = this_2;
@@ -525,7 +528,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.m1r(index);
+        var this_3 = _this__u8e3s4.cadence_h3r7af_k$(index);
         var tmp_8;
         if (!isNaN_0(this_3)) {
           tmp_8 = this_3;
@@ -535,7 +538,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.n1r(index);
+        var this_4 = _this__u8e3s4.temperature_6yw0ik_k$(index);
         var tmp_10;
         if (!isNaN_0(this_4)) {
           tmp_10 = this_4;
@@ -544,15 +547,15 @@
         }
         var tmp$ret$13 = tmp_10;
         var tmp$ret$4 = new GpxTrackPoint(tmp, tmp_0, tmp_2, tmp_5, tmp_7, tmp_9, tmp$ret$13, powerAt(_this__u8e3s4, index, powerSource));
-        list.h(tmp$ret$4);
+        list.add_utx5q5_k$(tmp$ret$4);
       }
        while (inductionVariable < size);
     var points = list;
-    return Companion_instance.p1q(name, type, points);
+    return Companion_instance_0.invoke$default_3oy1b8_k$(name, type, points);
   }
   function powerAt(_this__u8e3s4, i, source) {
     // Inline function 'kotlin.takeUnless' call
-    var this_0 = _this__u8e3s4.o1r(i);
+    var this_0 = _this__u8e3s4.pInputPower_ybhudp_k$(i);
     var tmp;
     if (!isNaN_0(this_0)) {
       tmp = this_0;
@@ -561,7 +564,7 @@
     }
     var input = tmp;
     // Inline function 'kotlin.takeUnless' call
-    var this_1 = _this__u8e3s4.p1r(i);
+    var this_1 = _this__u8e3s4.pComputedPower_g6dnn4_k$(i);
     var tmp_0;
     if (!(isNaN_0(this_1) || this_1 === 0.0)) {
       tmp_0 = this_1;
@@ -570,7 +573,7 @@
     }
     var computed = tmp_0;
     var tmp_1;
-    switch (source.o1_1) {
+    switch (source.ordinal_1) {
       case 0:
         tmp_1 = input;
         break;
@@ -587,13 +590,13 @@
     return tmp_1;
   }
   function GpxPowerSource_INPUT_getInstance() {
-    GpxPowerSource_initEntries();
+    static_init_0();
     return GpxPowerSource_INPUT_instance;
   }
   function parseOnce($this, xml) {
     var tmp;
     try {
-      tmp = get_xmlStreaming().f19(xml);
+      tmp = get_xmlStreaming().newReader$default_35lqwr_k$(xml);
     } catch ($p) {
       var tmp_0;
       if ($p instanceof IllegalArgumentException) {
@@ -627,16 +630,16 @@
       }
     }
     finally {
-      reader.n18();
+      reader.close_yn9xrc_k$();
     }
     return tmp_1;
   }
   function parseDocument($this, reader) {
-    while (reader.j()) {
-      var ev = reader.k();
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
       if (ev.equals(EventType_START_ELEMENT_getInstance())) {
-        if (!(reader.a18() === 'gpx')) {
-          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.a18() + ')');
+        if (!(reader.get_localName_bf4zrn_k$() === 'gpx')) {
+          throw IllegalArgumentException_init_$Create$_0('Invalid GPX file: missing gpx root element (found ' + reader.get_localName_bf4zrn_k$() + ')');
         }
         return parseGpxRoot($this, reader);
       }
@@ -649,24 +652,24 @@
     var tracks = ArrayList_init_$Create$();
     // Inline function 'kotlin.collections.mutableListOf' call
     var waypoints = ArrayList_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          switch (reader.a18()) {
+          switch (reader.get_localName_bf4zrn_k$()) {
             case 'metadata':
               var metaName = parseMetadataName($this, reader);
               if (!(metaName == null))
                 name = metaName;
               break;
             case 'trk':
-              tracks.h(parseTrack($this, reader));
+              tracks.add_utx5q5_k$(parseTrack($this, reader));
               break;
             case 'rte':
-              tracks.h(parseRoute($this, reader));
+              tracks.add_utx5q5_k$(parseRoute($this, reader));
               break;
             case 'wpt':
-              waypoints.h(parseWaypoint($this, reader));
+              waypoints.add_utx5q5_k$(parseWaypoint($this, reader));
               break;
             default:
               skipElement($this, reader);
@@ -684,11 +687,11 @@
   }
   function parseMetadataName($this, reader) {
     var name = null;
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          if (reader.a18() === 'name' && name == null) {
+          if (reader.get_localName_bf4zrn_k$() === 'name' && name == null) {
             // Inline function 'kotlin.text.trim' call
             var this_0 = readElementText($this, reader);
             // Inline function 'kotlin.text.ifEmpty' call
@@ -719,11 +722,11 @@
     var type = null;
     // Inline function 'kotlin.collections.mutableListOf' call
     var segments = ArrayList_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          switch (reader.a18()) {
+          switch (reader.get_localName_bf4zrn_k$()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -761,7 +764,7 @@
               type = tmp_0;
               break;
             case 'trkseg':
-              segments.h(parseTrackSegment($this, reader));
+              segments.add_utx5q5_k$(parseTrackSegment($this, reader));
               break;
             default:
               skipElement($this, reader);
@@ -782,11 +785,11 @@
     var type = null;
     // Inline function 'kotlin.collections.mutableListOf' call
     var points = ArrayList_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          switch (reader.a18()) {
+          switch (reader.get_localName_bf4zrn_k$()) {
             case 'name':
               // Inline function 'kotlin.text.trim' call
 
@@ -824,7 +827,7 @@
               type = tmp_0;
               break;
             case 'rtept':
-              points.h(parseTrackPoint($this, reader));
+              points.add_utx5q5_k$(parseTrackPoint($this, reader));
               break;
             default:
               skipElement($this, reader);
@@ -843,12 +846,12 @@
   function parseTrackSegment($this, reader) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var points = ArrayList_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          if (reader.a18() === 'trkpt') {
-            points.h(parseTrackPoint($this, reader));
+          if (reader.get_localName_bf4zrn_k$() === 'trkpt') {
+            points.add_utx5q5_k$(parseTrackPoint($this, reader));
           } else {
             skipElement($this, reader);
           }
@@ -863,8 +866,8 @@
     return new GpxSegment(points);
   }
   function parseTrackPoint($this, reader) {
-    var latStr = reader.l18(null, 'lat');
-    var lonStr = reader.l18(null, 'lon');
+    var latStr = reader.getAttributeValue_8yb7e2_k$(null, 'lat');
+    var lonStr = reader.getAttributeValue_8yb7e2_k$(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -895,11 +898,11 @@
     var elevation = null;
     var timeMs = null;
     var ext = new ExtensionsAccumulator();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          switch (reader.a18()) {
+          switch (reader.get_localName_bf4zrn_k$()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -933,16 +936,16 @@
 
           break;
         case 2:
-          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.q1r_1, ext.r1r_1, ext.s1r_1, ext.t1r_1);
+          return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.heartRate_1, ext.cadence_1, ext.temperatureC_1, ext.powerW_1);
         default:
           break;
       }
     }
-    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.q1r_1, ext.r1r_1, ext.s1r_1, ext.t1r_1);
+    return new GpxTrackPoint(lat, lon, elevation, timeMs, ext.heartRate_1, ext.cadence_1, ext.temperatureC_1, ext.powerW_1);
   }
   function parseWaypoint($this, reader) {
-    var latStr = reader.l18(null, 'lat');
-    var lonStr = reader.l18(null, 'lon');
+    var latStr = reader.getAttributeValue_8yb7e2_k$(null, 'lat');
+    var lonStr = reader.getAttributeValue_8yb7e2_k$(null, 'lon');
     var tmp;
     // Inline function 'kotlin.text.isNullOrBlank' call
     if (latStr == null || isBlank(latStr)) {
@@ -976,11 +979,11 @@
     var description = null;
     var symbol = null;
     var type = null;
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          switch (reader.a18()) {
+          switch (reader.get_localName_bf4zrn_k$()) {
             case 'ele':
               // Inline function 'kotlin.text.trim' call
 
@@ -1091,11 +1094,11 @@
     return new GpxWaypoint(lat, lon, elevation, name, description, symbol, type, timeMs);
   }
   function parseExtensions($this, reader, ext) {
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 1:
-          var ln = reader.a18();
+          var ln = reader.get_localName_bf4zrn_k$();
           // Inline function 'kotlin.text.lowercase' call
 
           // Inline function 'kotlin.js.asDynamic' call
@@ -1108,8 +1111,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp = ext;
-                var tmp0_elvis_lhs = ext.t1r_1;
-                tmp.t1r_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
+                var tmp0_elvis_lhs = ext.powerW_1;
+                tmp.powerW_1 = tmp0_elvis_lhs == null ? tmp2_safe_receiver : tmp0_elvis_lhs;
               }
 
               break;
@@ -1120,8 +1123,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.q1r_1 == null)
-                  ext.q1r_1 = numberToInt(tmp3_safe_receiver);
+                if (ext.heartRate_1 == null)
+                  ext.heartRate_1 = numberToInt(tmp3_safe_receiver);
               }
 
               break;
@@ -1132,8 +1135,8 @@
                 null;
               else {
                 // Inline function 'kotlin.let' call
-                if (ext.r1r_1 == null)
-                  ext.r1r_1 = numberToInt(tmp4_safe_receiver);
+                if (ext.cadence_1 == null)
+                  ext.cadence_1 = numberToInt(tmp4_safe_receiver);
               }
 
               break;
@@ -1146,8 +1149,8 @@
               else {
                 // Inline function 'kotlin.let' call
                 var tmp_0 = ext;
-                var tmp0_elvis_lhs_0 = ext.s1r_1;
-                tmp_0.s1r_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
+                var tmp0_elvis_lhs_0 = ext.temperatureC_1;
+                tmp_0.temperatureC_1 = tmp0_elvis_lhs_0 == null ? tmp5_safe_receiver : tmp0_elvis_lhs_0;
               }
 
               break;
@@ -1166,14 +1169,14 @@
   }
   function readElementText($this, reader) {
     var sb = StringBuilder_init_$Create$();
-    while (reader.j()) {
-      var ev = reader.k();
-      switch (ev.o1_1) {
+    while (reader.hasNext_bitz1p_k$()) {
+      var ev = reader.next_20eer_k$();
+      switch (ev.ordinal_1) {
         case 4:
         case 5:
         case 9:
         case 8:
-          sb.v5(reader.f18());
+          sb.append_22ad7x_k$(reader.get_text_wouvsm_k$());
           break;
         case 1:
           skipElement($this, reader);
@@ -1194,8 +1197,8 @@
   }
   function skipElement($this, reader) {
     var depth = 1;
-    while (reader.j() && depth > 0) {
-      switch (reader.k().o1_1) {
+    while (reader.hasNext_bitz1p_k$() && depth > 0) {
+      switch (reader.next_20eer_k$().ordinal_1) {
         case 1:
           depth = depth + 1 | 0;
           break;
@@ -1210,7 +1213,7 @@
   function parseTimeIsoToMs($this, text) {
     var tmp;
     try {
-      tmp = Companion_getInstance().qd(text).ud();
+      tmp = Companion_getInstance().parse_xovy9i_k$(text).toEpochMilliseconds_82cfls_k$();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof IllegalArgumentException) {
@@ -1233,14 +1236,14 @@
     cadence = cadence === VOID ? null : cadence;
     temperatureC = temperatureC === VOID ? null : temperatureC;
     powerW = powerW === VOID ? null : powerW;
-    this.q1r_1 = heartRate;
-    this.r1r_1 = cadence;
-    this.s1r_1 = temperatureC;
-    this.t1r_1 = powerW;
+    this.heartRate_1 = heartRate;
+    this.cadence_1 = cadence;
+    this.temperatureC_1 = temperatureC;
+    this.powerW_1 = powerW;
   }
   function GpxParser() {
   }
-  protoOf(GpxParser).u1r = function (xml, repairOnFailure) {
+  protoOf(GpxParser).parse_q3819e_k$ = function (xml, repairOnFailure) {
     var tmp;
     try {
       tmp = parseOnce(this, xml);
@@ -1250,7 +1253,7 @@
         var firstFailure = $p;
         if (!repairOnFailure)
           throw firstFailure;
-        var repaired = GpxXmlRepair_getInstance().x1r(xml);
+        var repaired = GpxXmlRepair_getInstance().repair_iwt4xf_k$(xml);
         var tmp_1;
         try {
           tmp_1 = parseOnce(this, repaired);
@@ -1271,9 +1274,9 @@
     }
     return tmp;
   };
-  protoOf(GpxParser).y1r = function (xml, repairOnFailure, $super) {
+  protoOf(GpxParser).parse$default_ez0f31_k$ = function (xml, repairOnFailure, $super) {
     repairOnFailure = repairOnFailure === VOID ? true : repairOnFailure;
-    return $super === VOID ? this.u1r(xml, repairOnFailure) : $super.u1r.call(this, xml, repairOnFailure);
+    return $super === VOID ? this.parse_q3819e_k$(xml, repairOnFailure) : $super.parse_q3819e_k$.call(this, xml, repairOnFailure);
   };
   var GpxParser_instance;
   function GpxParser_getInstance() {
@@ -1286,7 +1289,7 @@
   var ALL_KINDS;
   function firstTrackAsPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.m1q_1);
+    var tmp0_elvis_lhs = firstOrNull(_this__u8e3s4.tracks_1);
     var tmp;
     if (tmp0_elvis_lhs == null) {
       // Inline function 'kotlin.error' call
@@ -1302,31 +1305,31 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.m1q_1;
+    var tmp0 = _this__u8e3s4.tracks_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var _iterator__ex2g4s = tmp0.i();
-    while (_iterator__ex2g4s.j()) {
-      var element = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var element = _iterator__ex2g4s.next_20eer_k$();
       var tmp;
-      if (kinds.e1(element.t1q_1)) {
+      if (kinds.contains_aljjnj_k$(element.kind_1)) {
         // Inline function 'kotlin.collections.isNotEmpty' call
-        tmp = !element.w1q().n();
+        tmp = !element.get_points_i5obn0_k$().isEmpty_y1axqb_k$();
       } else {
         tmp = false;
       }
       if (tmp) {
-        destination.h(element);
+        destination.add_utx5q5_k$(element);
       }
     }
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(destination, 10));
-    var _iterator__ex2g4s_0 = destination.i();
-    while (_iterator__ex2g4s_0.j()) {
-      var item = _iterator__ex2g4s_0.k();
+    var _iterator__ex2g4s_0 = destination.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s_0.next_20eer_k$();
       var tmp$ret$6 = toPath(item);
-      destination_0.h(tmp$ret$6);
+      destination_0.add_utx5q5_k$(tmp$ret$6);
     }
     return destination_0;
   }
@@ -1334,82 +1337,82 @@
     kinds = kinds === VOID ? get_ALL_KINDS() : kinds;
     _init_properties_GpxToPath_kt__pb67h9();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = _this__u8e3s4.m1q_1;
+    var tmp0 = _this__u8e3s4.tracks_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$();
-    var _iterator__ex2g4s = tmp0.i();
-    while (_iterator__ex2g4s.j()) {
-      var element = _iterator__ex2g4s.k();
-      if (kinds.e1(element.t1q_1)) {
-        destination.h(element);
+    var _iterator__ex2g4s = tmp0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var element = _iterator__ex2g4s.next_20eer_k$();
+      if (kinds.contains_aljjnj_k$(element.kind_1)) {
+        destination.add_utx5q5_k$(element);
       }
     }
     // Inline function 'kotlin.collections.flatMap' call
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination_0 = ArrayList_init_$Create$();
-    var _iterator__ex2g4s_0 = destination.i();
-    while (_iterator__ex2g4s_0.j()) {
-      var element_0 = _iterator__ex2g4s_0.k();
-      var list = element_0.s1q_1;
+    var _iterator__ex2g4s_0 = destination.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+      var element_0 = _iterator__ex2g4s_0.next_20eer_k$();
+      var list = element_0.segments_1;
       addAll(destination_0, list);
     }
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination_1 = ArrayList_init_$Create$();
-    var _iterator__ex2g4s_1 = destination_0.i();
-    while (_iterator__ex2g4s_1.j()) {
-      var element_1 = _iterator__ex2g4s_1.k();
+    var _iterator__ex2g4s_1 = destination_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_1.hasNext_bitz1p_k$()) {
+      var element_1 = _iterator__ex2g4s_1.next_20eer_k$();
       // Inline function 'kotlin.collections.isNotEmpty' call
-      if (!element_1.v1q_1.n()) {
-        destination_1.h(element_1);
+      if (!element_1.points_1.isEmpty_y1axqb_k$()) {
+        destination_1.add_utx5q5_k$(element_1);
       }
     }
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination_2 = ArrayList_init_$Create$_0(collectionSizeOrDefault(destination_1, 10));
-    var _iterator__ex2g4s_2 = destination_1.i();
-    while (_iterator__ex2g4s_2.j()) {
-      var item = _iterator__ex2g4s_2.k();
+    var _iterator__ex2g4s_2 = destination_1.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_2.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s_2.next_20eer_k$();
       var tmp$ret$12 = toPath_0(item);
-      destination_2.h(tmp$ret$12);
+      destination_2.add_utx5q5_k$(tmp$ret$12);
     }
     return destination_2;
   }
   function toPath(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.w1q());
+    return pointsToPath(_this__u8e3s4.get_points_i5obn0_k$());
   }
   function toPath_0(_this__u8e3s4) {
     _init_properties_GpxToPath_kt__pb67h9();
-    return pointsToPath(_this__u8e3s4.v1q_1);
+    return pointsToPath(_this__u8e3s4.points_1);
   }
   function pointsToPath(points) {
     _init_properties_GpxToPath_kt__pb67h9();
-    var path = new Path(points.l());
-    var iterator = points.i();
+    var path = new Path(points.get_size_woubt6_k$());
+    var iterator = points.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var i = index;
       index = index + 1 | 0;
-      var p = iterator.k();
-      path.z1r(i, p.x1q_1 * 0.017453292519943295);
-      path.a1s(i, p.y1q_1 * 0.017453292519943295);
-      var tmp0_elvis_lhs = p.z1q_1;
-      path.b1s(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
-      var tmp1_elvis_lhs = p.a1r_1;
-      path.c1s(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
-      var tmp2_elvis_lhs = p.e1r_1;
-      path.d1s(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
-      var tmp3_safe_receiver = p.b1r_1;
+      var p = iterator.next_20eer_k$();
+      path.setLatitude_skkzf0_k$(i, p.latitudeDeg_1 * 0.017453292519943295);
+      path.setLongitude_k0bc8l_k$(i, p.longitudeDeg_1 * 0.017453292519943295);
+      var tmp0_elvis_lhs = p.elevationM_1;
+      path.setElevation_pv2zuv_k$(i, tmp0_elvis_lhs == null ? 0.0 : tmp0_elvis_lhs);
+      var tmp1_elvis_lhs = p.timeEpochMs_1;
+      path.setTime_rfmvcd_k$(i, toNumber(tmp1_elvis_lhs == null ? new Long(0, 0) : tmp1_elvis_lhs));
+      var tmp2_elvis_lhs = p.powerW_1;
+      path.setPInputPower_i1beh_k$(i, tmp2_elvis_lhs == null ? NaN : tmp2_elvis_lhs);
+      var tmp3_safe_receiver = p.heartRate_1;
       var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : tmp3_safe_receiver;
-      path.e1s(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
-      var tmp5_safe_receiver = p.c1r_1;
+      path.setHeartRate_3mzzq6_k$(i, tmp4_elvis_lhs == null ? NaN : tmp4_elvis_lhs);
+      var tmp5_safe_receiver = p.cadence_1;
       var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : tmp5_safe_receiver;
-      path.f1s(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
-      var tmp7_elvis_lhs = p.d1r_1;
-      path.g1s(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
+      path.setCadence_ick7df_k$(i, tmp6_elvis_lhs == null ? NaN : tmp6_elvis_lhs);
+      var tmp7_elvis_lhs = p.temperatureC_1;
+      path.setTemperature_nno5xs_k$(i, tmp7_elvis_lhs == null ? NaN : tmp7_elvis_lhs);
     }
-    path.q1s();
+    path.computeDerivedData_uoxpeo_k$();
     return path;
   }
   var properties_initialized_GpxToPath_kt_83hcm9;
@@ -1420,30 +1423,30 @@
     }
   }
   function writeDocument($this, w, document, writeExtensions) {
-    w.f1a('', 'http://www.topografix.com/GPX/1/1');
-    w.f1a('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.setPrefix_e36xz8_k$('', 'http://www.topografix.com/GPX/1/1');
+    w.setPrefix_e36xz8_k$('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.f1a('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.setPrefix_e36xz8_k$('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
-    w.h1a('http://www.topografix.com/GPX/1/1', 'gpx', '');
-    w.j1a(null, 'version', null, '1.1');
-    w.j1a(null, 'creator', null, '@glandais/vcyclist');
-    w.g1a('', 'http://www.topografix.com/GPX/1/1');
-    w.g1a('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.attribute_ruzjv8_k$(null, 'version', null, '1.1');
+    w.attribute_ruzjv8_k$(null, 'creator', null, '@glandais/vcyclist');
+    w.namespaceAttr_vkifxg_k$('', 'http://www.topografix.com/GPX/1/1');
+    w.namespaceAttr_vkifxg_k$('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
     if (writeExtensions) {
-      w.g1a('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
+      w.namespaceAttr_vkifxg_k$('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1');
     }
-    w.j1a('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.l1q_1);
-    var _iterator__ex2g4s = document.n1q_1.i();
-    while (_iterator__ex2g4s.j()) {
-      var waypoint = _iterator__ex2g4s.k();
+    w.attribute_ruzjv8_k$('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.name_1);
+    var _iterator__ex2g4s = document.waypoints_1.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var waypoint = _iterator__ex2g4s.next_20eer_k$();
       writeWaypoint($this, w, waypoint);
     }
-    var _iterator__ex2g4s_0 = document.m1q_1.i();
-    while (_iterator__ex2g4s_0.j()) {
-      var track = _iterator__ex2g4s_0.k();
-      switch (track.t1q_1.o1_1) {
+    var _iterator__ex2g4s_0 = document.tracks_1.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+      var track = _iterator__ex2g4s_0.next_20eer_k$();
+      switch (track.kind_1.ordinal_1) {
         case 1:
           writeRoute($this, w, track, writeExtensions);
           break;
@@ -1455,208 +1458,208 @@
           break;
       }
     }
-    w.m1a('http://www.topografix.com/GPX/1/1', 'gpx', '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'gpx', '');
   }
   function writeWaypoint($this, w, waypoint) {
-    w.h1a('http://www.topografix.com/GPX/1/1', 'wpt', '');
-    w.j1a(null, 'lat', null, waypoint.d1q_1.toString());
-    w.j1a(null, 'lon', null, waypoint.e1q_1.toString());
-    var tmp0_safe_receiver = waypoint.f1q_1;
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.attribute_ruzjv8_k$(null, 'lat', null, waypoint.latitudeDeg_1.toString());
+    w.attribute_ruzjv8_k$(null, 'lon', null, waypoint.longitudeDeg_1.toString());
+    var tmp0_safe_receiver = waypoint.elevationM_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'ele', tmp0_safe_receiver.toString());
     }
-    var tmp1_safe_receiver = waypoint.k1q_1;
+    var tmp1_safe_receiver = waypoint.timeEpochMs_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().nd(tmp1_safe_receiver).toString());
+      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().fromEpochMilliseconds_uaz65_k$(tmp1_safe_receiver).toString());
     }
-    var tmp2_safe_receiver = waypoint.g1q_1;
+    var tmp2_safe_receiver = waypoint.name_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.h1q_1;
+    var tmp3_safe_receiver = waypoint.description_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.i1q_1;
+    var tmp4_safe_receiver = waypoint.symbol_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.j1q_1;
+    var tmp5_safe_receiver = waypoint.type_1;
     if (tmp5_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp5_safe_receiver);
     }
-    w.m1a('http://www.topografix.com/GPX/1/1', 'wpt', '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'wpt', '');
   }
   function writeMetadata($this, w, name) {
-    w.h1a('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'metadata', '');
     writeSimpleText($this, w, 'name', name);
-    w.m1a('http://www.topografix.com/GPX/1/1', 'metadata', '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'metadata', '');
   }
   function writeTrack($this, w, track, writeExtensions) {
-    w.h1a('http://www.topografix.com/GPX/1/1', 'trk', '');
-    var tmp0_safe_receiver = track.q1q_1;
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'trk', '');
+    var tmp0_safe_receiver = track.name_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.r1q_1;
+    var tmp1_safe_receiver = track.type_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'type', tmp1_safe_receiver);
     }
-    var _iterator__ex2g4s = track.s1q_1.i();
-    while (_iterator__ex2g4s.j()) {
-      var segment = _iterator__ex2g4s.k();
-      w.h1a('http://www.topografix.com/GPX/1/1', 'trkseg', '');
-      var _iterator__ex2g4s_0 = segment.v1q_1.i();
-      while (_iterator__ex2g4s_0.j()) {
-        var p = _iterator__ex2g4s_0.k();
+    var _iterator__ex2g4s = track.segments_1.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var segment = _iterator__ex2g4s.next_20eer_k$();
+      w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      var _iterator__ex2g4s_0 = segment.points_1.iterator_jk1svi_k$();
+      while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+        var p = _iterator__ex2g4s_0.next_20eer_k$();
         writeTrackPoint($this, w, p, writeExtensions);
       }
-      w.m1a('http://www.topografix.com/GPX/1/1', 'trkseg', '');
+      w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'trkseg', '');
     }
-    w.m1a('http://www.topografix.com/GPX/1/1', 'trk', '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'trk', '');
   }
   function writeRoute($this, w, route, writeExtensions) {
-    w.h1a('http://www.topografix.com/GPX/1/1', 'rte', '');
-    var tmp0_safe_receiver = route.q1q_1;
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'rte', '');
+    var tmp0_safe_receiver = route.name_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.r1q_1;
+    var tmp1_safe_receiver = route.type_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.w1q().i();
-    while (_iterator__ex2g4s.j()) {
-      var p = _iterator__ex2g4s.k();
+    var _iterator__ex2g4s = route.get_points_i5obn0_k$().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var p = _iterator__ex2g4s.next_20eer_k$();
       writeTrackPoint($this, w, p, writeExtensions, 'rtept');
     }
-    w.m1a('http://www.topografix.com/GPX/1/1', 'rte', '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'rte', '');
   }
   function writeTrackPoint($this, w, p, writeExtensions, localName) {
     localName = localName === VOID ? 'trkpt' : localName;
-    w.h1a('http://www.topografix.com/GPX/1/1', localName, '');
-    w.j1a(null, 'lat', null, p.x1q_1.toString());
-    w.j1a(null, 'lon', null, p.y1q_1.toString());
-    var tmp0_safe_receiver = p.a1r_1;
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', localName, '');
+    w.attribute_ruzjv8_k$(null, 'lat', null, p.latitudeDeg_1.toString());
+    w.attribute_ruzjv8_k$(null, 'lon', null, p.longitudeDeg_1.toString());
+    var tmp0_safe_receiver = p.timeEpochMs_1;
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().nd(tmp0_safe_receiver).toString());
+      writeSimpleText(GpxWriter_instance, w, 'time', Companion_getInstance().fromEpochMilliseconds_uaz65_k$(tmp0_safe_receiver).toString());
     }
-    var tmp1_safe_receiver = p.z1q_1;
+    var tmp1_safe_receiver = p.elevationM_1;
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
       writeSimpleText(GpxWriter_instance, w, 'ele', tmp1_safe_receiver.toString());
     }
-    var hasGarminExt = !(p.b1r_1 == null) || !(p.c1r_1 == null) || !(p.d1r_1 == null);
-    var hasPower = !(p.e1r_1 == null);
+    var hasGarminExt = !(p.heartRate_1 == null) || !(p.cadence_1 == null) || !(p.temperatureC_1 == null);
+    var hasPower = !(p.powerW_1 == null);
     if (writeExtensions && (hasGarminExt || hasPower)) {
-      w.h1a('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', 'extensions', '');
       if (hasPower) {
-        writeSimpleText($this, w, 'power', p.e1r_1.toString());
+        writeSimpleText($this, w, 'power', p.powerW_1.toString());
       }
       if (hasGarminExt) {
-        w.h1a('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
-        var tmp2_safe_receiver = p.b1r_1;
+        w.startTag_pjuzbi_k$('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        var tmp2_safe_receiver = p.heartRate_1;
         if (tmp2_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'hr', 'gpxtpx', tmp2_safe_receiver.toString());
         }
-        var tmp3_safe_receiver = p.c1r_1;
+        var tmp3_safe_receiver = p.cadence_1;
         if (tmp3_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'cad', 'gpxtpx', tmp3_safe_receiver.toString());
         }
-        var tmp4_safe_receiver = p.d1r_1;
+        var tmp4_safe_receiver = p.temperatureC_1;
         if (tmp4_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
           writeNamespaced(GpxWriter_instance, w, 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'atemp', 'gpxtpx', tmp4_safe_receiver.toString());
         }
-        w.m1a('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
+        w.endTag_yzukbv_k$('http://www.garmin.com/xmlschemas/TrackPointExtension/v1', 'TrackPointExtension', 'gpxtpx');
       }
-      w.m1a('http://www.topografix.com/GPX/1/1', 'extensions', '');
+      w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', 'extensions', '');
     }
-    w.m1a('http://www.topografix.com/GPX/1/1', localName, '');
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeSimpleText($this, w, localName, text) {
-    w.h1a('http://www.topografix.com/GPX/1/1', localName, '');
-    w.i1a(text);
-    w.m1a('http://www.topografix.com/GPX/1/1', localName, '');
+    w.startTag_pjuzbi_k$('http://www.topografix.com/GPX/1/1', localName, '');
+    w.text_x72pul_k$(text);
+    w.endTag_yzukbv_k$('http://www.topografix.com/GPX/1/1', localName, '');
   }
   function writeNamespaced($this, w, namespace, localName, prefix, text) {
-    w.h1a(namespace, localName, prefix);
-    w.i1a(text);
-    w.m1a(namespace, localName, prefix);
+    w.startTag_pjuzbi_k$(namespace, localName, prefix);
+    w.text_x72pul_k$(text);
+    w.endTag_yzukbv_k$(namespace, localName, prefix);
   }
   function GpxWriter() {
-    this.r1s_1 = 'http://www.topografix.com/GPX/1/1';
-    this.s1s_1 = 'http://www.w3.org/2001/XMLSchema-instance';
-    this.t1s_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
-    this.u1s_1 = 'xsi';
-    this.v1s_1 = 'gpxtpx';
-    this.w1s_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
-    this.x1s_1 = '@glandais/vcyclist';
-  }
-  protoOf(GpxWriter).y1s = function (document, writeExtensions) {
+    this.NS_GPX_1 = 'http://www.topografix.com/GPX/1/1';
+    this.NS_XSI_1 = 'http://www.w3.org/2001/XMLSchema-instance';
+    this.NS_GARMIN_TPX_1 = 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1';
+    this.PREFIX_XSI_1 = 'xsi';
+    this.PREFIX_GARMIN_TPX_1 = 'gpxtpx';
+    this.SCHEMA_LOCATION_1 = 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd';
+    this.CREATOR_1 = '@glandais/vcyclist';
+  }
+  protoOf(GpxWriter).write_7y52k2_k$ = function (document, writeExtensions) {
     var out = StringBuilder_init_$Create$();
-    out.v5('<?xml version="1.0" encoding="UTF-8"?>\n');
+    out.append_22ad7x_k$('<?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.n18();
+      writer.close_yn9xrc_k$();
     }
     return out.toString();
   };
-  protoOf(GpxWriter).z1s = function (paths, name, trackNames, waypoints, startTime, writeExtensions) {
-    return this.y1s(pathsToGpxDocument(paths, name, trackNames, waypoints, VOID, startTime), writeExtensions);
+  protoOf(GpxWriter).write_jjl3rf_k$ = function (paths, name, trackNames, waypoints, startTime, writeExtensions) {
+    return this.write_7y52k2_k$(pathsToGpxDocument(paths, name, trackNames, waypoints, VOID, startTime), writeExtensions);
   };
-  protoOf(GpxWriter).a1t = function (paths, name, trackNames, waypoints, startTime, writeExtensions, $super) {
+  protoOf(GpxWriter).write$default_koqy5u_k$ = function (paths, name, trackNames, waypoints, startTime, writeExtensions, $super) {
     name = name === VOID ? 'noname' : name;
     trackNames = trackNames === VOID ? null : trackNames;
     waypoints = waypoints === VOID ? emptyList() : waypoints;
     startTime = startTime === VOID ? null : startTime;
     writeExtensions = writeExtensions === VOID ? true : writeExtensions;
-    return $super === VOID ? this.z1s(paths, name, trackNames, waypoints, startTime, writeExtensions) : $super.z1s.call(this, paths, name, trackNames, waypoints, startTime, writeExtensions);
+    return $super === VOID ? this.write_jjl3rf_k$(paths, name, trackNames, waypoints, startTime, writeExtensions) : $super.write_jjl3rf_k$.call(this, paths, name, trackNames, waypoints, startTime, writeExtensions);
   };
   var GpxWriter_instance;
   function GpxWriter_getInstance() {
@@ -1687,11 +1690,11 @@
       var c = charCodeAt(xml, i);
       if (isHighSurrogate(c) && (i + 1 | 0) < n && isLowSurrogate(charCodeAt(xml, i + 1 | 0))) {
         var tmp0_safe_receiver = sb;
-        var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w5(c);
+        var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.append_58al37_k$(c);
         if (tmp1_safe_receiver == null)
           null;
         else
-          tmp1_safe_receiver.w5(charCodeAt(xml, i + 1 | 0));
+          tmp1_safe_receiver.append_58al37_k$(charCodeAt(xml, i + 1 | 0));
         i = i + 2 | 0;
         continue $l$loop;
       }
@@ -1703,10 +1706,10 @@
         if (tmp2_safe_receiver == null)
           null;
         else
-          tmp2_safe_receiver.w5(c);
+          tmp2_safe_receiver.append_58al37_k$(c);
       } else {
         if (sb == null)
-          sb = StringBuilder_init_$Create$_0(xml.length).y8(xml, 0, i);
+          sb = StringBuilder_init_$Create$_0(xml.length).append_xdc1zw_k$(xml, 0, i);
         count = count + 1 | 0;
       }
       i = i + 1 | 0;
@@ -1726,11 +1729,11 @@
           if (tmp0_safe_receiver == null)
             null;
           else
-            tmp0_safe_receiver.w5(c);
+            tmp0_safe_receiver.append_58al37_k$(c);
         } else {
           if (sb == null)
-            sb = StringBuilder_init_$Create$_0(xml.length + 16 | 0).y8(xml, 0, i);
-          sb.v5('&amp;');
+            sb = StringBuilder_init_$Create$_0(xml.length + 16 | 0).append_xdc1zw_k$(xml, 0, i);
+          sb.append_22ad7x_k$('&amp;');
           count = count + 1 | 0;
         }
       } else {
@@ -1738,7 +1741,7 @@
         if (tmp1_safe_receiver == null)
           null;
         else
-          tmp1_safe_receiver.w5(c);
+          tmp1_safe_receiver.append_58al37_k$(c);
       }
       i = i + 1 | 0;
     }
@@ -1746,20 +1749,20 @@
   }
   function recombineSurrogatePairReferences($this, xml) {
     var refs = findNumericReferences($this, xml);
-    if (refs.l() < 2)
+    if (refs.get_size_woubt6_k$() < 2)
       return null;
     var count = 0;
     var sb = StringBuilder_init_$Create$_0(xml.length);
     var copiedUpTo = 0;
     var i = 0;
-    while (i < refs.l()) {
-      var high = refs.m(i);
+    while (i < refs.get_size_woubt6_k$()) {
+      var high = refs.get_c1px32_k$(i);
       var low = getOrNull(refs, i + 1 | 0);
-      if (!(low == null) && high.c1t_1 === low.b1t_1 && isHighSurrogate_0($this, high.d1t_1) && isLowSurrogate_0($this, low.d1t_1)) {
-        sb.y8(xml, copiedUpTo, high.b1t_1);
-        var codePoint = (65536 + imul(high.d1t_1 - 55296 | 0, 1024) | 0) + (low.d1t_1 - 56320 | 0) | 0;
-        sb.v5('&#').a9(codePoint).w5(_Char___init__impl__6a9atx(59));
-        copiedUpTo = low.c1t_1;
+      if (!(low == null) && high.end_1 === low.start_1 && isHighSurrogate_0($this, high.value_1) && isLowSurrogate_0($this, low.value_1)) {
+        sb.append_xdc1zw_k$(xml, copiedUpTo, high.start_1);
+        var codePoint = (65536 + imul(high.value_1 - 55296 | 0, 1024) | 0) + (low.value_1 - 56320 | 0) | 0;
+        sb.append_22ad7x_k$('&#').append_uppzia_k$(codePoint).append_58al37_k$(_Char___init__impl__6a9atx(59));
+        copiedUpTo = low.end_1;
         count = count + 1 | 0;
         i = i + 2 | 0;
       } else {
@@ -1768,21 +1771,21 @@
     }
     if (count === 0)
       return null;
-    sb.y8(xml, copiedUpTo, xml.length);
+    sb.append_xdc1zw_k$(xml, copiedUpTo, xml.length);
     return new Pair(sb.toString(), count);
   }
   function NumericRef(start, end, value) {
-    this.b1t_1 = start;
-    this.c1t_1 = end;
-    this.d1t_1 = value;
+    this.start_1 = start;
+    this.end_1 = end;
+    this.value_1 = value;
   }
   protoOf(NumericRef).toString = function () {
-    return 'NumericRef(start=' + this.b1t_1 + ', end=' + this.c1t_1 + ', value=' + this.d1t_1 + ')';
+    return 'NumericRef(start=' + this.start_1 + ', end=' + this.end_1 + ', value=' + this.value_1 + ')';
   };
   protoOf(NumericRef).hashCode = function () {
-    var result = this.b1t_1;
-    result = imul(result, 31) + this.c1t_1 | 0;
-    result = imul(result, 31) + this.d1t_1 | 0;
+    var result = this.start_1;
+    result = imul(result, 31) + this.end_1 | 0;
+    result = imul(result, 31) + this.value_1 | 0;
     return result;
   };
   protoOf(NumericRef).equals = function (other) {
@@ -1790,11 +1793,11 @@
       return true;
     if (!(other instanceof NumericRef))
       return false;
-    if (!(this.b1t_1 === other.b1t_1))
+    if (!(this.start_1 === other.start_1))
       return false;
-    if (!(this.c1t_1 === other.c1t_1))
+    if (!(this.end_1 === other.end_1))
       return false;
-    if (!(this.d1t_1 === other.d1t_1))
+    if (!(this.value_1 === other.value_1))
       return false;
     return true;
   };
@@ -1809,7 +1812,7 @@
         if (!(end === -1)) {
           var value = parseNumericReferenceValue($this, substring_0(xml, i + 2 | 0, end));
           if (!(value === -1)) {
-            refs.h(new NumericRef(i, end + 1 | 0, value));
+            refs.add_utx5q5_k$(new NumericRef(i, end + 1 | 0, value));
           }
           i = end + 1 | 0;
           continue $l$loop;
@@ -1881,20 +1884,20 @@
     }
     if (j >= n || !(charCodeAt(xml, j) === _Char___init__impl__6a9atx(59)))
       return -1;
-    return $this.v1r_1.e1(substring_0(xml, nameStart, j)) ? j : -1;
+    return $this.PREDEFINED_ENTITIES_1.contains_aljjnj_k$(substring_0(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.v1r_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
-    this.w1r_1 = 20;
+    this.PREDEFINED_ENTITIES_1 = setOf(['amp', 'lt', 'gt', 'apos', 'quot']);
+    this.MAX_REFERENCE_BODY_LENGTH_1 = 20;
   }
-  protoOf(GpxXmlRepair).x1r = function (xml) {
-    return this.g1t(xml).e1t_1;
+  protoOf(GpxXmlRepair).repair_iwt4xf_k$ = function (xml) {
+    return this.repairVerbose_mzqg4l_k$(xml).xml_1;
   };
-  protoOf(GpxXmlRepair).g1t = function (xml) {
+  protoOf(GpxXmlRepair).repairVerbose_mzqg4l_k$ = function (xml) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var repairs = ArrayList_init_$Create$();
     var current = xml;
@@ -1906,43 +1909,43 @@
       current = tmp0_safe_receiver;
       // Inline function 'kotlin.collections.plusAssign' call
       var element = 'removed leading UTF-8 BOM (U+FEFF)';
-      repairs.h(element);
+      repairs.add_utx5q5_k$(element);
     }
     var tmp1_safe_receiver = stripIllegalControlChars(this, current);
     if (tmp1_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      var repairedXml = tmp1_safe_receiver.qe();
-      var count = tmp1_safe_receiver.re();
+      var repairedXml = tmp1_safe_receiver.component1_7eebsc_k$();
+      var count = tmp1_safe_receiver.component2_7eebsb_k$();
       current = repairedXml;
       // Inline function 'kotlin.collections.plusAssign' call
       var element_0 = 'removed ' + count + ' illegal XML 1.0 control character(s)';
-      repairs.h(element_0);
+      repairs.add_utx5q5_k$(element_0);
     }
     var tmp2_safe_receiver = recombineSurrogatePairReferences(this, current);
     if (tmp2_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      var repairedXml_0 = tmp2_safe_receiver.qe();
-      var count_0 = tmp2_safe_receiver.re();
+      var repairedXml_0 = tmp2_safe_receiver.component1_7eebsc_k$();
+      var count_0 = tmp2_safe_receiver.component2_7eebsb_k$();
       current = repairedXml_0;
       // Inline function 'kotlin.collections.plusAssign' call
       var element_1 = 'recombined ' + count_0 + ' surrogate-pair numeric character reference(s)';
-      repairs.h(element_1);
+      repairs.add_utx5q5_k$(element_1);
     }
     var tmp3_safe_receiver = escapeBareAmpersands(this, current);
     if (tmp3_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      var repairedXml_1 = tmp3_safe_receiver.qe();
-      var count_1 = tmp3_safe_receiver.re();
+      var repairedXml_1 = tmp3_safe_receiver.component1_7eebsc_k$();
+      var count_1 = tmp3_safe_receiver.component2_7eebsb_k$();
       current = repairedXml_1;
       // Inline function 'kotlin.collections.plusAssign' call
       var element_2 = 'escaped ' + count_1 + " bare '&' character(s)";
-      repairs.h(element_2);
+      repairs.add_utx5q5_k$(element_2);
     }
     return new RepairResult(current, repairs);
   };
@@ -1953,15 +1956,15 @@
     return GpxXmlRepair_instance;
   }
   function RepairResult(xml, repairs) {
-    this.e1t_1 = xml;
-    this.f1t_1 = repairs;
+    this.xml_1 = xml;
+    this.repairs_1 = repairs;
   }
   protoOf(RepairResult).toString = function () {
-    return 'RepairResult(xml=' + this.e1t_1 + ', repairs=' + toString_0(this.f1t_1) + ')';
+    return 'RepairResult(xml=' + this.xml_1 + ', repairs=' + toString_0(this.repairs_1) + ')';
   };
   protoOf(RepairResult).hashCode = function () {
-    var result = getStringHashCode(this.e1t_1);
-    result = imul(result, 31) + hashCode(this.f1t_1) | 0;
+    var result = getStringHashCode(this.xml_1);
+    result = imul(result, 31) + hashCode(this.repairs_1) | 0;
     return result;
   };
   protoOf(RepairResult).equals = function (other) {
@@ -1969,9 +1972,9 @@
       return true;
     if (!(other instanceof RepairResult))
       return false;
-    if (!(this.e1t_1 === other.e1t_1))
+    if (!(this.xml_1 === other.xml_1))
       return false;
-    if (!equals(this.f1t_1, other.f1t_1))
+    if (!equals(this.repairs_1, other.repairs_1))
       return false;
     return true;
   };
@@ -1992,9 +1995,9 @@
     var negative = value < 0.0;
     // Inline function 'kotlin.math.abs' call
     var absValue = Math.abs(value);
-    var scale = toNumber($this.i1t_1[decimals]);
+    var scale = toNumber($this.pow10Long_1[decimals]);
     var scaledLong = numberToLong(round(absValue * scale));
-    var whole = $this.i1t_1[decimals];
+    var whole = $this.pow10Long_1[decimals];
     var intPart = divide(scaledLong, whole);
     var sign = negative && !equalsLong(scaledLong, new Long(0, 0)) ? '-' : '';
     var tmp;
@@ -2008,7 +2011,7 @@
   }
   function CsvNumberFormat() {
     CsvNumberFormat_instance = this;
-    this.h1t_1 = 12;
+    this.MAX_AUTO_DECIMALS_1 = 12;
     var tmp = this;
     // Inline function 'kotlin.also' call
     var this_0 = longArray(13);
@@ -2023,9 +2026,9 @@
         p = multiply(p, new Long(10, 0));
       }
        while (inductionVariable <= last);
-    tmp.i1t_1 = this_0;
+    tmp.pow10Long_1 = this_0;
   }
-  protoOf(CsvNumberFormat).j1t = function (value, decimals) {
+  protoOf(CsvNumberFormat).format_whs5r8_k$ = function (value, decimals) {
     if (isNaN_0(value))
       return '';
     if (isInfinite(value))
@@ -2050,19 +2053,19 @@
     return CsvNumberFormat_instance;
   }
   function headerFor($this, field, unitsInHeader) {
-    return unitsInHeader ? field.m1t_1 + ' (' + field.n1t_1 + ')' : field.m1t_1;
+    return unitsInHeader ? field.prop_1 + ' (' + field.unit_1 + ')' : field.prop_1;
   }
   function appendRow($this, sb, cells, options) {
-    var iterator = cells.i();
+    var iterator = cells.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var i = index;
       index = index + 1 | 0;
-      var cell = iterator.k();
+      var cell = iterator.next_20eer_k$();
       if (i > 0) {
-        sb.w5(options.t1t_1);
+        sb.append_58al37_k$(options.separator_1);
       }
-      sb.v5(escapeCsvCell($this, cell, options.t1t_1));
+      sb.append_22ad7x_k$(escapeCsvCell($this, cell, options.separator_1));
     }
   }
   function escapeCsvCell($this, cell, separator) {
@@ -2091,35 +2094,35 @@
   }
   function CsvWriter() {
   }
-  protoOf(CsvWriter).x1t = function (path, options) {
-    var tmp0_elvis_lhs = options.s1t_1;
+  protoOf(CsvWriter).write_p5vnh4_k$ = function (path, options) {
+    var tmp0_elvis_lhs = options.fields_1;
     var fields = tmp0_elvis_lhs == null ? get_entries_0() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(fields, 10));
-    var _iterator__ex2g4s = fields.i();
-    while (_iterator__ex2g4s.j()) {
-      var item = _iterator__ex2g4s.k();
-      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.u1t_1);
-      destination.h(tmp$ret$2);
+    var _iterator__ex2g4s = fields.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var item = _iterator__ex2g4s.next_20eer_k$();
+      var tmp$ret$2 = headerFor(CsvWriter_instance, item, options.unitsInHeader_1);
+      destination.add_utx5q5_k$(tmp$ret$2);
     }
     appendRow(this, sb, destination, options);
     var inductionVariable = 0;
-    var last = path.f1r_1;
+    var last = path.size_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        sb.v5(options.w1t_1);
+        sb.append_22ad7x_k$(options.lineSeparator_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.i();
-        while (_iterator__ex2g4s_0.j()) {
-          var item_0 = _iterator__ex2g4s_0.k();
-          var tmp$ret$5 = CsvNumberFormat_getInstance().j1t(path.y1t(i, item_0), options.v1t_1);
-          destination_0.h(tmp$ret$5);
+        var _iterator__ex2g4s_0 = fields.iterator_jk1svi_k$();
+        while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+          var item_0 = _iterator__ex2g4s_0.next_20eer_k$();
+          var tmp$ret$5 = CsvNumberFormat_getInstance().format_whs5r8_k$(path.get_z3le6l_k$(i, item_0), options.decimals_1);
+          destination_0.add_utx5q5_k$(tmp$ret$5);
         }
         appendRow(this, sb, destination_0, options);
       }
@@ -2136,21 +2139,21 @@
     unitsInHeader = unitsInHeader === VOID ? true : unitsInHeader;
     decimals = decimals === VOID ? null : decimals;
     lineSeparator = lineSeparator === VOID ? '\n' : lineSeparator;
-    this.s1t_1 = fields;
-    this.t1t_1 = separator;
-    this.u1t_1 = unitsInHeader;
-    this.v1t_1 = decimals;
-    this.w1t_1 = lineSeparator;
+    this.fields_1 = fields;
+    this.separator_1 = separator;
+    this.unitsInHeader_1 = unitsInHeader;
+    this.decimals_1 = decimals;
+    this.lineSeparator_1 = lineSeparator;
   }
   protoOf(CsvOptions).toString = function () {
-    return 'CsvOptions(fields=' + toString(this.s1t_1) + ', separator=' + toString_1(this.t1t_1) + ', unitsInHeader=' + this.u1t_1 + ', decimals=' + this.v1t_1 + ', lineSeparator=' + this.w1t_1 + ')';
+    return 'CsvOptions(fields=' + toString(this.fields_1) + ', separator=' + toString_1(this.separator_1) + ', unitsInHeader=' + this.unitsInHeader_1 + ', decimals=' + this.decimals_1 + ', lineSeparator=' + this.lineSeparator_1 + ')';
   };
   protoOf(CsvOptions).hashCode = function () {
-    var result = this.s1t_1 == null ? 0 : hashCode(this.s1t_1);
-    result = imul(result, 31) + Char__hashCode_impl_otmys(this.t1t_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.u1t_1) | 0;
-    result = imul(result, 31) + (this.v1t_1 == null ? 0 : this.v1t_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.w1t_1) | 0;
+    var result = this.fields_1 == null ? 0 : hashCode(this.fields_1);
+    result = imul(result, 31) + Char__hashCode_impl_otmys(this.separator_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.unitsInHeader_1) | 0;
+    result = imul(result, 31) + (this.decimals_1 == null ? 0 : this.decimals_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.lineSeparator_1) | 0;
     return result;
   };
   protoOf(CsvOptions).equals = function (other) {
@@ -2158,78 +2161,78 @@
       return true;
     if (!(other instanceof CsvOptions))
       return false;
-    if (!equals(this.s1t_1, other.s1t_1))
+    if (!equals(this.fields_1, other.fields_1))
       return false;
-    if (!(this.t1t_1 === other.t1t_1))
+    if (!(this.separator_1 === other.separator_1))
       return false;
-    if (!(this.u1t_1 === other.u1t_1))
+    if (!(this.unitsInHeader_1 === other.unitsInHeader_1))
       return false;
-    if (!(this.v1t_1 == other.v1t_1))
+    if (!(this.decimals_1 == other.decimals_1))
       return false;
-    if (!(this.w1t_1 === other.w1t_1))
+    if (!(this.lineSeparator_1 === other.lineSeparator_1))
       return false;
     return true;
   };
   function appendMeta($this, sb, path, fields, decimals, indent, nl, colon) {
     var inner = indent + indent;
     appendKeyRaw($this, sb, indent, 'meta', colon);
-    sb.w5(_Char___init__impl__6a9atx(123)).v5(nl);
-    appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.j1s_1, decimals), colon);
-    sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
-    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.o1s_1, decimals), colon);
-    sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.m1s_1, decimals), colon);
-    sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
-    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.n1s_1, decimals), colon);
-    sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(123)).append_22ad7x_k$(nl);
+    appendKeyValueRaw($this, sb, inner, 'totalDistance', numberOrNull($this, path.totalDistance_1, decimals), colon);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
+    appendKeyValueRaw($this, sb, inner, 'durationMs', numberOrNull($this, path.durationMs_1, decimals), colon);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
+    appendKeyValueRaw($this, sb, inner, 'elevationGain', numberOrNull($this, path.elevationGain_1, decimals), colon);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
+    appendKeyValueRaw($this, sb, inner, 'elevationLoss', numberOrNull($this, path.elevationLoss_1, decimals), colon);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
     appendKeyRaw($this, sb, inner, 'units', colon);
-    sb.w5(_Char___init__impl__6a9atx(123)).v5(nl);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(123)).append_22ad7x_k$(nl);
     var innerUnits = inner + indent;
-    var iterator = fields.i();
+    var iterator = fields.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var i = index;
       index = index + 1 | 0;
-      var field = iterator.k();
-      appendKeyValueRaw($this, sb, innerUnits, $this.z1t(field.m1t_1), '"' + $this.z1t(field.n1t_1) + '"', colon);
+      var field = iterator.next_20eer_k$();
+      appendKeyValueRaw($this, sb, innerUnits, $this.escapeJsonString_4zkd4o_k$(field.prop_1), '"' + $this.escapeJsonString_4zkd4o_k$(field.unit_1) + '"', colon);
       if (!(i === get_lastIndex(fields))) {
-        sb.w5(_Char___init__impl__6a9atx(44));
+        sb.append_58al37_k$(_Char___init__impl__6a9atx(44));
       }
-      sb.v5(nl);
+      sb.append_22ad7x_k$(nl);
     }
-    sb.v5(inner).w5(_Char___init__impl__6a9atx(125)).v5(nl);
-    sb.v5(indent).w5(_Char___init__impl__6a9atx(125));
+    sb.append_22ad7x_k$(inner).append_58al37_k$(_Char___init__impl__6a9atx(125)).append_22ad7x_k$(nl);
+    sb.append_22ad7x_k$(indent).append_58al37_k$(_Char___init__impl__6a9atx(125));
   }
   function appendFields($this, sb, path, fields, options, indent, nl, colon) {
-    sb.w5(_Char___init__impl__6a9atx(123)).v5(nl);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(123)).append_22ad7x_k$(nl);
     var inner = indent + indent;
-    var iterator = fields.i();
+    var iterator = fields.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var fi = index;
       index = index + 1 | 0;
-      var field = iterator.k();
-      appendKeyRaw($this, sb, inner, $this.z1t(field.m1t_1), colon);
-      sb.w5(_Char___init__impl__6a9atx(91));
+      var field = iterator.next_20eer_k$();
+      appendKeyRaw($this, sb, inner, $this.escapeJsonString_4zkd4o_k$(field.prop_1), colon);
+      sb.append_58al37_k$(_Char___init__impl__6a9atx(91));
       var inductionVariable = 0;
-      var last = path.f1r_1;
+      var last = path.size_1;
       if (inductionVariable < last)
         do {
           var i = inductionVariable;
           inductionVariable = inductionVariable + 1 | 0;
           if (i > 0) {
-            sb.w5(_Char___init__impl__6a9atx(44));
+            sb.append_58al37_k$(_Char___init__impl__6a9atx(44));
           }
-          sb.v5(numberOrNull($this, path.y1t(i, field), options.c1u_1));
+          sb.append_22ad7x_k$(numberOrNull($this, path.get_z3le6l_k$(i, field), options.decimals_1));
         }
          while (inductionVariable < last);
-      sb.w5(_Char___init__impl__6a9atx(93));
+      sb.append_58al37_k$(_Char___init__impl__6a9atx(93));
       if (!(fi === get_lastIndex(fields))) {
-        sb.w5(_Char___init__impl__6a9atx(44));
+        sb.append_58al37_k$(_Char___init__impl__6a9atx(44));
       }
-      sb.v5(nl);
+      sb.append_22ad7x_k$(nl);
     }
-    sb.v5(indent).w5(_Char___init__impl__6a9atx(125));
+    sb.append_22ad7x_k$(indent).append_58al37_k$(_Char___init__impl__6a9atx(125));
   }
   function numberOrNull($this, value, decimals) {
     decimals = decimals === VOID ? null : decimals;
@@ -2237,39 +2240,39 @@
     if (isNaN_0(value) || isInfinite(value)) {
       tmp = 'null';
     } else {
-      tmp = CsvNumberFormat_getInstance().j1t(value, decimals);
+      tmp = CsvNumberFormat_getInstance().format_whs5r8_k$(value, decimals);
     }
     return tmp;
   }
   function appendKeyRaw($this, sb, indent, key, colon) {
-    sb.v5(indent).w5(_Char___init__impl__6a9atx(34)).v5(key).w5(_Char___init__impl__6a9atx(34)).v5(colon);
+    sb.append_22ad7x_k$(indent).append_58al37_k$(_Char___init__impl__6a9atx(34)).append_22ad7x_k$(key).append_58al37_k$(_Char___init__impl__6a9atx(34)).append_22ad7x_k$(colon);
   }
   function appendKeyValueRaw($this, sb, indent, key, rawValue, colon) {
     appendKeyRaw($this, sb, indent, key, colon);
-    sb.v5(rawValue);
+    sb.append_22ad7x_k$(rawValue);
   }
   function JsonWriter() {
   }
-  protoOf(JsonWriter).e1u = function (path, options) {
-    var tmp0_elvis_lhs = options.a1u_1;
+  protoOf(JsonWriter).write_lwqeog_k$ = function (path, options) {
+    var tmp0_elvis_lhs = options.fields_1;
     var fields = tmp0_elvis_lhs == null ? get_entries_0() : tmp0_elvis_lhs;
     var sb = StringBuilder_init_$Create$();
-    var indent = options.b1u_1 ? '  ' : '';
-    var nl = options.b1u_1 ? '\n' : '';
-    var colon = options.b1u_1 ? ': ' : ':';
-    sb.w5(_Char___init__impl__6a9atx(123)).v5(nl);
-    appendKeyValueRaw(this, sb, indent, 'size', path.f1r_1.toString(), colon);
-    sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
-    if (options.d1u_1) {
-      appendMeta(this, sb, path, fields, options.c1u_1, indent, nl, colon);
-      sb.w5(_Char___init__impl__6a9atx(44)).v5(nl);
+    var indent = options.pretty_1 ? '  ' : '';
+    var nl = options.pretty_1 ? '\n' : '';
+    var colon = options.pretty_1 ? ': ' : ':';
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(123)).append_22ad7x_k$(nl);
+    appendKeyValueRaw(this, sb, indent, 'size', path.size_1.toString(), colon);
+    sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
+    if (options.includeMeta_1) {
+      appendMeta(this, sb, path, fields, options.decimals_1, indent, nl, colon);
+      sb.append_58al37_k$(_Char___init__impl__6a9atx(44)).append_22ad7x_k$(nl);
     }
     appendKeyRaw(this, sb, indent, 'fields', colon);
     appendFields(this, sb, path, fields, options, indent, nl, colon);
-    sb.v5(nl).w5(_Char___init__impl__6a9atx(125));
+    sb.append_22ad7x_k$(nl).append_58al37_k$(_Char___init__impl__6a9atx(125));
     return sb.toString();
   };
-  protoOf(JsonWriter).z1t = function (value) {
+  protoOf(JsonWriter).escapeJsonString_4zkd4o_k$ = function (value) {
     var sb = StringBuilder_init_$Create$_0(value.length);
     var inductionVariable = 0;
     var last = value.length;
@@ -2277,24 +2280,24 @@
       var c = charCodeAt(value, inductionVariable);
       inductionVariable = inductionVariable + 1 | 0;
       if (c === _Char___init__impl__6a9atx(34))
-        sb.v5('\\"');
+        sb.append_22ad7x_k$('\\"');
       else if (c === _Char___init__impl__6a9atx(92))
-        sb.v5('\\\\');
+        sb.append_22ad7x_k$('\\\\');
       else if (c === _Char___init__impl__6a9atx(10))
-        sb.v5('\\n');
+        sb.append_22ad7x_k$('\\n');
       else if (c === _Char___init__impl__6a9atx(13))
-        sb.v5('\\r');
+        sb.append_22ad7x_k$('\\r');
       else if (c === _Char___init__impl__6a9atx(9))
-        sb.v5('\\t');
+        sb.append_22ad7x_k$('\\t');
       else {
         // Inline function 'kotlin.code' call
         if (Char__toInt_impl_vasixd(c) < 32) {
-          var tmp = sb.v5('\\u');
+          var tmp = sb.append_22ad7x_k$('\\u');
           // Inline function 'kotlin.code' call
           var tmp$ret$1 = Char__toInt_impl_vasixd(c);
-          tmp.v5(padStart(toString_2(tmp$ret$1, 16), 4, _Char___init__impl__6a9atx(48)));
+          tmp.append_22ad7x_k$(padStart(toString_2(tmp$ret$1, 16), 4, _Char___init__impl__6a9atx(48)));
         } else {
-          sb.w5(c);
+          sb.append_58al37_k$(c);
         }
       }
     }
@@ -2309,19 +2312,19 @@
     pretty = pretty === VOID ? false : pretty;
     decimals = decimals === VOID ? null : decimals;
     includeMeta = includeMeta === VOID ? true : includeMeta;
-    this.a1u_1 = fields;
-    this.b1u_1 = pretty;
-    this.c1u_1 = decimals;
-    this.d1u_1 = includeMeta;
+    this.fields_1 = fields;
+    this.pretty_1 = pretty;
+    this.decimals_1 = decimals;
+    this.includeMeta_1 = includeMeta;
   }
   protoOf(JsonOptions).toString = function () {
-    return 'JsonOptions(fields=' + toString(this.a1u_1) + ', pretty=' + this.b1u_1 + ', decimals=' + this.c1u_1 + ', includeMeta=' + this.d1u_1 + ')';
+    return 'JsonOptions(fields=' + toString(this.fields_1) + ', pretty=' + this.pretty_1 + ', decimals=' + this.decimals_1 + ', includeMeta=' + this.includeMeta_1 + ')';
   };
   protoOf(JsonOptions).hashCode = function () {
-    var result = this.a1u_1 == null ? 0 : hashCode(this.a1u_1);
-    result = imul(result, 31) + getBooleanHashCode(this.b1u_1) | 0;
-    result = imul(result, 31) + (this.c1u_1 == null ? 0 : this.c1u_1) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.d1u_1) | 0;
+    var result = this.fields_1 == null ? 0 : hashCode(this.fields_1);
+    result = imul(result, 31) + getBooleanHashCode(this.pretty_1) | 0;
+    result = imul(result, 31) + (this.decimals_1 == null ? 0 : this.decimals_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.includeMeta_1) | 0;
     return result;
   };
   protoOf(JsonOptions).equals = function (other) {
@@ -2329,28 +2332,28 @@
       return true;
     if (!(other instanceof JsonOptions))
       return false;
-    if (!equals(this.a1u_1, other.a1u_1))
+    if (!equals(this.fields_1, other.fields_1))
       return false;
-    if (!(this.b1u_1 === other.b1u_1))
+    if (!(this.pretty_1 === other.pretty_1))
       return false;
-    if (!(this.c1u_1 == other.c1u_1))
+    if (!(this.decimals_1 == other.decimals_1))
       return false;
-    if (!(this.d1u_1 === other.d1u_1))
+    if (!(this.includeMeta_1 === other.includeMeta_1))
       return false;
     return true;
   };
   function copyAllSlots($this, source) {
-    var out = new Path(source.f1r_1);
+    var out = new Path(source.size_1);
     var inductionVariable = 0;
-    var last = source.f1r_1;
+    var last = source.size_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var _iterator__ex2g4s = get_entries_0().i();
-        while (_iterator__ex2g4s.j()) {
-          var field = _iterator__ex2g4s.k();
-          out.f1u(i, field, source.y1t(i, field));
+        var _iterator__ex2g4s = get_entries_0().iterator_jk1svi_k$();
+        while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+          var field = _iterator__ex2g4s.next_20eer_k$();
+          out.set_b3ze83_k$(i, field, source.get_z3le6l_k$(i, field));
         }
       }
        while (inductionVariable < last);
@@ -2358,33 +2361,33 @@
   }
   function $fixElevationCOROUTINE$(_this__u8e3s4, source, provider, resultContinuation) {
     CoroutineImpl.call(this, resultContinuation);
-    this.o1u_1 = _this__u8e3s4;
-    this.p1u_1 = source;
-    this.q1u_1 = provider;
+    this._this__u8e3s4__1 = _this__u8e3s4;
+    this.source_1 = source;
+    this.provider_1 = provider;
   }
-  protoOf($fixElevationCOROUTINE$).p6 = function () {
-    var suspendResult = this.j6_1;
+  protoOf($fixElevationCOROUTINE$).doResume_5yljmg_k$ = function () {
+    var suspendResult = this.result_1;
     $sm: do
       try {
-        var tmp = this.h6_1;
+        var tmp = this.state_1;
         switch (tmp) {
           case 0:
-            this.i6_1 = 2;
-            if (this.p1u_1.f1r_1 === 0)
+            this.exceptionState_1 = 2;
+            if (this.source_1.size_1 === 0)
               return new Path(0);
-            var size = this.p1u_1.f1r_1;
+            var size = this.source_1.size_1;
             var list = ArrayList_init_$Create$_0(size);
             var inductionVariable = 0;
             if (inductionVariable < size)
               do {
                 var index = inductionVariable;
                 inductionVariable = inductionVariable + 1 | 0;
-                list.h(new LatLon(this.p1u_1.h1r(index) * 57.29577951308232, this.p1u_1.i1r(index) * 57.29577951308232));
+                list.add_utx5q5_k$(new LatLon(this.source_1.latitude_gb4iok_k$(index) * 57.29577951308232, this.source_1.longitude_a9xl_k$(index) * 57.29577951308232));
               }
                while (inductionVariable < size);
             var coords = list;
-            this.h6_1 = 1;
-            suspendResult = this.q1u_1.s10(coords, VOID, this);
+            this.state_1 = 1;
+            suspendResult = this.provider_1.setElevations$default_vdh3yj_k$(coords, VOID, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -2392,47 +2395,47 @@
             continue $sm;
           case 1:
             var corrected = suspendResult;
-            var out = copyAllSlots(this.o1u_1, this.p1u_1);
+            var out = copyAllSlots(this._this__u8e3s4__1, this.source_1);
             var inductionVariable_0 = 0;
-            var last = out.f1r_1;
+            var last = out.size_1;
             if (inductionVariable_0 < last)
               do {
                 var i = inductionVariable_0;
                 inductionVariable_0 = inductionVariable_0 + 1 | 0;
-                out.b1s(i, corrected.m(i).ww());
+                out.setElevation_pv2zuv_k$(i, corrected.get_c1px32_k$(i).get_elevation_8fwyb8_k$());
               }
                while (inductionVariable_0 < last);
-            out.q1s();
+            out.computeDerivedData_uoxpeo_k$();
             return out;
           case 2:
-            throw this.k6_1;
+            throw this.exception_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.i6_1 === 2) {
+        if (this.exceptionState_1 === 2) {
           throw e;
         } else {
-          this.h6_1 = this.i6_1;
-          this.k6_1 = e;
+          this.state_1 = this.exceptionState_1;
+          this.exception_1 = e;
         }
       }
      while (true);
   };
   function ElevationStep() {
-    this.r1u_1 = 150.0;
+    this.DEFAULT_SMOOTH_WINDOW_M_1 = 150.0;
   }
-  protoOf(ElevationStep).s1u = function (source, provider, $completion) {
+  protoOf(ElevationStep).fixElevation_nhpf8r_k$ = function (source, provider, $completion) {
     var tmp = new $fixElevationCOROUTINE$(this, source, provider, $completion);
-    tmp.j6_1 = Unit_instance;
-    tmp.k6_1 = null;
-    return tmp.p6();
+    tmp.result_1 = Unit_instance;
+    tmp.exception_1 = null;
+    return tmp.doResume_5yljmg_k$();
   };
-  protoOf(ElevationStep).t1u = function (source, windowM) {
-    if (source.f1r_1 === 0)
+  protoOf(ElevationStep).smoothElevation_ahln31_k$ = function (source, windowM) {
+    if (source.size_1 === 0)
       return new Path(0);
     // Inline function 'kotlin.collections.List' call
     // Inline function 'kotlin.collections.MutableList' call
-    var size = source.f1r_1;
+    var size = source.size_1;
     var list = ArrayList_init_$Create$_0(size);
     // Inline function 'kotlin.repeat' call
     var inductionVariable = 0;
@@ -2440,229 +2443,229 @@
       do {
         var index = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var tmp$ret$4 = source.u1u(index);
-        list.h(tmp$ret$4);
+        var tmp$ret$4 = source.coordinatesElevationAt_ru19z1_k$(index);
+        list.add_utx5q5_k$(tmp$ret$4);
       }
        while (inductionVariable < size);
     var coords = list;
-    var smoothed = ElevationSmoother_instance.nw(coords, windowM);
+    var smoothed = ElevationSmoother_instance.smooth_j2mgq7_k$(coords, windowM);
     var out = copyAllSlots(this, source);
     var inductionVariable_0 = 0;
-    var last = out.f1r_1;
+    var last = out.size_1;
     if (inductionVariable_0 < last)
       do {
         var i = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        out.b1s(i, smoothed.m(i).ww());
+        out.setElevation_pv2zuv_k$(i, smoothed.get_c1px32_k$(i).get_elevation_8fwyb8_k$());
       }
        while (inductionVariable_0 < last);
-    out.q1s();
+    out.computeDerivedData_uoxpeo_k$();
     return out;
   };
-  protoOf(ElevationStep).v1u = function (source, windowM, $super) {
+  protoOf(ElevationStep).smoothElevation$default_3c035p_k$ = function (source, windowM, $super) {
     windowM = windowM === VOID ? 150.0 : windowM;
-    return $super === VOID ? this.t1u(source, windowM) : $super.t1u.call(this, source, windowM);
+    return $super === VOID ? this.smoothElevation_ahln31_k$(source, windowM) : $super.smoothElevation_ahln31_k$.call(this, source, windowM);
   };
   var ElevationStep_instance;
   function ElevationStep_getInstance() {
     return ElevationStep_instance;
   }
   function GeneratedPath(size) {
-    this.f1r_1 = size;
+    this.size_1 = size;
     // Inline function 'kotlin.require' call
-    if (!(this.f1r_1 >= 0)) {
-      var message = 'Negative size: ' + this.f1r_1;
+    if (!(this.size_1 >= 0)) {
+      var message = 'Negative size: ' + this.size_1;
       throw IllegalArgumentException_init_$Create$_0(toString_0(message));
     }
-    this.g1r_1 = new Float64Array(imul(this.f1r_1, 36));
+    this.data_1 = new Float64Array(imul(this.size_1, 36));
   }
-  protoOf(GeneratedPath).y1t = function (i, field) {
-    return this.g1r_1[imul(i, 36) + field.o1_1 | 0];
+  protoOf(GeneratedPath).get_z3le6l_k$ = function (i, field) {
+    return this.data_1[imul(i, 36) + field.ordinal_1 | 0];
   };
-  protoOf(GeneratedPath).f1u = function (i, field, v) {
-    this.g1r_1[imul(i, 36) + field.o1_1 | 0] = v;
+  protoOf(GeneratedPath).set_b3ze83_k$ = function (i, field, v) {
+    this.data_1[imul(i, 36) + field.ordinal_1 | 0] = v;
   };
-  protoOf(GeneratedPath).h1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 0 | 0];
+  protoOf(GeneratedPath).latitude_gb4iok_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 0 | 0];
   };
-  protoOf(GeneratedPath).z1r = function (i, v) {
-    this.g1r_1[imul(i, 36) + 0 | 0] = v;
+  protoOf(GeneratedPath).setLatitude_skkzf0_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 0 | 0] = v;
   };
-  protoOf(GeneratedPath).i1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 1 | 0];
+  protoOf(GeneratedPath).longitude_a9xl_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 1 | 0];
   };
-  protoOf(GeneratedPath).a1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 1 | 0] = v;
+  protoOf(GeneratedPath).setLongitude_k0bc8l_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 1 | 0] = v;
   };
-  protoOf(GeneratedPath).w1u = function (i) {
-    return this.g1r_1[imul(i, 36) + 2 | 0];
+  protoOf(GeneratedPath).distance_5s4s77_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 2 | 0];
   };
-  protoOf(GeneratedPath).x1u = function (i, v) {
-    this.g1r_1[imul(i, 36) + 2 | 0] = v;
+  protoOf(GeneratedPath).setDistance_d14hwr_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 2 | 0] = v;
   };
-  protoOf(GeneratedPath).y1u = function (i, v) {
-    this.g1r_1[imul(i, 36) + 3 | 0] = v;
+  protoOf(GeneratedPath).setDx_uk0ky4_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 3 | 0] = v;
   };
-  protoOf(GeneratedPath).k1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 4 | 0];
+  protoOf(GeneratedPath).time_ryc845_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 4 | 0];
   };
-  protoOf(GeneratedPath).c1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 4 | 0] = v;
+  protoOf(GeneratedPath).setTime_rfmvcd_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 4 | 0] = v;
   };
-  protoOf(GeneratedPath).z1u = function (i) {
-    return this.g1r_1[imul(i, 36) + 5 | 0];
+  protoOf(GeneratedPath).elapsed_7307rw_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 5 | 0];
   };
-  protoOf(GeneratedPath).a1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 5 | 0] = v;
+  protoOf(GeneratedPath).setElapsed_916ug_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 5 | 0] = v;
   };
-  protoOf(GeneratedPath).b1v = function (i) {
-    return this.g1r_1[imul(i, 36) + 6 | 0];
+  protoOf(GeneratedPath).dt_17uzp4_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 6 | 0];
   };
-  protoOf(GeneratedPath).c1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 6 | 0] = v;
+  protoOf(GeneratedPath).setDt_sgarxs_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 6 | 0] = v;
   };
-  protoOf(GeneratedPath).d1v = function (i) {
-    return this.g1r_1[imul(i, 36) + 7 | 0];
+  protoOf(GeneratedPath).bearing_fz5vxm_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 7 | 0];
   };
-  protoOf(GeneratedPath).e1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 7 | 0] = v;
+  protoOf(GeneratedPath).setBearing_in05l6_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 7 | 0] = v;
   };
-  protoOf(GeneratedPath).j1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 8 | 0];
+  protoOf(GeneratedPath).elevation_iziwkb_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 8 | 0];
   };
-  protoOf(GeneratedPath).b1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 8 | 0] = v;
+  protoOf(GeneratedPath).setElevation_pv2zuv_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 8 | 0] = v;
   };
-  protoOf(GeneratedPath).f1v = function (i) {
-    return this.g1r_1[imul(i, 36) + 9 | 0];
+  protoOf(GeneratedPath).grade_c4yjz5_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 9 | 0];
   };
-  protoOf(GeneratedPath).g1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 9 | 0] = v;
+  protoOf(GeneratedPath).setGrade_3tur8z_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 9 | 0] = v;
   };
-  protoOf(GeneratedPath).h1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 10 | 0] = v;
+  protoOf(GeneratedPath).setRadius_p1cueq_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 10 | 0] = v;
   };
-  protoOf(GeneratedPath).i1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 11 | 0] = v;
+  protoOf(GeneratedPath).setAeroCoef_tmjifm_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 11 | 0] = v;
   };
-  protoOf(GeneratedPath).j1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 12 | 0] = v;
+  protoOf(GeneratedPath).setWindBearing_44dbry_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 12 | 0] = v;
   };
-  protoOf(GeneratedPath).k1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 13 | 0] = v;
+  protoOf(GeneratedPath).setWindAlpha_xkbtf2_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 13 | 0] = v;
   };
-  protoOf(GeneratedPath).l1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 14 | 0] = v;
+  protoOf(GeneratedPath).setPAero_mmc4mr_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 14 | 0] = v;
   };
-  protoOf(GeneratedPath).m1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 15 | 0] = v;
+  protoOf(GeneratedPath).setPGravity_tegtcu_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 15 | 0] = v;
   };
-  protoOf(GeneratedPath).n1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 16 | 0] = v;
+  protoOf(GeneratedPath).setPRollingResistance_h04uz6_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 16 | 0] = v;
   };
-  protoOf(GeneratedPath).o1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 17 | 0] = v;
+  protoOf(GeneratedPath).setPWheelBearings_djmhww_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 17 | 0] = v;
   };
-  protoOf(GeneratedPath).o1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 18 | 0];
+  protoOf(GeneratedPath).pInputPower_ybhudp_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 18 | 0];
   };
-  protoOf(GeneratedPath).d1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 18 | 0] = v;
+  protoOf(GeneratedPath).setPInputPower_i1beh_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 18 | 0] = v;
   };
-  protoOf(GeneratedPath).p1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 19 | 0] = v;
+  protoOf(GeneratedPath).setPCyclistProvidedOptimalPower_gha9up_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 19 | 0] = v;
   };
-  protoOf(GeneratedPath).q1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 20 | 0] = v;
+  protoOf(GeneratedPath).setPCyclistProvidedOptimalPowerWithHarmonics_tg3fol_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 20 | 0] = v;
   };
-  protoOf(GeneratedPath).r1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 21 | 0] = v;
+  protoOf(GeneratedPath).setPCyclistPowerNeeded_54po1x_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 21 | 0] = v;
   };
-  protoOf(GeneratedPath).s1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 22 | 0] = v;
+  protoOf(GeneratedPath).setPCyclistProvidedMuscular_aori9q_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 22 | 0] = v;
   };
-  protoOf(GeneratedPath).t1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 23 | 0] = v;
+  protoOf(GeneratedPath).setPCyclistProvidedWheel_ofsihz_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 23 | 0] = v;
   };
-  protoOf(GeneratedPath).u1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 24 | 0] = v;
+  protoOf(GeneratedPath).setPComputedTotalPower_wm6di_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 24 | 0] = v;
   };
-  protoOf(GeneratedPath).v1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 25 | 0] = v;
+  protoOf(GeneratedPath).setPComputedWheelPower_qplog3_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 25 | 0] = v;
   };
-  protoOf(GeneratedPath).p1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 26 | 0];
+  protoOf(GeneratedPath).pComputedPower_g6dnn4_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 26 | 0];
   };
-  protoOf(GeneratedPath).w1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 26 | 0] = v;
+  protoOf(GeneratedPath).setPComputedPower_c3m6yw_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 26 | 0] = v;
   };
-  protoOf(GeneratedPath).x1v = function (i) {
-    return this.g1r_1[imul(i, 36) + 27 | 0];
+  protoOf(GeneratedPath).speed_npav2n_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 27 | 0];
   };
-  protoOf(GeneratedPath).y1v = function (i, v) {
-    this.g1r_1[imul(i, 36) + 27 | 0] = v;
+  protoOf(GeneratedPath).setSpeed_1slan1_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 27 | 0] = v;
   };
-  protoOf(GeneratedPath).z1v = function (i) {
-    return this.g1r_1[imul(i, 36) + 28 | 0];
+  protoOf(GeneratedPath).speedMax_mjo2cl_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 28 | 0];
   };
-  protoOf(GeneratedPath).a1w = function (i, v) {
-    this.g1r_1[imul(i, 36) + 28 | 0] = v;
+  protoOf(GeneratedPath).setSpeedMax_7xvqir_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 28 | 0] = v;
   };
-  protoOf(GeneratedPath).b1w = function (i, v) {
-    this.g1r_1[imul(i, 36) + 29 | 0] = v;
+  protoOf(GeneratedPath).setSpeedMaxIncline_8l69w1_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 29 | 0] = v;
   };
-  protoOf(GeneratedPath).c1w = function (i, v) {
-    this.g1r_1[imul(i, 36) + 30 | 0] = v;
+  protoOf(GeneratedPath).setVirtSpeedCurrent_kvg8yv_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 30 | 0] = v;
   };
-  protoOf(GeneratedPath).n1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 31 | 0];
+  protoOf(GeneratedPath).temperature_6yw0ik_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 31 | 0];
   };
-  protoOf(GeneratedPath).g1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 31 | 0] = v;
+  protoOf(GeneratedPath).setTemperature_nno5xs_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 31 | 0] = v;
   };
-  protoOf(GeneratedPath).d1w = function (i, v) {
-    this.g1r_1[imul(i, 36) + 32 | 0] = v;
+  protoOf(GeneratedPath).setWindSpeed_ggaslh_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 32 | 0] = v;
   };
-  protoOf(GeneratedPath).e1w = function (i, v) {
-    this.g1r_1[imul(i, 36) + 33 | 0] = v;
+  protoOf(GeneratedPath).setWindDirection_86vnxv_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 33 | 0] = v;
   };
-  protoOf(GeneratedPath).l1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 34 | 0];
+  protoOf(GeneratedPath).heartRate_qiaqfm_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 34 | 0];
   };
-  protoOf(GeneratedPath).e1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 34 | 0] = v;
+  protoOf(GeneratedPath).setHeartRate_3mzzq6_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 34 | 0] = v;
   };
-  protoOf(GeneratedPath).m1r = function (i) {
-    return this.g1r_1[imul(i, 36) + 35 | 0];
+  protoOf(GeneratedPath).cadence_h3r7af_k$ = function (i) {
+    return this.data_1[imul(i, 36) + 35 | 0];
   };
-  protoOf(GeneratedPath).f1s = function (i, v) {
-    this.g1r_1[imul(i, 36) + 35 | 0] = v;
+  protoOf(GeneratedPath).setCadence_ick7df_k$ = function (i, v) {
+    this.data_1[imul(i, 36) + 35 | 0] = v;
   };
   function Companion_0() {
-    Companion_instance_0 = this;
-    this.f1w_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
+    Companion_instance_1 = this;
+    this.EMPTY_1 = new BoundsRad(0.0, 0.0, 0.0, 0.0);
   }
-  var Companion_instance_0;
+  var Companion_instance_1;
   function Companion_getInstance_1() {
-    if (Companion_instance_0 == null)
+    if (Companion_instance_1 == null)
       new Companion_0();
-    return Companion_instance_0;
+    return Companion_instance_1;
   }
   function BoundsRad(minLat, maxLat, minLon, maxLon) {
     Companion_getInstance_1();
-    this.g1w_1 = minLat;
-    this.h1w_1 = maxLat;
-    this.i1w_1 = minLon;
-    this.j1w_1 = maxLon;
+    this.minLat_1 = minLat;
+    this.maxLat_1 = maxLat;
+    this.minLon_1 = minLon;
+    this.maxLon_1 = maxLon;
   }
   protoOf(BoundsRad).toString = function () {
-    return 'BoundsRad(minLat=' + this.g1w_1 + ', maxLat=' + this.h1w_1 + ', minLon=' + this.i1w_1 + ', maxLon=' + this.j1w_1 + ')';
+    return 'BoundsRad(minLat=' + this.minLat_1 + ', maxLat=' + this.maxLat_1 + ', minLon=' + this.minLon_1 + ', maxLon=' + this.maxLon_1 + ')';
   };
   protoOf(BoundsRad).hashCode = function () {
-    var result = getNumberHashCode(this.g1w_1);
-    result = imul(result, 31) + getNumberHashCode(this.h1w_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i1w_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.j1w_1) | 0;
+    var result = getNumberHashCode(this.minLat_1);
+    result = imul(result, 31) + getNumberHashCode(this.maxLat_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.minLon_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.maxLon_1) | 0;
     return result;
   };
   protoOf(BoundsRad).equals = function (other) {
@@ -2670,39 +2673,39 @@
       return true;
     if (!(other instanceof BoundsRad))
       return false;
-    if (!equals(this.g1w_1, other.g1w_1))
+    if (!equals(this.minLat_1, other.minLat_1))
       return false;
-    if (!equals(this.h1w_1, other.h1w_1))
+    if (!equals(this.maxLat_1, other.maxLat_1))
       return false;
-    if (!equals(this.i1w_1, other.i1w_1))
+    if (!equals(this.minLon_1, other.minLon_1))
       return false;
-    if (!equals(this.j1w_1, other.j1w_1))
+    if (!equals(this.maxLon_1, other.maxLon_1))
       return false;
     return true;
   };
   function copyStatsFrom($this, other) {
-    $this.j1s_1 = other.j1s_1;
-    $this.k1s_1 = other.k1s_1;
-    $this.l1s_1 = other.l1s_1;
-    $this.m1s_1 = other.m1s_1;
-    $this.n1s_1 = other.n1s_1;
-    $this.o1s_1 = other.o1s_1;
-    $this.p1s_1 = other.p1s_1;
+    $this.totalDistance_1 = other.totalDistance_1;
+    $this.minElevation_1 = other.minElevation_1;
+    $this.maxElevation_1 = other.maxElevation_1;
+    $this.elevationGain_1 = other.elevationGain_1;
+    $this.elevationLoss_1 = other.elevationLoss_1;
+    $this.durationMs_1 = other.durationMs_1;
+    $this.boundsRad_1 = other.boundsRad_1;
   }
   function resetStats($this) {
-    $this.j1s_1 = 0.0;
-    $this.k1s_1 = 0.0;
-    $this.l1s_1 = 0.0;
-    $this.m1s_1 = 0.0;
-    $this.n1s_1 = 0.0;
-    $this.o1s_1 = 0.0;
-    $this.p1s_1 = Companion_getInstance_1().f1w_1;
+    $this.totalDistance_1 = 0.0;
+    $this.minElevation_1 = 0.0;
+    $this.maxElevation_1 = 0.0;
+    $this.elevationGain_1 = 0.0;
+    $this.elevationLoss_1 = 0.0;
+    $this.durationMs_1 = 0.0;
+    $this.boundsRad_1 = Companion_getInstance_1().EMPTY_1;
   }
   function computeBearing($this, from, to) {
-    var lat1 = $this.h1r(from);
-    var lon1 = $this.i1r(from);
-    var lat2 = $this.h1r(to);
-    var lon2 = $this.i1r(to);
+    var lat1 = $this.latitude_gb4iok_k$(from);
+    var lon1 = $this.longitude_a9xl_k$(from);
+    var lat2 = $this.latitude_gb4iok_k$(to);
+    var lon2 = $this.longitude_a9xl_k$(to);
     // Inline function 'kotlin.math.cos' call
     var x1 = lon1 * Math.cos(lat1);
     var y1 = lat1;
@@ -2717,38 +2720,38 @@
   }
   function Companion_1() {
   }
-  var Companion_instance_1;
+  var Companion_instance_2;
   function Companion_getInstance_2() {
-    return Companion_instance_1;
+    return Companion_instance_2;
   }
   function Path(size) {
     GeneratedPath.call(this, size);
-    this.j1s_1 = 0.0;
-    this.k1s_1 = 0.0;
-    this.l1s_1 = 0.0;
-    this.m1s_1 = 0.0;
-    this.n1s_1 = 0.0;
-    this.o1s_1 = 0.0;
-    this.p1s_1 = Companion_getInstance_1().f1w_1;
-  }
-  protoOf(Path).k1w = function () {
-    return until(0, this.f1r_1);
-  };
-  protoOf(Path).l1w = function (i) {
-    return this.h1r(i) * 57.29577951308232;
-  };
-  protoOf(Path).m1w = function (i) {
-    return this.i1r(i) * 57.29577951308232;
-  };
-  protoOf(Path).u1u = function (i) {
-    return new LatLonElevation(this.l1w(i), this.m1w(i), this.j1r(i));
-  };
-  protoOf(Path).n1w = function () {
-    var out = new Path(this.f1r_1);
-    var tmp0 = this.g1r_1;
-    var tmp2 = out.g1r_1;
+    this.totalDistance_1 = 0.0;
+    this.minElevation_1 = 0.0;
+    this.maxElevation_1 = 0.0;
+    this.elevationGain_1 = 0.0;
+    this.elevationLoss_1 = 0.0;
+    this.durationMs_1 = 0.0;
+    this.boundsRad_1 = Companion_getInstance_1().EMPTY_1;
+  }
+  protoOf(Path).get_indices_xelk8u_k$ = function () {
+    return until(0, this.size_1);
+  };
+  protoOf(Path).latitudeDeg_i25sm6_k$ = function (i) {
+    return this.latitude_gb4iok_k$(i) * 57.29577951308232;
+  };
+  protoOf(Path).longitudeDeg_ikk1un_k$ = function (i) {
+    return this.longitude_a9xl_k$(i) * 57.29577951308232;
+  };
+  protoOf(Path).coordinatesElevationAt_ru19z1_k$ = function (i) {
+    return new LatLonElevation(this.latitudeDeg_i25sm6_k$(i), this.longitudeDeg_ikk1un_k$(i), this.elevation_iziwkb_k$(i));
+  };
+  protoOf(Path).copy_1tks5_k$ = function () {
+    var out = new Path(this.size_1);
+    var tmp0 = this.data_1;
+    var tmp2 = out.data_1;
     // Inline function 'kotlin.collections.copyInto' call
-    var endIndex = this.g1r_1.length;
+    var endIndex = this.data_1.length;
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
     var tmp = tmp0;
@@ -2758,11 +2761,11 @@
     copyStatsFrom(out, this);
     return out;
   };
-  protoOf(Path).q1s = function () {
+  protoOf(Path).computeDerivedData_uoxpeo_k$ = function () {
     resetStats(this);
-    if (this.f1r_1 === 0)
+    if (this.size_1 === 0)
       return Unit_instance;
-    var timeStart = this.k1r(0);
+    var timeStart = this.time_ryc845_k$(0);
     var cumDist = 0.0;
     var minLat = Infinity;
     var maxLat = -Infinity;
@@ -2773,14 +2776,14 @@
     var gain = 0.0;
     var loss = 0.0;
     var inductionVariable = 0;
-    var last = this.f1r_1;
+    var last = this.size_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var lat = this.h1r(i);
-        var lon = this.i1r(i);
-        var ele = this.j1r(i);
+        var lat = this.latitude_gb4iok_k$(i);
+        var lon = this.longitude_a9xl_k$(i);
+        var ele = this.elevation_iziwkb_k$(i);
         // Inline function 'kotlin.math.min' call
         var a = minLat;
         minLat = Math.min(a, lat);
@@ -2800,109 +2803,155 @@
         var a_4 = maxEle;
         maxEle = Math.max(a_4, ele);
         if (i > 0) {
-          var prevCoord = new LatLon(this.l1w(i - 1 | 0), this.m1w(i - 1 | 0));
-          var curCoord = new LatLon(this.l1w(i), this.m1w(i));
-          cumDist = cumDist + Distance_instance.rw(prevCoord, curCoord);
-          var dEle = ele - this.j1r(i - 1 | 0);
+          var prevCoord = new LatLon(this.latitudeDeg_i25sm6_k$(i - 1 | 0), this.longitudeDeg_ikk1un_k$(i - 1 | 0));
+          var curCoord = new LatLon(this.latitudeDeg_i25sm6_k$(i), this.longitudeDeg_ikk1un_k$(i));
+          cumDist = cumDist + Distance_instance.haversine_mrx4ab_k$(prevCoord, curCoord);
+          var dEle = ele - this.elevation_iziwkb_k$(i - 1 | 0);
           if (dEle > 0)
             gain = gain + dEle;
           else
             loss = loss + dEle;
         }
-        this.x1u(i, cumDist);
+        this.setDistance_d14hwr_k$(i, cumDist);
       }
        while (inductionVariable < last);
-    this.j1s_1 = cumDist;
-    this.k1s_1 = minEle === Infinity ? 0.0 : minEle;
-    this.l1s_1 = maxEle === -Infinity ? 0.0 : maxEle;
-    this.m1s_1 = gain;
-    this.n1s_1 = loss;
-    this.p1s_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
-    this.o1s_1 = this.f1r_1 >= 2 ? this.k1r(this.f1r_1 - 1 | 0) - timeStart : 0.0;
+    this.totalDistance_1 = cumDist;
+    this.minElevation_1 = minEle === Infinity ? 0.0 : minEle;
+    this.maxElevation_1 = maxEle === -Infinity ? 0.0 : maxEle;
+    this.elevationGain_1 = gain;
+    this.elevationLoss_1 = loss;
+    this.boundsRad_1 = new BoundsRad(minLat, maxLat, minLon, maxLon);
+    this.durationMs_1 = this.size_1 >= 2 ? this.time_ryc845_k$(this.size_1 - 1 | 0) - timeStart : 0.0;
     var inductionVariable_0 = 0;
-    var last_0 = this.f1r_1;
+    var last_0 = this.size_1;
     if (inductionVariable_0 < last_0)
       $l$loop: do {
         var i_0 = inductionVariable_0;
         inductionVariable_0 = inductionVariable_0 + 1 | 0;
-        this.a1v(i_0, (this.k1r(i_0) - timeStart) / 1000.0);
-        if (this.f1r_1 <= 1)
+        this.setElapsed_916ug_k$(i_0, (this.time_ryc845_k$(i_0) - timeStart) / 1000.0);
+        if (this.size_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.f1r_1 - 1 | 0;
+        var tmp0 = this.size_1 - 1 | 0;
         // Inline function 'kotlin.math.min' call
         var b_0 = i_0 + 1 | 0;
         var ip1 = Math.min(tmp0, b_0);
-        this.e1v(i_0, computeBearing(this, im1, ip1));
-        var dDist = (this.w1u(ip1) - this.w1u(im1)) / 2.0;
-        var dEle_0 = (this.j1r(ip1) - this.j1r(im1)) / 2.0;
+        this.setBearing_in05l6_k$(i_0, computeBearing(this, im1, ip1));
+        var dDist = (this.distance_5s4s77_k$(ip1) - this.distance_5s4s77_k$(im1)) / 2.0;
+        var dEle_0 = (this.elevation_iziwkb_k$(ip1) - this.elevation_iziwkb_k$(im1)) / 2.0;
         var grade = dDist === 0.0 ? 0.0 : dEle_0 / dDist;
-        this.g1v(i_0, grade);
-        var dTime = (this.k1r(ip1) - this.k1r(im1)) / 2000.0;
-        this.y1u(i_0, dDist);
-        this.c1v(i_0, dTime);
-        this.y1v(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
+        this.setGrade_3tur8z_k$(i_0, grade);
+        var dTime = (this.time_ryc845_k$(ip1) - this.time_ryc845_k$(im1)) / 2000.0;
+        this.setDx_uk0ky4_k$(i_0, dDist);
+        this.setDt_sgarxs_k$(i_0, dTime);
+        this.setSpeed_1slan1_k$(i_0, dTime === 0.0 ? 0.0 : dDist / dTime);
       }
        while (inductionVariable_0 < last_0);
   };
   function PathSimplifier() {
   }
-  protoOf(PathSimplifier).o1w = function (path, toleranceM, zExaggeration) {
-    if (path.f1r_1 <= 2)
-      return path.n1w();
-    var coords = ArrayList_init_$Create$_0(path.f1r_1);
+  protoOf(PathSimplifier).simplify_gxhj7b_k$ = function (path, toleranceM, zExaggeration) {
+    if (path.size_1 <= 2)
+      return path.copy_1tks5_k$();
+    var coords = ArrayList_init_$Create$_0(path.size_1);
     var inductionVariable = 0;
-    var last = path.f1r_1;
+    var last = path.size_1;
     if (inductionVariable < last)
       do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
         // Inline function 'kotlin.collections.plusAssign' call
-        var element = new LatLonElevation(path.h1r(i) * 57.29577951308232, path.i1r(i) * 57.29577951308232, path.j1r(i));
-        coords.h(element);
+        var element = new LatLonElevation(path.latitude_gb4iok_k$(i) * 57.29577951308232, path.longitude_a9xl_k$(i) * 57.29577951308232, path.elevation_iziwkb_k$(i));
+        coords.add_utx5q5_k$(element);
       }
        while (inductionVariable < last);
-    var simplified = DouglasPeucker_instance.ow(coords, toleranceM, zExaggeration);
-    var retainedIndices = ArrayList_init_$Create$_0(simplified.l());
+    var simplified = DouglasPeucker_instance.simplify_o1pnyo_k$(coords, toleranceM, zExaggeration);
+    var retainedIndices = ArrayList_init_$Create$_0(simplified.get_size_woubt6_k$());
     var cursor = 0;
-    var _iterator__ex2g4s = simplified.i();
-    while (_iterator__ex2g4s.j()) {
-      var kept = _iterator__ex2g4s.k();
-      while (cursor < coords.l() && !(coords.m(cursor) === kept)) {
+    var _iterator__ex2g4s = simplified.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var kept = _iterator__ex2g4s.next_20eer_k$();
+      while (cursor < coords.get_size_woubt6_k$() && !(coords.get_c1px32_k$(cursor) === kept)) {
         cursor = cursor + 1 | 0;
       }
-      if (cursor === coords.l()) {
+      if (cursor === coords.get_size_woubt6_k$()) {
         // Inline function 'kotlin.error' call
         var message = 'PathSimplifier: retained point not found in source';
         throw IllegalStateException_init_$Create$(toString_0(message));
       }
       // Inline function 'kotlin.collections.plusAssign' call
       var element_0 = cursor;
-      retainedIndices.h(element_0);
+      retainedIndices.add_utx5q5_k$(element_0);
       cursor = cursor + 1 | 0;
     }
-    var out = new Path(retainedIndices.l());
-    var iterator = retainedIndices.i();
+    var out = new Path(retainedIndices.get_size_woubt6_k$());
+    var iterator = retainedIndices.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var dstIdx = index;
       index = index + 1 | 0;
-      var srcIdx = iterator.k();
-      var _iterator__ex2g4s_0 = get_entries_0().i();
-      while (_iterator__ex2g4s_0.j()) {
-        var field = _iterator__ex2g4s_0.k();
-        out.f1u(dstIdx, field, path.y1t(srcIdx, field));
+      var srcIdx = iterator.next_20eer_k$();
+      var _iterator__ex2g4s_0 = get_entries_0().iterator_jk1svi_k$();
+      while (_iterator__ex2g4s_0.hasNext_bitz1p_k$()) {
+        var field = _iterator__ex2g4s_0.next_20eer_k$();
+        out.set_b3ze83_k$(dstIdx, field, path.get_z3le6l_k$(srcIdx, field));
       }
     }
-    out.q1s();
+    out.computeDerivedData_uoxpeo_k$();
     return out;
   };
   var PathSimplifier_instance;
   function PathSimplifier_getInstance() {
     return PathSimplifier_instance;
   }
+  var static_init_called_1;
+  function static_init_1() {
+    if (static_init_called_1)
+      return Unit_instance;
+    static_init_called_1 = true;
+    PointField_LATITUDE_instance = new PointField('LATITUDE', 0, 'latitude', 'radians', 'Latitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
+    PointField_LONGITUDE_instance = new PointField('LONGITUDE', 1, 'longitude', 'radians', 'Longitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
+    PointField_DISTANCE_instance = new PointField('DISTANCE', 2, 'distance', 'meters', 'Distance (meters)', PointFieldCategory_COORDINATES_getInstance());
+    PointField_DX_instance = new PointField('DX', 3, 'dx', 'meters', 'dx (meters)', PointFieldCategory_COORDINATES_getInstance());
+    PointField_TIME_instance = new PointField('TIME', 4, 'time', 'ms', 'Timestamp (ms since epoch)', PointFieldCategory_TEMPORAL_getInstance(), true);
+    PointField_ELAPSED_instance = new PointField('ELAPSED', 5, 'elapsed', 'ms', 'Elapsed duration (ms)', PointFieldCategory_TEMPORAL_getInstance());
+    PointField_DT_instance = new PointField('DT', 6, 'dt', 'ms', 'dt (ms)', PointFieldCategory_TEMPORAL_getInstance());
+    PointField_BEARING_instance = new PointField('BEARING', 7, 'bearing', 'radians', 'Direction bearing (radians)', PointFieldCategory_ANGLES_getInstance(), VOID, true);
+    PointField_ELEVATION_instance = new PointField('ELEVATION', 8, 'elevation', 'meters', 'Elevation (meters)', PointFieldCategory_ELEVATION_getInstance());
+    PointField_GRADE_instance = new PointField('GRADE', 9, 'grade', '%', 'Road grade/slope (%)', PointFieldCategory_GRADE_getInstance());
+    PointField_RADIUS_instance = new PointField('RADIUS', 10, 'radius', 'meters', 'Turn radius (meters)', PointFieldCategory_RADIUS_getInstance());
+    PointField_AERO_COEF_instance = new PointField('AERO_COEF', 11, 'aeroCoef', 'aero', 'Aerodynamic coefficient', PointFieldCategory_AERO_COEF_getInstance());
+    PointField_WIND_BEARING_instance = new PointField('WIND_BEARING', 12, 'windBearing', 'radians', 'Wind bearing (radians)', PointFieldCategory_CYCLIST_WIND_getInstance(), VOID, true);
+    PointField_WIND_ALPHA_instance = new PointField('WIND_ALPHA', 13, 'windAlpha', 'radians', 'Wind angle (radians)', PointFieldCategory_CYCLIST_WIND_getInstance(), VOID, true);
+    PointField_P_AERO_instance = new PointField('P_AERO', 14, 'pAero', 'watts', 'Aerodynamic power', PointFieldCategory_POWER_PHYSICS_getInstance());
+    PointField_P_GRAVITY_instance = new PointField('P_GRAVITY', 15, 'pGravity', 'watts', 'Gravitational power', PointFieldCategory_POWER_PHYSICS_getInstance());
+    PointField_P_ROLLING_RESISTANCE_instance = new PointField('P_ROLLING_RESISTANCE', 16, 'pRollingResistance', 'watts', 'Rolling resistance power', PointFieldCategory_POWER_PHYSICS_getInstance());
+    PointField_P_WHEEL_BEARINGS_instance = new PointField('P_WHEEL_BEARINGS', 17, 'pWheelBearings', 'watts', 'Wheel bearings power', PointFieldCategory_POWER_PHYSICS_getInstance());
+    PointField_P_INPUT_POWER_instance = new PointField('P_INPUT_POWER', 18, 'pInputPower', 'watts', 'GPX input power', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_instance = new PointField('P_CYCLIST_PROVIDED_OPTIMAL_POWER', 19, 'pCyclistProvidedOptimalPower', 'watts', 'Optimal power', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_instance = new PointField('P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS', 20, 'pCyclistProvidedOptimalPowerWithHarmonics', 'watts', 'Optimal power with harmonics', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_instance = new PointField('P_CYCLIST_PROVIDED_POWER_NEEDED', 21, 'pCyclistPowerNeeded', 'watts', 'Power needed', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_CYCLIST_PROVIDED_MUSCULAR_instance = new PointField('P_CYCLIST_PROVIDED_MUSCULAR', 22, 'pCyclistProvidedMuscular', 'watts', 'Raw cyclist power', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_CYCLIST_PROVIDED_WHEEL_instance = new PointField('P_CYCLIST_PROVIDED_WHEEL', 23, 'pCyclistProvidedWheel', 'watts', 'Cyclist power transmitted to ground', PointFieldCategory_POWER_CYCLIST_getInstance());
+    PointField_P_COMPUTED_TOTAL_POWER_instance = new PointField('P_COMPUTED_TOTAL_POWER', 24, 'pComputedTotalPower', 'watts', 'Power from kinetic energy change', PointFieldCategory_POWER_POST_getInstance());
+    PointField_P_COMPUTED_WHEEL_POWER_instance = new PointField('P_COMPUTED_WHEEL_POWER', 25, 'pComputedWheelPower', 'watts', 'Wheel power from kinetic energy change', PointFieldCategory_POWER_POST_getInstance());
+    PointField_POWER_instance = new PointField('POWER', 26, 'pComputedPower', 'watts', 'Total power (watts)', PointFieldCategory_POWER_POST_getInstance());
+    PointField_SPEED_instance = new PointField('SPEED', 27, 'speed', 'm/s', 'Current speed (m/s)', PointFieldCategory_SPEED_getInstance());
+    PointField_SPEED_MAX_instance = new PointField('SPEED_MAX', 28, 'speedMax', 'm/s', 'Maximum speed (m/s)', PointFieldCategory_SPEED_getInstance());
+    PointField_SPEED_MAX_INCLINE_instance = new PointField('SPEED_MAX_INCLINE', 29, 'speedMaxIncline', 'm/s', 'Max speed on incline (m/s)', PointFieldCategory_SPEED_getInstance());
+    PointField_VIRT_SPEED_CURRENT_instance = new PointField('VIRT_SPEED_CURRENT', 30, 'virtSpeedCurrent', 'm/s', 'Virtual current speed (m/s)', PointFieldCategory_SPEED_getInstance());
+    PointField_TEMPERATURE_instance = new PointField('TEMPERATURE', 31, 'temperature', 'celsius', 'Temperature (celsius)', PointFieldCategory_ENVIRONMENTAL_getInstance());
+    PointField_WIND_SPEED_instance = new PointField('WIND_SPEED', 32, 'windSpeed', 'm/s', 'Wind speed (m/s)', PointFieldCategory_ENVIRONMENTAL_getInstance());
+    PointField_WIND_DIRECTION_instance = new PointField('WIND_DIRECTION', 33, 'windDirection', 'radians', 'Wind direction (radians)', PointFieldCategory_ENVIRONMENTAL_getInstance(), VOID, true);
+    PointField_HEART_RATE_instance = new PointField('HEART_RATE', 34, 'heartRate', 'bpm', 'Heart rate (bpm)', PointFieldCategory_PHYSIOLOGICAL_getInstance());
+    PointField_CADENCE_instance = new PointField('CADENCE', 35, 'cadence', 'rpm', 'Pedaling cadence (rpm)', PointFieldCategory_PHYSIOLOGICAL_getInstance());
+    if (Companion_instance_3 == null) {
+      Companion_instance;
+      new Companion_2();
+    }
+  }
   var PointField_LATITUDE_instance;
   var PointField_LONGITUDE_instance;
   var PointField_DISTANCE_instance;
@@ -2940,258 +2989,201 @@
   var PointField_HEART_RATE_instance;
   var PointField_CADENCE_instance;
   function Companion_2() {
-    Companion_instance_2 = this;
-    this.p1w_1 = 36;
+    Companion_instance_3 = this;
+    this.COUNT_1 = 36;
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
     var this_0 = get_entries_0();
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination = LinkedHashMap_init_$Create$(capacity);
-    var _iterator__ex2g4s = this_0.i();
-    while (_iterator__ex2g4s.j()) {
-      var element = _iterator__ex2g4s.k();
-      var tmp$ret$2 = element.m1t_1;
-      destination.c3(tmp$ret$2, element);
+    var _iterator__ex2g4s = this_0.iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var element = _iterator__ex2g4s.next_20eer_k$();
+      var tmp$ret$2 = element.prop_1;
+      destination.put_4fpzoq_k$(tmp$ret$2, element);
     }
-    tmp.q1w_1 = destination;
+    tmp.byPropMap_1 = destination;
   }
-  protoOf(Companion_2).r1w = function (prop) {
-    return this.q1w_1.k1(prop);
+  protoOf(Companion_2).byProp_kdf1eo_k$ = function (prop) {
+    return this.byPropMap_1.get_wei43m_k$(prop);
   };
-  var Companion_instance_2;
+  var Companion_instance_3;
   function Companion_getInstance_3() {
-    PointField_initEntries();
-    if (Companion_instance_2 == null)
-      new Companion_2();
-    return Companion_instance_2;
+    static_init_1();
+    return Companion_instance_3;
   }
   function values_0() {
+    static_init_1();
     return [PointField_LATITUDE_getInstance(), PointField_LONGITUDE_getInstance(), PointField_DISTANCE_getInstance(), PointField_DX_getInstance(), PointField_TIME_getInstance(), PointField_ELAPSED_getInstance(), PointField_DT_getInstance(), PointField_BEARING_getInstance(), PointField_ELEVATION_getInstance(), PointField_GRADE_getInstance(), PointField_RADIUS_getInstance(), PointField_AERO_COEF_getInstance(), PointField_WIND_BEARING_getInstance(), PointField_WIND_ALPHA_getInstance(), PointField_P_AERO_getInstance(), PointField_P_GRAVITY_getInstance(), PointField_P_ROLLING_RESISTANCE_getInstance(), PointField_P_WHEEL_BEARINGS_getInstance(), PointField_P_INPUT_POWER_getInstance(), PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_getInstance(), PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_getInstance(), PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_getInstance(), PointField_P_CYCLIST_PROVIDED_MUSCULAR_getInstance(), PointField_P_CYCLIST_PROVIDED_WHEEL_getInstance(), PointField_P_COMPUTED_TOTAL_POWER_getInstance(), PointField_P_COMPUTED_WHEEL_POWER_getInstance(), PointField_POWER_getInstance(), PointField_SPEED_getInstance(), PointField_SPEED_MAX_getInstance(), PointField_SPEED_MAX_INCLINE_getInstance(), PointField_VIRT_SPEED_CURRENT_getInstance(), PointField_TEMPERATURE_getInstance(), PointField_WIND_SPEED_getInstance(), PointField_WIND_DIRECTION_getInstance(), PointField_HEART_RATE_getInstance(), PointField_CADENCE_getInstance()];
   }
   function get_entries_0() {
+    static_init_1();
     if ($ENTRIES_0 == null)
       $ENTRIES_0 = enumEntries(values_0());
     return $ENTRIES_0;
   }
-  var PointField_entriesInitialized;
-  function PointField_initEntries() {
-    if (PointField_entriesInitialized)
-      return Unit_instance;
-    PointField_entriesInitialized = true;
-    PointField_LATITUDE_instance = new PointField('LATITUDE', 0, 'latitude', 'radians', 'Latitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
-    PointField_LONGITUDE_instance = new PointField('LONGITUDE', 1, 'longitude', 'radians', 'Longitude (radians)', PointFieldCategory_COORDINATES_getInstance(), true, true);
-    PointField_DISTANCE_instance = new PointField('DISTANCE', 2, 'distance', 'meters', 'Distance (meters)', PointFieldCategory_COORDINATES_getInstance());
-    PointField_DX_instance = new PointField('DX', 3, 'dx', 'meters', 'dx (meters)', PointFieldCategory_COORDINATES_getInstance());
-    PointField_TIME_instance = new PointField('TIME', 4, 'time', 'ms', 'Timestamp (ms since epoch)', PointFieldCategory_TEMPORAL_getInstance(), true);
-    PointField_ELAPSED_instance = new PointField('ELAPSED', 5, 'elapsed', 'ms', 'Elapsed duration (ms)', PointFieldCategory_TEMPORAL_getInstance());
-    PointField_DT_instance = new PointField('DT', 6, 'dt', 'ms', 'dt (ms)', PointFieldCategory_TEMPORAL_getInstance());
-    PointField_BEARING_instance = new PointField('BEARING', 7, 'bearing', 'radians', 'Direction bearing (radians)', PointFieldCategory_ANGLES_getInstance(), VOID, true);
-    PointField_ELEVATION_instance = new PointField('ELEVATION', 8, 'elevation', 'meters', 'Elevation (meters)', PointFieldCategory_ELEVATION_getInstance());
-    PointField_GRADE_instance = new PointField('GRADE', 9, 'grade', '%', 'Road grade/slope (%)', PointFieldCategory_GRADE_getInstance());
-    PointField_RADIUS_instance = new PointField('RADIUS', 10, 'radius', 'meters', 'Turn radius (meters)', PointFieldCategory_RADIUS_getInstance());
-    PointField_AERO_COEF_instance = new PointField('AERO_COEF', 11, 'aeroCoef', 'aero', 'Aerodynamic coefficient', PointFieldCategory_AERO_COEF_getInstance());
-    PointField_WIND_BEARING_instance = new PointField('WIND_BEARING', 12, 'windBearing', 'radians', 'Wind bearing (radians)', PointFieldCategory_CYCLIST_WIND_getInstance(), VOID, true);
-    PointField_WIND_ALPHA_instance = new PointField('WIND_ALPHA', 13, 'windAlpha', 'radians', 'Wind angle (radians)', PointFieldCategory_CYCLIST_WIND_getInstance(), VOID, true);
-    PointField_P_AERO_instance = new PointField('P_AERO', 14, 'pAero', 'watts', 'Aerodynamic power', PointFieldCategory_POWER_PHYSICS_getInstance());
-    PointField_P_GRAVITY_instance = new PointField('P_GRAVITY', 15, 'pGravity', 'watts', 'Gravitational power', PointFieldCategory_POWER_PHYSICS_getInstance());
-    PointField_P_ROLLING_RESISTANCE_instance = new PointField('P_ROLLING_RESISTANCE', 16, 'pRollingResistance', 'watts', 'Rolling resistance power', PointFieldCategory_POWER_PHYSICS_getInstance());
-    PointField_P_WHEEL_BEARINGS_instance = new PointField('P_WHEEL_BEARINGS', 17, 'pWheelBearings', 'watts', 'Wheel bearings power', PointFieldCategory_POWER_PHYSICS_getInstance());
-    PointField_P_INPUT_POWER_instance = new PointField('P_INPUT_POWER', 18, 'pInputPower', 'watts', 'GPX input power', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_instance = new PointField('P_CYCLIST_PROVIDED_OPTIMAL_POWER', 19, 'pCyclistProvidedOptimalPower', 'watts', 'Optimal power', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_instance = new PointField('P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS', 20, 'pCyclistProvidedOptimalPowerWithHarmonics', 'watts', 'Optimal power with harmonics', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_instance = new PointField('P_CYCLIST_PROVIDED_POWER_NEEDED', 21, 'pCyclistPowerNeeded', 'watts', 'Power needed', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_CYCLIST_PROVIDED_MUSCULAR_instance = new PointField('P_CYCLIST_PROVIDED_MUSCULAR', 22, 'pCyclistProvidedMuscular', 'watts', 'Raw cyclist power', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_CYCLIST_PROVIDED_WHEEL_instance = new PointField('P_CYCLIST_PROVIDED_WHEEL', 23, 'pCyclistProvidedWheel', 'watts', 'Cyclist power transmitted to ground', PointFieldCategory_POWER_CYCLIST_getInstance());
-    PointField_P_COMPUTED_TOTAL_POWER_instance = new PointField('P_COMPUTED_TOTAL_POWER', 24, 'pComputedTotalPower', 'watts', 'Power from kinetic energy change', PointFieldCategory_POWER_POST_getInstance());
-    PointField_P_COMPUTED_WHEEL_POWER_instance = new PointField('P_COMPUTED_WHEEL_POWER', 25, 'pComputedWheelPower', 'watts', 'Wheel power from kinetic energy change', PointFieldCategory_POWER_POST_getInstance());
-    PointField_POWER_instance = new PointField('POWER', 26, 'pComputedPower', 'watts', 'Total power (watts)', PointFieldCategory_POWER_POST_getInstance());
-    PointField_SPEED_instance = new PointField('SPEED', 27, 'speed', 'm/s', 'Current speed (m/s)', PointFieldCategory_SPEED_getInstance());
-    PointField_SPEED_MAX_instance = new PointField('SPEED_MAX', 28, 'speedMax', 'm/s', 'Maximum speed (m/s)', PointFieldCategory_SPEED_getInstance());
-    PointField_SPEED_MAX_INCLINE_instance = new PointField('SPEED_MAX_INCLINE', 29, 'speedMaxIncline', 'm/s', 'Max speed on incline (m/s)', PointFieldCategory_SPEED_getInstance());
-    PointField_VIRT_SPEED_CURRENT_instance = new PointField('VIRT_SPEED_CURRENT', 30, 'virtSpeedCurrent', 'm/s', 'Virtual current speed (m/s)', PointFieldCategory_SPEED_getInstance());
-    PointField_TEMPERATURE_instance = new PointField('TEMPERATURE', 31, 'temperature', 'celsius', 'Temperature (celsius)', PointFieldCategory_ENVIRONMENTAL_getInstance());
-    PointField_WIND_SPEED_instance = new PointField('WIND_SPEED', 32, 'windSpeed', 'm/s', 'Wind speed (m/s)', PointFieldCategory_ENVIRONMENTAL_getInstance());
-    PointField_WIND_DIRECTION_instance = new PointField('WIND_DIRECTION', 33, 'windDirection', 'radians', 'Wind direction (radians)', PointFieldCategory_ENVIRONMENTAL_getInstance(), VOID, true);
-    PointField_HEART_RATE_instance = new PointField('HEART_RATE', 34, 'heartRate', 'bpm', 'Heart rate (bpm)', PointFieldCategory_PHYSIOLOGICAL_getInstance());
-    PointField_CADENCE_instance = new PointField('CADENCE', 35, 'cadence', 'rpm', 'Pedaling cadence (rpm)', PointFieldCategory_PHYSIOLOGICAL_getInstance());
-    Companion_getInstance_3();
-  }
   var $ENTRIES_0;
   function PointField(name, ordinal, prop, unit, shortDescription, category, notSelectable, anglesInRadians) {
     notSelectable = notSelectable === VOID ? false : notSelectable;
     anglesInRadians = anglesInRadians === VOID ? false : anglesInRadians;
     Enum.call(this, name, ordinal);
-    this.m1t_1 = prop;
-    this.n1t_1 = unit;
-    this.o1t_1 = shortDescription;
-    this.p1t_1 = category;
-    this.q1t_1 = notSelectable;
-    this.r1t_1 = anglesInRadians;
+    this.prop_1 = prop;
+    this.unit_1 = unit;
+    this.shortDescription_1 = shortDescription;
+    this.category_1 = category;
+    this.notSelectable_1 = notSelectable;
+    this.anglesInRadians_1 = anglesInRadians;
   }
   function PointField_LATITUDE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_LATITUDE_instance;
   }
   function PointField_LONGITUDE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_LONGITUDE_instance;
   }
   function PointField_DISTANCE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_DISTANCE_instance;
   }
   function PointField_DX_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_DX_instance;
   }
   function PointField_TIME_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_TIME_instance;
   }
   function PointField_ELAPSED_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_ELAPSED_instance;
   }
   function PointField_DT_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_DT_instance;
   }
   function PointField_BEARING_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_BEARING_instance;
   }
   function PointField_ELEVATION_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_ELEVATION_instance;
   }
   function PointField_GRADE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_GRADE_instance;
   }
   function PointField_RADIUS_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_RADIUS_instance;
   }
   function PointField_AERO_COEF_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_AERO_COEF_instance;
   }
   function PointField_WIND_BEARING_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_WIND_BEARING_instance;
   }
   function PointField_WIND_ALPHA_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_WIND_ALPHA_instance;
   }
   function PointField_P_AERO_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_AERO_instance;
   }
   function PointField_P_GRAVITY_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_GRAVITY_instance;
   }
   function PointField_P_ROLLING_RESISTANCE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_ROLLING_RESISTANCE_instance;
   }
   function PointField_P_WHEEL_BEARINGS_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_WHEEL_BEARINGS_instance;
   }
   function PointField_P_INPUT_POWER_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_INPUT_POWER_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_CYCLIST_PROVIDED_OPTIMAL_POWER_HARMONICS_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_CYCLIST_PROVIDED_POWER_NEEDED_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_MUSCULAR_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_CYCLIST_PROVIDED_MUSCULAR_instance;
   }
   function PointField_P_CYCLIST_PROVIDED_WHEEL_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_CYCLIST_PROVIDED_WHEEL_instance;
   }
   function PointField_P_COMPUTED_TOTAL_POWER_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_COMPUTED_TOTAL_POWER_instance;
   }
   function PointField_P_COMPUTED_WHEEL_POWER_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_P_COMPUTED_WHEEL_POWER_instance;
   }
   function PointField_POWER_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_POWER_instance;
   }
   function PointField_SPEED_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_SPEED_instance;
   }
   function PointField_SPEED_MAX_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_SPEED_MAX_instance;
   }
   function PointField_SPEED_MAX_INCLINE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_SPEED_MAX_INCLINE_instance;
   }
   function PointField_VIRT_SPEED_CURRENT_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_VIRT_SPEED_CURRENT_instance;
   }
   function PointField_TEMPERATURE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_TEMPERATURE_instance;
   }
   function PointField_WIND_SPEED_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_WIND_SPEED_instance;
   }
   function PointField_WIND_DIRECTION_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_WIND_DIRECTION_instance;
   }
   function PointField_HEART_RATE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_HEART_RATE_instance;
   }
   function PointField_CADENCE_getInstance() {
-    PointField_initEntries();
+    static_init_1();
     return PointField_CADENCE_instance;
   }
-  var PointFieldCategory_COORDINATES_instance;
-  var PointFieldCategory_TEMPORAL_instance;
-  var PointFieldCategory_ANGLES_instance;
-  var PointFieldCategory_ELEVATION_instance;
-  var PointFieldCategory_GRADE_instance;
-  var PointFieldCategory_RADIUS_instance;
-  var PointFieldCategory_AERO_COEF_instance;
-  var PointFieldCategory_CYCLIST_WIND_instance;
-  var PointFieldCategory_POWER_PHYSICS_instance;
-  var PointFieldCategory_POWER_CYCLIST_instance;
-  var PointFieldCategory_POWER_POST_instance;
-  var PointFieldCategory_SPEED_instance;
-  var PointFieldCategory_ENVIRONMENTAL_instance;
-  var PointFieldCategory_PHYSIOLOGICAL_instance;
-  var PointFieldCategory_entriesInitialized;
-  function PointFieldCategory_initEntries() {
-    if (PointFieldCategory_entriesInitialized)
+  var static_init_called_2;
+  function static_init_2() {
+    if (static_init_called_2)
       return Unit_instance;
-    PointFieldCategory_entriesInitialized = true;
+    static_init_called_2 = true;
     PointFieldCategory_COORDINATES_instance = new PointFieldCategory('COORDINATES', 0, 'coordinates', 'Coordinates');
     PointFieldCategory_TEMPORAL_instance = new PointFieldCategory('TEMPORAL', 1, 'temporal', 'Temporal');
     PointFieldCategory_ANGLES_instance = new PointFieldCategory('ANGLES', 2, 'angles', 'Angles');
@@ -3207,97 +3199,111 @@
     PointFieldCategory_ENVIRONMENTAL_instance = new PointFieldCategory('ENVIRONMENTAL', 12, 'environmental', 'Environmental');
     PointFieldCategory_PHYSIOLOGICAL_instance = new PointFieldCategory('PHYSIOLOGICAL', 13, 'physiological', 'Physiological');
   }
+  var PointFieldCategory_COORDINATES_instance;
+  var PointFieldCategory_TEMPORAL_instance;
+  var PointFieldCategory_ANGLES_instance;
+  var PointFieldCategory_ELEVATION_instance;
+  var PointFieldCategory_GRADE_instance;
+  var PointFieldCategory_RADIUS_instance;
+  var PointFieldCategory_AERO_COEF_instance;
+  var PointFieldCategory_CYCLIST_WIND_instance;
+  var PointFieldCategory_POWER_PHYSICS_instance;
+  var PointFieldCategory_POWER_CYCLIST_instance;
+  var PointFieldCategory_POWER_POST_instance;
+  var PointFieldCategory_SPEED_instance;
+  var PointFieldCategory_ENVIRONMENTAL_instance;
+  var PointFieldCategory_PHYSIOLOGICAL_instance;
   function PointFieldCategory(name, ordinal, id, displayName) {
     Enum.call(this, name, ordinal);
-    this.u1w_1 = id;
-    this.v1w_1 = displayName;
+    this.id_1 = id;
+    this.displayName_1 = displayName;
   }
   function PointFieldCategory_COORDINATES_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_COORDINATES_instance;
   }
   function PointFieldCategory_TEMPORAL_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_TEMPORAL_instance;
   }
   function PointFieldCategory_ANGLES_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_ANGLES_instance;
   }
   function PointFieldCategory_ELEVATION_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_ELEVATION_instance;
   }
   function PointFieldCategory_GRADE_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_GRADE_instance;
   }
   function PointFieldCategory_RADIUS_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_RADIUS_instance;
   }
   function PointFieldCategory_AERO_COEF_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_AERO_COEF_instance;
   }
   function PointFieldCategory_CYCLIST_WIND_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_CYCLIST_WIND_instance;
   }
   function PointFieldCategory_POWER_PHYSICS_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_POWER_PHYSICS_instance;
   }
   function PointFieldCategory_POWER_CYCLIST_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_POWER_CYCLIST_instance;
   }
   function PointFieldCategory_POWER_POST_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_POWER_POST_instance;
   }
   function PointFieldCategory_SPEED_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_SPEED_instance;
   }
   function PointFieldCategory_ENVIRONMENTAL_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_ENVIRONMENTAL_instance;
   }
   function PointFieldCategory_PHYSIOLOGICAL_getInstance() {
-    PointFieldCategory_initEntries();
+    static_init_2();
     return PointFieldCategory_PHYSIOLOGICAL_instance;
   }
   function Copy(sourceIndex) {
-    this.w1w_1 = sourceIndex;
+    this.sourceIndex_1 = sourceIndex;
   }
   protoOf(Copy).toString = function () {
-    return 'Copy(sourceIndex=' + this.w1w_1 + ')';
+    return 'Copy(sourceIndex=' + this.sourceIndex_1 + ')';
   };
   protoOf(Copy).hashCode = function () {
-    return this.w1w_1;
+    return this.sourceIndex_1;
   };
   protoOf(Copy).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy))
       return false;
-    if (!(this.w1w_1 === other.w1w_1))
+    if (!(this.sourceIndex_1 === other.sourceIndex_1))
       return false;
     return true;
   };
   function Interpolate(from, to, coef) {
-    this.x1w_1 = from;
-    this.y1w_1 = to;
-    this.z1w_1 = coef;
+    this.from_1 = from;
+    this.to_1 = to;
+    this.coef_1 = coef;
   }
   protoOf(Interpolate).toString = function () {
-    return 'Interpolate(from=' + this.x1w_1 + ', to=' + this.y1w_1 + ', coef=' + this.z1w_1 + ')';
+    return 'Interpolate(from=' + this.from_1 + ', to=' + this.to_1 + ', coef=' + this.coef_1 + ')';
   };
   protoOf(Interpolate).hashCode = function () {
-    var result = this.x1w_1;
-    result = imul(result, 31) + this.y1w_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.z1w_1) | 0;
+    var result = this.from_1;
+    result = imul(result, 31) + this.to_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.coef_1) | 0;
     return result;
   };
   protoOf(Interpolate).equals = function (other) {
@@ -3305,35 +3311,35 @@
       return true;
     if (!(other instanceof Interpolate))
       return false;
-    if (!(this.x1w_1 === other.x1w_1))
+    if (!(this.from_1 === other.from_1))
       return false;
-    if (!(this.y1w_1 === other.y1w_1))
+    if (!(this.to_1 === other.to_1))
       return false;
-    if (!equals(this.z1w_1, other.z1w_1))
+    if (!equals(this.coef_1, other.coef_1))
       return false;
     return true;
   };
   function buildPlan($this, source, minDistanceM, maxDistanceM) {
-    var n = source.f1r_1;
+    var n = source.size_1;
     var plan = ArrayList_init_$Create$_0(n);
     // Inline function 'kotlin.collections.plusAssign' call
     var element = new Copy(0);
-    plan.h(element);
-    var lastAddedDistance = source.w1u(0);
+    plan.add_utx5q5_k$(element);
+    var lastAddedDistance = source.distance_5s4s77_k$(0);
     var lastAddedIndex = 0;
     var inductionVariable = 1;
     if (inductionVariable < n)
       $l$loop: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var curDist = source.w1u(i);
+        var curDist = source.distance_5s4s77_k$(i);
         var gap = curDist - lastAddedDistance;
         if (gap < minDistanceM)
           continue $l$loop;
         else if (gap <= maxDistanceM) {
           // Inline function 'kotlin.collections.plusAssign' call
           var element_0 = new Copy(i);
-          plan.h(element_0);
+          plan.add_utx5q5_k$(element_0);
           lastAddedDistance = curDist;
           lastAddedIndex = i;
         } else {
@@ -3349,20 +3355,20 @@
               var j = inductionVariable_0;
               inductionVariable_0 = inductionVariable_0 + 1 | 0;
               var targetDistance = lastAddedDistance + j * spacing;
-              while (index1 < (i - 1 | 0) && source.w1u(index1 + 1 | 0) < targetDistance) {
+              while (index1 < (i - 1 | 0) && source.distance_5s4s77_k$(index1 + 1 | 0) < targetDistance) {
                 index1 = index1 + 1 | 0;
               }
-              var dist1 = source.w1u(index1);
-              var dist2 = source.w1u(index1 + 1 | 0);
+              var dist1 = source.distance_5s4s77_k$(index1);
+              var dist2 = source.distance_5s4s77_k$(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);
-              plan.h(element_1);
+              plan.add_utx5q5_k$(element_1);
             }
              while (inductionVariable_0 < numSegments);
           // Inline function 'kotlin.collections.plusAssign' call
           var element_2 = new Copy(i);
-          plan.h(element_2);
+          plan.add_utx5q5_k$(element_2);
           lastAddedDistance = curDist;
           lastAddedIndex = i;
         }
@@ -3371,60 +3377,60 @@
     return plan;
   }
   function materialize($this, source, plan) {
-    var out = new Path(plan.l());
-    var iterator = plan.i();
+    var out = new Path(plan.get_size_woubt6_k$());
+    var iterator = plan.iterator_jk1svi_k$();
     var index = 0;
-    while (iterator.j()) {
+    while (iterator.hasNext_bitz1p_k$()) {
       var dstIdx = index;
       index = index + 1 | 0;
-      var op = iterator.k();
+      var op = iterator.next_20eer_k$();
       if (op instanceof Copy) {
-        copyFields($this, source, op.w1w_1, out, dstIdx);
+        copyFields($this, source, op.sourceIndex_1, out, dstIdx);
       } else {
         if (op instanceof Interpolate) {
-          interpolateFields($this, source, op.x1w_1, op.y1w_1, op.z1w_1, out, dstIdx);
+          interpolateFields($this, source, op.from_1, op.to_1, op.coef_1, out, dstIdx);
         } else {
           noWhenBranchMatchedException();
         }
       }
     }
-    out.q1s();
+    out.computeDerivedData_uoxpeo_k$();
     return out;
   }
   function copyFields($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_0().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      dst.f1u(dstIdx, field, src.y1t(srcIdx, field));
+    var _iterator__ex2g4s = get_entries_0().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var field = _iterator__ex2g4s.next_20eer_k$();
+      dst.set_b3ze83_k$(dstIdx, field, src.get_z3le6l_k$(srcIdx, field));
     }
   }
   function interpolateFields($this, src, i1, i2, coef, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_0().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      var v1 = src.y1t(i1, field);
-      var v2 = src.y1t(i2, field);
+    var _iterator__ex2g4s = get_entries_0().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var field = _iterator__ex2g4s.next_20eer_k$();
+      var v1 = src.get_z3le6l_k$(i1, field);
+      var v2 = src.get_z3le6l_k$(i2, field);
       var v = isNaN_0(v1) || isNaN_0(v2) ? NaN : v1 + (v2 - v1) * coef;
-      dst.f1u(dstIdx, field, v);
+      dst.set_b3ze83_k$(dstIdx, field, v);
     }
   }
   function PointPerDistance() {
   }
-  protoOf(PointPerDistance).a1x = function (source, minDistanceM, maxDistanceM) {
-    return this.b1x(source, minDistanceM, maxDistanceM);
+  protoOf(PointPerDistance).compute_7vlifv_k$ = function (source, minDistanceM, maxDistanceM) {
+    return this.computeOnePointPerDistance_q378hr_k$(source, minDistanceM, maxDistanceM);
   };
-  protoOf(PointPerDistance).b1x = function (source, minDistanceM, maxDistanceM) {
+  protoOf(PointPerDistance).computeOnePointPerDistance_q378hr_k$ = 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.f1r_1 === 0)
+    if (source.size_1 === 0)
       return new Path(0);
-    if (source.f1r_1 === 1) {
+    if (source.size_1 === 1) {
       var out = new Path(1);
       copyFields(this, source, 0, out, 0);
-      out.q1s();
+      out.computeDerivedData_uoxpeo_k$();
       return out;
     }
     var plan = buildPlan(this, source, minDistanceM, maxDistanceM);
@@ -3435,35 +3441,35 @@
     return PointPerDistance_instance;
   }
   function Copy_0(sourceIndex) {
-    this.c1x_1 = sourceIndex;
+    this.sourceIndex_1 = sourceIndex;
   }
   protoOf(Copy_0).toString = function () {
-    return 'Copy(sourceIndex=' + this.c1x_1 + ')';
+    return 'Copy(sourceIndex=' + this.sourceIndex_1 + ')';
   };
   protoOf(Copy_0).hashCode = function () {
-    return this.c1x_1;
+    return this.sourceIndex_1;
   };
   protoOf(Copy_0).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof Copy_0))
       return false;
-    if (!(this.c1x_1 === other.c1x_1))
+    if (!(this.sourceIndex_1 === other.sourceIndex_1))
       return false;
     return true;
   };
   function Interpolate_0(from, to, coef) {
-    this.d1x_1 = from;
-    this.e1x_1 = to;
-    this.f1x_1 = coef;
+    this.from_1 = from;
+    this.to_1 = to;
+    this.coef_1 = coef;
   }
   protoOf(Interpolate_0).toString = function () {
-    return 'Interpolate(from=' + this.d1x_1 + ', to=' + this.e1x_1 + ', coef=' + this.f1x_1 + ')';
+    return 'Interpolate(from=' + this.from_1 + ', to=' + this.to_1 + ', coef=' + this.coef_1 + ')';
   };
   protoOf(Interpolate_0).hashCode = function () {
-    var result = this.d1x_1;
-    result = imul(result, 31) + this.e1x_1 | 0;
-    result = imul(result, 31) + getNumberHashCode(this.f1x_1) | 0;
+    var result = this.from_1;
+    result = imul(result, 31) + this.to_1 | 0;
+    result = imul(result, 31) + getNumberHashCode(this.coef_1) | 0;
     return result;
   };
   protoOf(Interpolate_0).equals = function (other) {
@@ -3471,23 +3477,23 @@
       return true;
     if (!(other instanceof Interpolate_0))
       return false;
-    if (!(this.d1x_1 === other.d1x_1))
+    if (!(this.from_1 === other.from_1))
       return false;
-    if (!(this.e1x_1 === other.e1x_1))
+    if (!(this.to_1 === other.to_1))
       return false;
-    if (!equals(this.f1x_1, other.f1x_1))
+    if (!equals(this.coef_1, other.coef_1))
       return false;
     return true;
   };
   function buildPlan_0($this, source) {
     var plan = LinkedHashMap_init_$Create$_0();
-    var n = source.f1r_1;
+    var n = source.size_1;
     var inductionVariable = 0;
     if (inductionVariable < n)
       $l$loop_0: do {
         var i = inductionVariable;
         inductionVariable = inductionVariable + 1 | 0;
-        var time1 = source.k1r(i);
+        var time1 = source.time_ryc845_k$(i);
         // Inline function 'kotlin.math.floor' call
         var x = time1 / 1000.0;
         var tmp$ret$0 = Math.floor(x);
@@ -3496,18 +3502,18 @@
         if (i === 0 && !equalsLong(msInSec1, new Long(0, 0))) {
           // Inline function 'kotlin.collections.set' call
           var value = new Copy_0(i);
-          plan.c3(epoch1, value);
+          plan.put_4fpzoq_k$(epoch1, value);
         }
         if (i === (n - 1 | 0)) {
           if (!equalsLong(msInSec1, new Long(0, 0))) {
             var tmp2 = add(epoch1, new Long(1, 0));
             // Inline function 'kotlin.collections.set' call
             var value_0 = new Copy_0(i);
-            plan.c3(tmp2, value_0);
+            plan.put_4fpzoq_k$(tmp2, value_0);
           }
           continue $l$loop_0;
         }
-        var time2 = source.k1r(i + 1 | 0);
+        var time2 = source.time_ryc845_k$(i + 1 | 0);
         // Inline function 'kotlin.math.floor' call
         var x_0 = time2 / 1000.0;
         var tmp$ret$3 = Math.floor(x_0);
@@ -3526,7 +3532,7 @@
           var tmp2_0 = e;
           // Inline function 'kotlin.collections.set' call
           var value_1 = new Interpolate_0(i, i + 1 | 0, coef);
-          plan.c3(tmp2_0, value_1);
+          plan.put_4fpzoq_k$(tmp2_0, value_1);
           var _unary__edvuaz = e;
           e = add(_unary__edvuaz, get_ONE());
         }
@@ -3535,15 +3541,15 @@
     return plan;
   }
   function materialize_0($this, source, plan) {
-    var sortedEpochs = sorted(plan.l1());
-    var out = new Path(sortedEpochs.l());
-    var iterator = sortedEpochs.i();
+    var sortedEpochs = sorted(plan.get_keys_wop4xp_k$());
+    var out = new Path(sortedEpochs.get_size_woubt6_k$());
+    var iterator = sortedEpochs.iterator_jk1svi_k$();
     var index = 0;
-    $l$loop: while (iterator.j()) {
+    $l$loop: while (iterator.hasNext_bitz1p_k$()) {
       var idx = index;
       index = index + 1 | 0;
-      var epoch = iterator.k();
-      var tmp0_elvis_lhs = plan.k1(epoch);
+      var epoch = iterator.next_20eer_k$();
+      var tmp0_elvis_lhs = plan.get_wei43m_k$(epoch);
       var tmp;
       if (tmp0_elvis_lhs == null) {
         continue $l$loop;
@@ -3552,40 +3558,40 @@
       }
       var data = tmp;
       if (data instanceof Copy_0) {
-        copyFields_0($this, source, data.c1x_1, out, idx);
+        copyFields_0($this, source, data.sourceIndex_1, out, idx);
       } else {
         if (data instanceof Interpolate_0) {
-          interpolateFields_0($this, source, data.d1x_1, data.e1x_1, data.f1x_1, out, idx);
+          interpolateFields_0($this, source, data.from_1, data.to_1, data.coef_1, out, idx);
         } else {
           noWhenBranchMatchedException();
         }
       }
-      out.c1s(idx, toNumber(multiply(epoch, new Long(1000, 0))));
+      out.setTime_rfmvcd_k$(idx, toNumber(multiply(epoch, new Long(1000, 0))));
     }
-    out.q1s();
+    out.computeDerivedData_uoxpeo_k$();
     return out;
   }
   function copyFields_0($this, src, srcIdx, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_0().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      dst.f1u(dstIdx, field, src.y1t(srcIdx, field));
+    var _iterator__ex2g4s = get_entries_0().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var field = _iterator__ex2g4s.next_20eer_k$();
+      dst.set_b3ze83_k$(dstIdx, field, src.get_z3le6l_k$(srcIdx, field));
     }
   }
   function interpolateFields_0($this, src, i1, i2, coef, dst, dstIdx) {
-    var _iterator__ex2g4s = get_entries_0().i();
-    while (_iterator__ex2g4s.j()) {
-      var field = _iterator__ex2g4s.k();
-      var v1 = src.y1t(i1, field);
-      var v2 = src.y1t(i2, field);
+    var _iterator__ex2g4s = get_entries_0().iterator_jk1svi_k$();
+    while (_iterator__ex2g4s.hasNext_bitz1p_k$()) {
+      var field = _iterator__ex2g4s.next_20eer_k$();
+      var v1 = src.get_z3le6l_k$(i1, field);
+      var v2 = src.get_z3le6l_k$(i2, field);
       var v = isNaN_0(v1) || isNaN_0(v2) ? NaN : v1 + (v2 - v1) * coef;
-      dst.f1u(dstIdx, field, v);
+      dst.set_b3ze83_k$(dstIdx, field, v);
     }
   }
   function PointPerSecond() {
   }
-  protoOf(PointPerSecond).g1x = function (source) {
-    if (source.f1r_1 === 0)
+  protoOf(PointPerSecond).computeOnePointPerSecond_7sah9a_k$ = function (source) {
+    if (source.size_1 === 0)
       return new Path(0);
     var plan = buildPlan_0(this, source);
     return materialize_0(this, source, plan);
@@ -3595,31 +3601,31 @@
     return PointPerSecond_instance;
   }
   //region block: init
-  Companion_instance = new Companion();
+  Companion_instance_0 = new Companion();
   GpxParser_instance = new GpxParser();
   GpxWriter_instance = new GpxWriter();
   CsvWriter_instance = new CsvWriter();
   JsonWriter_instance = new JsonWriter();
   ElevationStep_instance = new ElevationStep();
-  Companion_instance_1 = new Companion_1();
+  Companion_instance_2 = new Companion_1();
   PathSimplifier_instance = new PathSimplifier();
   PointPerDistance_instance = new PointPerDistance();
   PointPerSecond_instance = new PointPerSecond();
   //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};
-  _.$_$.a = GpxParser_instance;
-  _.$_$.b = GpxWriter_instance;
-  _.$_$.c = CsvWriter_instance;
-  _.$_$.d = JsonWriter_instance;
-  _.$_$.e = ElevationStep_instance;
-  _.$_$.f = PathSimplifier_instance;
-  _.$_$.g = Companion_getInstance_3;
-  _.$_$.h = PointPerDistance_instance;
-  _.$_$.i = PointPerSecond_instance;
-  _.$_$.j = GpxPathKind_ROUTE_getInstance;
-  _.$_$.k = GpxPathKind_TRACK_getInstance;
-  _.$_$.l = PointField_TEMPERATURE_getInstance;
+  _.$_$.a = GpxPathKind_ROUTE_getInstance;
+  _.$_$.b = GpxPathKind_TRACK_getInstance;
+  _.$_$.c = PointField_TEMPERATURE_getInstance;
+  _.$_$.d = GpxParser_instance;
+  _.$_$.e = GpxWriter_instance;
+  _.$_$.f = CsvWriter_instance;
+  _.$_$.g = JsonWriter_instance;
+  _.$_$.h = ElevationStep_instance;
+  _.$_$.i = PathSimplifier_instance;
+  _.$_$.j = Companion_getInstance_3;
+  _.$_$.k = PointPerDistance_instance;
+  _.$_$.l = PointPerSecond_instance;
   _.$_$.m = GpxWaypoint;
   _.$_$.n = firstTrackAsPath;
   _.$_$.o = segmentsAsPaths;