incyclist-services 1.7.49-beta → 1.7.50

package/lib/cjs/activities/active-rides/service.js

@@ -392,7 +392,7 @@ let ActiveRidesService = (() => {
                 return 'Anonymous';
             const names = ['Alex', 'Bart', 'Cosmas', 'Dirk', 'Ernesto', 'Frank', 'Guido', 'Hans', 'Irene', 'John', 'Kai', 'Lorenzo', 'Martin', 'Naijb', 'Oswaldo', 'Pete', 'Quentin', 'Rachel', 'Sophia', 'Trevor', 'Ute', 'Vivian', 'Wil', 'Xaver', 'Younes', 'Zoe'];
             const fnKey = id.charAt(0).toLowerCase();
-            const idx = !Number.isNaN(Number.parseInt(fnKey)) ? Number.parseInt(fnKey) : fnKey.charCodeAt(0) - 96;
+            const idx = !Number.isNaN(Number.parseInt(fnKey)) ? Number.parseInt(fnKey) : (fnKey.codePointAt(0) ?? 0) - 96;
             const lnKey = id.charAt(0).toUpperCase();
             const ln = !Number.isNaN(Number.parseInt(lnKey)) ? '' : lnKey;
             return `${names[idx]}${ln}`;

package/lib/cjs/activities/base/convert/converter.js

@@ -9,7 +9,7 @@ class ActivityConverter {
     static async convert(activity, format) {
         if (!ActivityConverter.factory) {
             ActivityConverter.factory = new factory_1.ActivityConverterFactory();
-            ActivityConverter.factory.add('fit', new fit_1.RemoteFitConverter());
+            ActivityConverter.factory.add('fit', new fit_1.LocalFitConverter());
             ActivityConverter.factory.add('tcx', new tcx_1.TcxConverter());
         }
         return await ActivityConverter.factory.convert(activity, format);

package/lib/cjs/activities/base/convert/fit/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./remote-fit"), exports);
+__exportStar(require("./local-fit"), exports);

package/lib/cjs/activities/base/convert/fit/local-fit.js

@@ -0,0 +1,208 @@
+"use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalFitConverter = void 0;
+const fitsdk_1 = require("@garmin/fitsdk");
+const gd_eventlog_1 = require("gd-eventlog");
+const settings_1 = require("../../../../settings");
+const decorators_1 = require("../../../../base/decorators");
+const DEG_TO_SEMICIRCLES = (2 ** 31) / 180;
+let LocalFitConverter = (() => {
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    return class LocalFitConverter {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _getUserSettings_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        logger = __runInitializers(this, _instanceExtraInitializers);
+        constructor() {
+            this.logger = new gd_eventlog_1.EventLogger('LocalFitExporter');
+        }
+        async convert(activity) {
+            try {
+                this.logger.logEvent({ message: 'convert start', format: 'FIT' });
+                const fitActivity = this.getFitActivity(activity);
+                const data = this.encode(fitActivity);
+                this.logger.logEvent({ message: 'convert success', format: 'FIT' });
+                return data;
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'convert result', format: 'FIT', result: 'error', reason: err.message });
+                throw err;
+            }
+        }
+        getFitActivity(activity) {
+            const { id, title, time, timeTotal, timePause, distance } = activity;
+            const status = 'created';
+            const startTime = new Date(activity.startTime).toISOString();
+            const logs = activity.logs.map(this.mapLogToFit.bind(this));
+            const screenshots = [];
+            const laps = this.mapLapsToFit(activity.laps ?? [], activity.startTime);
+            const user = {
+                id: this.getUserSettings().get('uuid', undefined),
+                weight: activity.user.weight
+            };
+            return { id, title, status, logs, laps, startTime, time, timeTotal, timePause, distance, user, screenshots };
+        }
+        mapLapsToFit(laps, activityStartTime) {
+            const activityStartMs = new Date(activityStartTime).getTime();
+            return laps.map((lap, i) => {
+                const prevDistance = i > 0 ? laps[i - 1].distance : 0;
+                return {
+                    lapNo: lap.num,
+                    startTime: new Date(lap.startTime).toISOString(),
+                    stopTime: new Date(lap.startTime + lap.rideTime * 1000).toISOString(),
+                    lapDistance: lap.distance - prevDistance,
+                    totalDistance: lap.distance,
+                    lapTime: lap.rideTime,
+                    totalTime: (lap.startTime - activityStartMs) / 1000 + lap.rideTime,
+                };
+            });
+        }
+        mapLogToFit(log) {
+            const { time, speed, slope, cadence: cadenceOrg, heartrate: heartrateOrg, distance, power: powerOrg, lat, lng, elevation } = log;
+            const cadence = Math.round(cadenceOrg);
+            const heartrate = Math.round(heartrateOrg);
+            const power = Math.round(powerOrg);
+            return { time, speed, slope, cadence, heartrate, distance, power, lat, lon: lng, elevation };
+        }
+        encode(activity) {
+            const encoder = new fitsdk_1.Encoder();
+            const startTime = new Date(activity.startTime);
+            encoder.onMesg(fitsdk_1.Profile.MesgNum.FILE_ID, {
+                type: 'activity',
+                manufacturer: 'development',
+                product: 0,
+                timeCreated: startTime,
+            });
+            encoder.onMesg(fitsdk_1.Profile.MesgNum.EVENT, {
+                timestamp: startTime,
+                event: 'timer',
+                eventType: 'start',
+                data: 0,
+            });
+            let lastTimestampMs = startTime.getTime();
+            activity.logs.forEach((log) => {
+                if (log.time != null) {
+                    lastTimestampMs = startTime.getTime() + log.time * 1000;
+                }
+                const record = {
+                    timestamp: new Date(lastTimestampMs),
+                };
+                if (log.lat != null && log.lon != null) {
+                    record.positionLat = Math.round(log.lat * DEG_TO_SEMICIRCLES);
+                    record.positionLong = Math.round(log.lon * DEG_TO_SEMICIRCLES);
+                }
+                if (log.elevation != null)
+                    record.altitude = log.elevation;
+                if (log.heartrate != null)
+                    record.heartRate = log.heartrate;
+                if (log.cadence != null)
+                    record.cadence = log.cadence;
+                if (log.distance != null)
+                    record.distance = log.distance;
+                if (log.speed != null)
+                    record.speed = log.speed / 3.6;
+                if (log.power != null)
+                    record.power = log.power;
+                if (log.slope != null)
+                    record.grade = log.slope;
+                encoder.onMesg(fitsdk_1.Profile.MesgNum.RECORD, record);
+            });
+            const endTime = new Date(lastTimestampMs);
+            encoder.onMesg(fitsdk_1.Profile.MesgNum.EVENT, {
+                timestamp: endTime,
+                event: 'timer',
+                eventType: 'stopAll',
+                data: 0,
+            });
+            if (activity.laps.length > 0) {
+                activity.laps.forEach(lap => {
+                    const lapStart = new Date(lap.startTime);
+                    const lapEnd = new Date(lap.stopTime);
+                    encoder.onMesg(fitsdk_1.Profile.MesgNum.LAP, {
+                        timestamp: lapEnd,
+                        startTime: lapStart,
+                        totalElapsedTime: lap.lapTime,
+                        totalTimerTime: lap.lapTime,
+                        totalDistance: lap.lapDistance,
+                        event: 'lap',
+                        eventType: 'stop',
+                    });
+                });
+            }
+            else {
+                encoder.onMesg(fitsdk_1.Profile.MesgNum.LAP, {
+                    timestamp: endTime,
+                    startTime,
+                    totalElapsedTime: activity.timeTotal,
+                    totalTimerTime: activity.time,
+                    totalDistance: activity.distance,
+                    event: 'lap',
+                    eventType: 'stop',
+                });
+            }
+            encoder.onMesg(fitsdk_1.Profile.MesgNum.SESSION, {
+                timestamp: endTime,
+                startTime,
+                totalElapsedTime: activity.timeTotal,
+                totalTimerTime: activity.time,
+                totalDistance: activity.distance,
+                sport: 'cycling',
+                subSport: 'virtualActivity',
+                event: 'session',
+                eventType: 'stopDisableAll',
+            });
+            encoder.onMesg(fitsdk_1.Profile.MesgNum.ACTIVITY, {
+                timestamp: endTime,
+                totalTimerTime: activity.time,
+                numSessions: 1,
+                type: 'manual',
+                event: 'activity',
+                eventType: 'stop',
+            });
+            const uint8Array = encoder.close();
+            return uint8Array.buffer;
+        }
+        getUserSettings() {
+            return (0, settings_1.useUserSettings)();
+        }
+    };
+})();
+exports.LocalFitConverter = LocalFitConverter;

package/lib/cjs/ride/route/RLVDisplayService.js

@@ -278,7 +278,7 @@ let RLVDisplayService = (() => {
         getUIText(input) {
             let text = input;
             if (text?.length) {
-                text = text.replace(/\\n/g, '<br>');
+                text = text.replaceAll('\\n', '<br>');
             }
             return text;
         }

package/lib/cjs/routes/base/parsers/utils.js

@@ -61,7 +61,7 @@ class BinaryReader {
             const c = part.readUInt16LE(i * 2);
             if (c === 0)
                 return str;
-            str += String.fromCharCode(c);
+            str += String.fromCodePoint(c);
             i++;
         }
         return str;

package/lib/cjs/utils/formatting.js

@@ -6,7 +6,7 @@ const formatDateTime = (date, fstr = '%Y%m%d%H%M%S', utc = false) => {
     if (!(0, valid_1.valid)(date) || !(date instanceof Date))
         return;
     const prefix = utc ? 'getUTC' : 'get';
-    return fstr.replace(/%[YmdHMS]/g, (m) => {
+    return fstr.replaceAll(/%[YmdHMS]/g, (m) => {
         switch (m) {
             case '%Y': return date[prefix + 'FullYear']();
             case '%m':

package/lib/cjs/utils/geo.js

@@ -17,7 +17,8 @@ const calculateDistance = (lat1, lon1, lat2, lon2, radius = rEarth * 1000) => {
     return distance;
 };
 exports.calculateDistance = calculateDistance;
-const distanceBetween = (p1, p2, props = { abs: true, latLng: true }) => {
+const DEFAULT_DISTANCE_PROPS = { abs: true, latLng: true };
+const distanceBetween = (p1, p2, props = DEFAULT_DISTANCE_PROPS) => {
     if (p1 === undefined)
         return 0;
     let dist;

package/lib/cjs/utils/xml.js

@@ -17,7 +17,7 @@ const removeUTFBom = (str) => {
     if (!str || typeof (str) !== 'string') {
         return str;
     }
-    while (str.charCodeAt(0) === 0 || str.charCodeAt(0) === 0xFEFF || str.charCodeAt(0) === 0xFFFD)
+    while (str.codePointAt(0) === 0 || str.codePointAt(0) === 0xFEFF || str.codePointAt(0) === 0xFFFD)
         str = str.substring(1);
     return str;
 };

package/lib/cjs/workouts/base/parsers/zwo/zwo.js

@@ -216,7 +216,7 @@ class ZwoParser {
             let tag;
             parser.parseString(data, (err, result) => {
                 if (err) {
-                    err.message = 'File contains error(s): ' + err.message.replace(/\n/g, ' ');
+                    err.message = 'File contains error(s): ' + err.message.replaceAll('\n', ' ');
                     this.logger.logEvent({ message: 'error', fn: 'parse()', error: err.message, stack: err.stack });
                     return reject(err);
                 }

package/lib/esm/activities/active-rides/service.js

@@ -389,7 +389,7 @@ let ActiveRidesService = (() => {
                 return 'Anonymous';
             const names = ['Alex', 'Bart', 'Cosmas', 'Dirk', 'Ernesto', 'Frank', 'Guido', 'Hans', 'Irene', 'John', 'Kai', 'Lorenzo', 'Martin', 'Naijb', 'Oswaldo', 'Pete', 'Quentin', 'Rachel', 'Sophia', 'Trevor', 'Ute', 'Vivian', 'Wil', 'Xaver', 'Younes', 'Zoe'];
             const fnKey = id.charAt(0).toLowerCase();
-            const idx = !Number.isNaN(Number.parseInt(fnKey)) ? Number.parseInt(fnKey) : fnKey.charCodeAt(0) - 96;
+            const idx = !Number.isNaN(Number.parseInt(fnKey)) ? Number.parseInt(fnKey) : (fnKey.codePointAt(0) ?? 0) - 96;
             const lnKey = id.charAt(0).toUpperCase();
             const ln = !Number.isNaN(Number.parseInt(lnKey)) ? '' : lnKey;
             return `${names[idx]}${ln}`;

package/lib/esm/activities/base/convert/converter.js

@@ -1,12 +1,12 @@
 import { ActivityConverterFactory } from "./factory";
-import { RemoteFitConverter } from "./fit";
+import { LocalFitConverter } from "./fit";
 import { TcxConverter } from "./tcx";
 export class ActivityConverter {
     static factory;
     static async convert(activity, format) {
         if (!ActivityConverter.factory) {
             ActivityConverter.factory = new ActivityConverterFactory();
-            ActivityConverter.factory.add('fit', new RemoteFitConverter());
+            ActivityConverter.factory.add('fit', new LocalFitConverter());
             ActivityConverter.factory.add('tcx', new TcxConverter());
         }
         return await ActivityConverter.factory.convert(activity, format);

package/lib/esm/activities/base/convert/fit/index.js

@@ -1 +1,2 @@
 export * from './remote-fit';
+export * from './local-fit';

package/lib/esm/activities/base/convert/fit/local-fit.js

@@ -0,0 +1,213 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { Encoder, Profile } from '@garmin/fitsdk';
+import { EventLogger } from 'gd-eventlog';
+import { useUserSettings } from '../../../../settings';
+import { Injectable } from '../../../../base/decorators';
+const DEG_TO_SEMICIRCLES = (2 ** 31) / 180;
+let LocalFitConverter = (() => {
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    return class LocalFitConverter {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _getUserSettings_decorators = [Injectable];
+            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        logger = __runInitializers(this, _instanceExtraInitializers);
+        constructor() {
+            this.logger = new EventLogger('LocalFitExporter');
+        }
+        async convert(activity) {
+            try {
+                this.logger.logEvent({ message: 'convert start', format: 'FIT' });
+                const fitActivity = this.getFitActivity(activity);
+                const data = this.encode(fitActivity);
+                this.logger.logEvent({ message: 'convert success', format: 'FIT' });
+                return data;
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'convert result', format: 'FIT', result: 'error', reason: err.message });
+                throw err;
+            }
+        }
+        getFitActivity(activity) {
+            const { id, title, time, timeTotal, timePause, distance, sport = 'cycling' } = activity;
+            const status = 'created';
+            const startTime = new Date(activity.startTime).toISOString();
+            const logs = activity.logs.map(this.mapLogToFit.bind(this));
+            const screenshots = [];
+            const laps = this.mapLapsToFit(activity.laps ?? [], activity.startTime);
+            const user = {
+                id: this.getUserSettings().get('uuid', undefined),
+                weight: activity.user.weight
+            };
+            return { id, title, status, logs, laps, startTime, time, timeTotal, timePause, distance, user, screenshots, sport };
+        }
+        mapLapsToFit(laps, activityStartTime) {
+            const activityStartMs = new Date(activityStartTime).getTime();
+            return laps.map((lap, i) => {
+                const prevDistance = i > 0 ? laps[i - 1].distance : 0;
+                return {
+                    lapNo: lap.num,
+                    startTime: new Date(lap.startTime).toISOString(),
+                    stopTime: new Date(lap.startTime + lap.rideTime * 1000).toISOString(),
+                    lapDistance: lap.distance - prevDistance,
+                    totalDistance: lap.distance,
+                    lapTime: lap.rideTime,
+                    totalTime: (lap.startTime - activityStartMs) / 1000 + lap.rideTime,
+                };
+            });
+        }
+        mapLogToFit(log) {
+            const { time, speed, slope, cadence: cadenceOrg, heartrate: heartrateOrg, distance, power: powerOrg, lat, lng, elevation } = log;
+            const cadence = Math.round(cadenceOrg);
+            const heartrate = Math.round(heartrateOrg);
+            const power = Math.round(powerOrg);
+            return { time, speed, slope, cadence, heartrate, distance, power, lat, lon: lng, elevation };
+        }
+        encode(activity) {
+            const encoder = new Encoder();
+            const startTime = new Date(activity.startTime);
+            encoder.onMesg(Profile.MesgNum.FILE_ID, {
+                type: 'activity',
+                manufacturer: 'development',
+                product: 0,
+                timeCreated: startTime,
+            });
+            encoder.onMesg(Profile.MesgNum.EVENT, {
+                timestamp: startTime,
+                event: 'timer',
+                eventType: 'start',
+                data: 0,
+            });
+            let lastTimestampMs = startTime.getTime();
+            activity.logs.forEach((log) => {
+                if (log.time != null) {
+                    lastTimestampMs = startTime.getTime() + log.time * 1000;
+                }
+                const record = {
+                    timestamp: new Date(lastTimestampMs),
+                };
+                if (log.lat != null && log.lon != null) {
+                    record.positionLat = Math.round(log.lat * DEG_TO_SEMICIRCLES);
+                    record.positionLong = Math.round(log.lon * DEG_TO_SEMICIRCLES);
+                }
+                if (log.elevation != null)
+                    record.altitude = log.elevation;
+                if (log.heartrate != null)
+                    record.heartRate = log.heartrate;
+                if (log.cadence != null)
+                    record.cadence = log.cadence;
+                if (log.distance != null)
+                    record.distance = log.distance;
+                if (log.speed != null)
+                    record.speed = log.speed / 3.6;
+                if (log.power != null)
+                    record.power = log.power;
+                if (log.slope != null)
+                    record.grade = log.slope;
+                encoder.onMesg(Profile.MesgNum.RECORD, record);
+            });
+            const endTime = new Date(lastTimestampMs);
+            encoder.onMesg(Profile.MesgNum.EVENT, {
+                timestamp: endTime,
+                event: 'timer',
+                eventType: 'stopAll',
+                data: 0,
+            });
+            if (activity.laps.length > 0) {
+                activity.laps.forEach(lap => {
+                    const lapStart = new Date(lap.startTime);
+                    const lapEnd = new Date(lap.stopTime);
+                    encoder.onMesg(Profile.MesgNum.LAP, {
+                        timestamp: lapEnd,
+                        startTime: lapStart,
+                        totalElapsedTime: lap.lapTime,
+                        totalTimerTime: lap.lapTime,
+                        totalDistance: lap.lapDistance,
+                        event: 'lap',
+                        eventType: 'stop',
+                    });
+                });
+            }
+            else {
+                encoder.onMesg(Profile.MesgNum.LAP, {
+                    timestamp: endTime,
+                    startTime,
+                    totalElapsedTime: activity.timeTotal,
+                    totalTimerTime: activity.time,
+                    totalDistance: activity.distance,
+                    event: 'lap',
+                    eventType: 'stop',
+                });
+            }
+            encoder.onMesg(Profile.MesgNum.SESSION, {
+                timestamp: endTime,
+                startTime,
+                totalElapsedTime: activity.timeTotal,
+                totalTimerTime: activity.time,
+                totalDistance: activity.distance,
+                sport: this.mapSport(activity.sport),
+                subSport: 'virtualActivity',
+                event: 'session',
+                eventType: 'stopDisableAll',
+            });
+            encoder.onMesg(Profile.MesgNum.ACTIVITY, {
+                timestamp: endTime,
+                totalTimerTime: activity.time,
+                numSessions: 1,
+                type: 'manual',
+                event: 'activity',
+                eventType: 'stop',
+            });
+            const uint8Array = encoder.close();
+            return uint8Array.buffer;
+        }
+        mapSport(incyclistSport) {
+            if (!incyclistSport || incyclistSport === 'cycling')
+                return 'cycling';
+            if (incyclistSport === 'running')
+                return 'running';
+            if (incyclistSport === 'rowing')
+                return 'rowing';
+        }
+        getUserSettings() {
+            return useUserSettings();
+        }
+    };
+})();
+export { LocalFitConverter };

package/lib/esm/activities/base/convert/fit/remote-fit.js

@@ -26,7 +26,7 @@ export class RemoteFitConverter {
         return this.api;
     }
     getFitActivity(activity) {
-        const { id, title, time, timeTotal, timePause, distance } = activity;
+        const { id, title, time, timeTotal, timePause, distance, sport = 'cycling' } = activity;
         const status = 'created';
         const startTime = new Date(activity.startTime).toISOString();
         const logs = activity.logs.map(this.mapLogToFit.bind(this));
@@ -36,7 +36,7 @@ export class RemoteFitConverter {
             id: this.getUserSettings().get('uuid', undefined),
             weight: activity.user.weight
         };
-        return { id, title, status, logs, laps, startTime, time, timeTotal, timePause, distance, user, screenshots };
+        return { id, title, status, logs, laps, startTime, time, timeTotal, timePause, distance, user, screenshots, sport };
     }
     mapLogToFit(log) {
         const { time, speed, slope, cadence: cadenceOrg, heartrate: heartrateOrg, distance, power: powerOrg, lat, lng, elevation } = log;

package/lib/esm/activities/base/convert/tcx/tcx.js

@@ -85,7 +85,8 @@ export class TcxConverter {
             const trackPoints = this.creatTrackPoints(activity, startTime);
             const laps = this.createLaps(startTime, activity, trackPoints);
             const creator = new IncyclistAttribution();
-            const tcxActivity = new Activity('Biking', { Id: startTime, Notes: 'Incyclist Ride', Laps: laps, Creator: creator });
+            const sport = this.mapSport(activity.sport);
+            const tcxActivity = new Activity(sport, { Id: startTime, Notes: 'Incyclist Ride', Laps: laps, Creator: creator });
             const activityList = new ActivityList({ activity: [tcxActivity] });
             const tcxObj = new TrainingCenterDatabase({ activities: activityList });
             const xml = tcxObj.toXml();
@@ -97,6 +98,14 @@ export class TcxConverter {
             throw err;
         }
     }
+    mapSport(incyclistSport) {
+        if (!incyclistSport || incyclistSport === 'cycling')
+            return 'Biking';
+        if (incyclistSport === 'running')
+            return 'Running';
+        if (incyclistSport === 'rowing')
+            return 'Other';
+    }
     createLaps(startTime, activity, trackPoints) {
         if (!activity.workout && !activity.laps)
             return this.createActivityLap(startTime, activity, trackPoints);

package/lib/esm/activities/base/model/index.js

@@ -1 +1,6 @@
 export const DEFAULT_ACTIVITY_TITLE = 'Incyclist Ride';
+export const DEFAULT_SPORT_ACTIVITY_TITLE = {
+    cycling: 'Incyclist Ride',
+    rowing: 'Incyclist Rowing',
+    running: 'Incyclist Run'
+};

package/lib/esm/activities/base/repo/db.js

@@ -42,7 +42,7 @@ import { useRouteList } from "../../../routes";
 import { ActivitiesDBMigratorFactory } from "./migration/factory";
 import { Injectable } from "../../../base/decorators/Injection";
 import { useUnitConverter } from "../../../i18n";
-export const DB_VERSION = '4';
+export const DB_VERSION = '5';
 export const DB_NAME = 'db';
 let ActivitiesRepository = (() => {
     let _classDecorators = [Singleton];

package/lib/esm/activities/base/utils/activity.js

@@ -33,7 +33,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     done = true;
 };
 import { useRouteList } from "../../../routes";
-import { DEFAULT_ACTIVITY_TITLE } from "../model";
+import { DEFAULT_ACTIVITY_TITLE, DEFAULT_SPORT_ACTIVITY_TITLE } from "../model";
 import { ActivitiesRepository, DB_VERSION } from "../repo";
 import { getBindings } from "../../../api";
 import { useOnlineStatusMonitoring } from "../../../monitoring";
@@ -115,7 +115,8 @@ let Activity = (() => {
         }
         getTitle() {
             let title = this.info.summary.title;
-            if (title === DEFAULT_ACTIVITY_TITLE) {
+            const sport = this.details?.sport ?? 'cycling';
+            if (title === DEFAULT_ACTIVITY_TITLE || title === DEFAULT_SPORT_ACTIVITY_TITLE[sport]) {
                 if (this.details?.route?.title) {
                     title = this.details?.route.title;
                 }

package/lib/esm/activities/base/utils/helpers.js

@@ -1,5 +1,5 @@
 export * from './activity';
-import { DEFAULT_ACTIVITY_TITLE } from "../model";
+import { DEFAULT_ACTIVITY_TITLE, DEFAULT_SPORT_ACTIVITY_TITLE } from "../model";
 export const buildSummary = (activity, proposedName) => {
     const { id, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, endPos, realityFactor = 100, links, laps, fileName } = activity;
     let name = proposedName ?? activity.name;
@@ -10,7 +10,8 @@ export const buildSummary = (activity, proposedName) => {
     const previewImage = preview?.fileName;
     const totalElevation = activity.totalElevation;
     let title = activity.title;
-    if (title === DEFAULT_ACTIVITY_TITLE) {
+    const sport = activity.sport ?? 'cycling';
+    if (title === DEFAULT_ACTIVITY_TITLE || title === DEFAULT_SPORT_ACTIVITY_TITLE[sport]) {
         if (activity.routeType === 'Video' && activity.route)
             title = activity.route.title ?? activity.route.name;
         else if (activity.route)

package/lib/esm/activities/list/utils.js

@@ -2,7 +2,7 @@ import { getUnitConversionShortcuts } from "../../i18n";
 export const createUIActivityInfo = (a) => {
     if (!a)
         return a;
-    const { summary, details } = a;
+    const { summary } = a;
     return {
         summary: createUIActivitySummary(summary),
         details: undefined

package/lib/esm/activities/ride/service.js

@@ -40,7 +40,7 @@ import { useUserSettings } from "../../settings";
 import { formatDateTime, formatNumber, formatTime, getLegacyInterface, waitNextTick } from "../../utils";
 import { IncyclistCapability } from "incyclist-devices";
 import { useDeviceConfiguration, useDeviceRide } from "../../devices";
-import { ActivitiesRepository, ActivityConverter, ActivityConverterFactory, DB_VERSION, DEFAULT_ACTIVITY_TITLE } from "../base";
+import { ActivitiesRepository, ActivityConverter, ActivityConverterFactory, DB_VERSION, DEFAULT_SPORT_ACTIVITY_TITLE } from "../base";
 import { v4 as generateUUID } from 'uuid';
 import { addDetails, checkIsLoop, getElevationGainAt, getNextPosition, getPosition, getRouteHash, validateRoute } from "../../routes/base/utils/route";
 import { Route } from "../../routes/base/model/route";
@@ -56,7 +56,6 @@ import { Injectable } from "../../base/decorators";
 import { useUnitConverter } from "../../i18n";
 import { createUIActivityDetails } from "../list/utils";
 import { sleep } from "../../utils/sleep";
-import { EventEmitter } from "node:events";
 const SAVE_INTERVAL = 5000;
 let ActivityRideService = (() => {
     let _classDecorators = [Singleton];
@@ -100,6 +99,11 @@ let ActivityRideService = (() => {
         deviceDataHandler = this.onDeviceData.bind(this);
         gearChangeHandler = this.onGearChange.bind(this);
         dataHealthHandler = this.onDeviceHealthUpdate.bind(this);
+        speedHandler = {
+            'cycling': this.getCyclingSpeed.bind(this),
+            'rowing': this.getRowingPace.bind(this),
+            'running': this.getRunningPace.bind(this)
+        };
         current;
         constructor() {
             super('ActivityRide');
@@ -162,7 +166,7 @@ let ActivityRideService = (() => {
                 this.isSaveDone = false;
                 this.isDonateShown = false;
                 this.isSummaryShown = false;
-                this.logEvent({ message: 'activity started' });
+                this.logEvent({ message: 'activity started', sport: this.activity.sport ?? 'cycling' });
                 this.startWorker();
                 this.enableDeviceHealthCheck();
                 this.emit('started');
@@ -260,6 +264,34 @@ let ActivityRideService = (() => {
                 return [];
             }
         }
+        getRowingPace(speed) {
+            if (speed > 0) {
+                const value = 30 / speed;
+                const min = Math.floor(value);
+                const sec = Math.floor((value - min) * 60);
+                const p = sec < 10 ? '0' : '';
+                return { value: `${min}:${p}${sec}`, unit: '' };
+            }
+            else {
+                return { value: '', unit: '' };
+            }
+        }
+        getRunningPace(speed) {
+            if (speed > 0) {
+                const value = 60 / speed;
+                const min = Math.floor(value);
+                const sec = Math.floor((value - min) * 60);
+                const p = sec < 10 ? '0' : '';
+                return { value: `${min}:${p}${sec}`, unit: '' };
+            }
+            else {
+                return { value: '', unit: '' };
+            }
+        }
+        getCyclingSpeed(speed) {
+            const [C, U] = this.getUnitConversionShortcuts();
+            return { value: C(speed, 'speed')?.toFixed(1) ?? '', unit: U('speed') };
+        }
         buildDashboardInfo(currentValues, avgMaxStats, display) {
             const { distance, time, speed, power, slope, heartrate, cadence, distanceRemaining, timeRemaining, gear } = currentValues;
             const { speedDetails, powerDetails, elevationGain, heartrateDetails, cadenceDetails } = avgMaxStats;
@@ -277,9 +309,10 @@ let ActivityRideService = (() => {
                     { value: distanceRemaining === undefined ? undefined : `-${C(distanceRemaining, 'distance', { from: 'km' }).toFixed(2)}` }
                 ]
             });
+            const sport = this.activity.sport ?? 'cycling';
             info.push({ title: 'Speed',
                 data: [
-                    { value: C(speed, 'speed')?.toFixed(1) ?? '', unit: U('speed') },
+                    this.speedHandler[sport](speed),
                     speedDetails
                 ],
                 dataState: this.current.dataState?.speed
@@ -291,7 +324,9 @@ let ActivityRideService = (() => {
                 info.push({ title: 'Slope', data: [{ value: formatNumber(slope, 1), unit: '%', info: slopeInfo }, elevationGain] });
             }
             info.push({ title: 'Heartrate', data: [{ value: formatNumber(heartrate, 0), unit: 'bpm' }, heartrateDetails], dataState: this.current.dataState?.heartrate });
-            info.push({ title: 'Cadence', data: [{ value: formatNumber(cadence, 0), unit: 'rpm' }, cadenceDetails], dataState: this.current.dataState?.cadence });
+            const cadenceUnit = this.activity.sport === 'rowing' ? 'spm' : 'rpm';
+            const cadenceInfo = { title: 'Cadence', data: [{ value: formatNumber(cadence, 0), unit: cadenceUnit }, cadenceDetails], dataState: this.current.dataState?.cadence };
+            info.push(cadenceInfo);
             if (gear) {
                 info.push({ title: 'Gear', data: [{ value: gear }] });
             }
@@ -328,7 +363,11 @@ let ActivityRideService = (() => {
                 const [C, U] = this.getUnitConversionShortcuts();
                 const stats = this.activity?.stats;
                 const maxSpeed = stats?.speed?.max;
-                const speedDetails = { value: formatNumber(C(maxSpeed, 'speed'), 1), label: 'max' };
+                const sport = this.activity.sport ?? 'cycling';
+                const data = this.speedHandler[sport](maxSpeed);
+                const speedDetails = this.activity.sport === 'cycling' ?
+                    { value: formatNumber(C(maxSpeed, 'speed'), 1), label: 'max' } :
+                    { value: data.value, label: 'max' };
                 const powerDetails = { value: formatNumber(stats?.power?.max, 0), label: 'max' };
                 const heartrateDetails = { value: formatNumber(stats?.hrm?.max, 0), label: 'max' };
                 const cadenceDetails = { value: formatNumber(stats?.cadence?.max, 0), label: 'max' };
@@ -345,7 +384,11 @@ let ActivityRideService = (() => {
                 const [C, U] = this.getUnitConversionShortcuts();
                 const stats = this.activity?.stats;
                 const avgSpeed = stats?.speed?.avg;
-                const speedDetails = { value: formatNumber(C(avgSpeed, 'speed'), 1), label: 'avg' };
+                const sport = this.activity.sport ?? 'cycling';
+                const data = this.speedHandler[sport](avgSpeed);
+                const speedDetails = this.activity.sport === 'cycling' ?
+                    { value: formatNumber(C(avgSpeed, 'speed'), 1), label: 'avg' } :
+                    { value: data.value, label: 'max' };
                 const powerDetails = { value: formatNumber(stats?.power?.avg, 0), label: 'avg' };
                 const heartrateDetails = { value: formatNumber(stats?.hrm?.avg, 0), label: 'avg' };
                 const cadenceDetails = { value: formatNumber(stats?.cadence?.avg, 0), label: 'avg' };
@@ -460,47 +503,17 @@ let ActivityRideService = (() => {
             };
             const run = async () => {
                 await sleep(5);
-                let cntCompleted = 0;
                 let success = false;
-                const localEmitter = new EventEmitter();
-                const incCompleted = () => {
-                    cntCompleted++;
-                    if (cntCompleted >= 2) {
-                        localEmitter.emit('completed');
-                    }
-                };
-                localEmitter.once('completed', () => {
-                    sleep(0).then(() => {
-                        delete this.saveObserver;
-                    });
-                });
                 try {
                     emit('start', success);
                     await this._save();
-                    let format = undefined;
-                    let uploadSuccess = false;
-                    let convertSuccess = await this.convert('TCX');
-                    incCompleted();
-                    if (convertSuccess) {
-                        format = 'TCX';
-                        this.convert('FIT')
-                            .then(incCompleted)
-                            .catch(incCompleted);
-                    }
-                    else {
-                        convertSuccess = await this.convert('FIT');
-                        cntCompleted++;
-                        if (convertSuccess)
-                            format = 'FIT';
-                    }
-                    if (convertSuccess) {
-                        uploadSuccess = await this.upload(format);
-                    }
-                    success = convertSuccess && uploadSuccess;
+                    success = await this._convertAndUpload();
+                    sleep(0).then(() => {
+                        delete this.saveObserver;
+                    });
                     this.isSaveDone = true;
                 }
                 catch {
-                    cntCompleted++;
                     success = false;
                 }
                 emit('done', success);
@@ -830,6 +843,29 @@ let ActivityRideService = (() => {
                 this.logError(err, '_save');
             }
         }
+        async _convertAndUpload() {
+            const successes = [];
+            const promises = [
+                this.convert('TCX').then(() => successes.push('tcx')),
+                this.convert('FIT').then(() => successes.push('fit')),
+            ];
+            await Promise.allSettled(promises);
+            this.logEvent({ message: 'conversion finished, ' });
+            const convertSuccess = successes.length > 0;
+            let uploadSuccess;
+            let format = 'tcx';
+            if (this.activity.sport === 'rowing') {
+                if (successes.some(e => e === 'fit'))
+                    format = 'fit';
+            }
+            else if (!successes.some(e => e === 'tcx')) {
+                format = 'fit';
+            }
+            if (convertSuccess) {
+                uploadSuccess = await this.upload(format);
+            }
+            return convertSuccess && uploadSuccess;
+        }
         getSaveInterval() {
             return SAVE_INTERVAL;
         }
@@ -997,7 +1033,8 @@ let ActivityRideService = (() => {
                         this.current.position = undefined;
                     }
             }
-            const title = DEFAULT_ACTIVITY_TITLE;
+            const sport = this.getDeviceRide().getSport() ?? 'cycling';
+            const title = DEFAULT_SPORT_ACTIVITY_TITLE[sport];
             const id = requestedId ?? generateUUID();
             const date = formatDateTime(new Date(), "%Y%m%d%H%M%S", false);
             const name = `${title}-${date}`;
@@ -1024,7 +1061,8 @@ let ActivityRideService = (() => {
                 totalElevation: 0,
                 logs: [],
                 startPos, endPos, segment, realityFactor,
-                fileName
+                fileName,
+                sport
             };
             return activity;
         }

package/lib/esm/devices/ride/service.js

@@ -129,7 +129,6 @@ let DeviceRideService = (() => {
             return this.data;
         }
         pauseLogging() {
-            console.log('# PAUSE LOGGING');
             this.logPaused = true;
             const interfaces = this.getEnabledInterfaces();
             interfaces.forEach(i => i.pauseLogging());
@@ -139,7 +138,6 @@ let DeviceRideService = (() => {
                 .forEach(a => a.pauseLogging());
         }
         resumeLogging() {
-            console.log('# RESUME LOGGING');
             this.logPaused = false;
             const interfaces = this.getEnabledInterfaces();
             interfaces.forEach(i => i.resumeLogging());
@@ -921,6 +919,19 @@ let DeviceRideService = (() => {
             this.storeOriginalCyclingMode();
             return this.startAdapters(adapters, 'start', props);
         }
+        getSport() {
+            try {
+                const info = this.getControlAdapter();
+                const adapter = info?.adapter;
+                const sports = adapter?.getSupportedSports?.() ?? ['cycling'];
+                this.logEvent({ message: '[DeviceRide] getSports', adapter: info.adapter.getName(), sports: sports.join(',') });
+                return sports[0];
+            }
+            catch (err) {
+                this.logError(err, 'getSports');
+                return 'cycling';
+            }
+        }
         async startRetry(props) {
             await this.lazyInit();
             const selected = this.getRideAdapters();

package/lib/esm/ride/route/RLVDisplayService.js

@@ -275,7 +275,7 @@ let RLVDisplayService = (() => {
         getUIText(input) {
             let text = input;
             if (text?.length) {
-                text = text.replace(/\\n/g, '<br>');
+                text = text.replaceAll('\\n', '<br>');
             }
             return text;
         }

package/lib/esm/ride/route/RouteDisplayService.js

@@ -200,8 +200,8 @@ let RouteDisplayService = (() => {
             const nearbyRides = this.getNearbyRidesProps(props);
             const [C, U] = this.getUnitConversionShortcuts();
             const isLoop = this.currentRoute?.description?.isLoop;
-            const xScale = { value: C(1, 'distance', { from: U('distance') }), unit: U('distance') };
-            const yScale = { value: C(1, 'elevation', { from: U('elevation') }), unit: U('elevation') };
+            const xScale = { value: C(1, 'distance', { from: 'm' }), unit: U('distance') };
+            const yScale = { value: C(1, 'elevation', { from: 'm' }), unit: U('elevation') };
             const mapStartPos = (isLoop && !loopOverwrite) ? undefined : startPos;
             return {
                 ...parent,

package/lib/esm/routes/base/parsers/utils.js

@@ -58,7 +58,7 @@ export class BinaryReader {
             const c = part.readUInt16LE(i * 2);
             if (c === 0)
                 return str;
-            str += String.fromCharCode(c);
+            str += String.fromCodePoint(c);
             i++;
         }
         return str;

package/lib/esm/utils/formatting.js

@@ -3,7 +3,7 @@ export const formatDateTime = (date, fstr = '%Y%m%d%H%M%S', utc = false) => {
     if (!valid(date) || !(date instanceof Date))
         return;
     const prefix = utc ? 'getUTC' : 'get';
-    return fstr.replace(/%[YmdHMS]/g, (m) => {
+    return fstr.replaceAll(/%[YmdHMS]/g, (m) => {
         switch (m) {
             case '%Y': return date[prefix + 'FullYear']();
             case '%m':

package/lib/esm/utils/geo.js

@@ -12,7 +12,8 @@ export const calculateDistance = (lat1, lon1, lat2, lon2, radius = rEarth * 1000
     const distance = abs(R * c);
     return distance;
 };
-export const distanceBetween = (p1, p2, props = { abs: true, latLng: true }) => {
+const DEFAULT_DISTANCE_PROPS = { abs: true, latLng: true };
+export const distanceBetween = (p1, p2, props = DEFAULT_DISTANCE_PROPS) => {
     if (p1 === undefined)
         return 0;
     let dist;

package/lib/esm/utils/xml.js

@@ -13,7 +13,7 @@ export const removeUTFBom = (str) => {
     if (!str || typeof (str) !== 'string') {
         return str;
     }
-    while (str.charCodeAt(0) === 0 || str.charCodeAt(0) === 0xFEFF || str.charCodeAt(0) === 0xFFFD)
+    while (str.codePointAt(0) === 0 || str.codePointAt(0) === 0xFEFF || str.codePointAt(0) === 0xFFFD)
         str = str.substring(1);
     return str;
 };

package/lib/esm/workouts/base/parsers/zwo/zwo.js

@@ -210,7 +210,7 @@ export class ZwoParser {
             let tag;
             parser.parseString(data, (err, result) => {
                 if (err) {
-                    err.message = 'File contains error(s): ' + err.message.replace(/\n/g, ' ');
+                    err.message = 'File contains error(s): ' + err.message.replaceAll('\n', ' ');
                     this.logger.logEvent({ message: 'error', fn: 'parse()', error: err.message, stack: err.stack });
                     return reject(err);
                 }

package/lib/types/activities/base/convert/fit/index.d.ts

@@ -1 +1,2 @@
 export * from './remote-fit';
+export * from './local-fit';

package/lib/types/activities/base/convert/fit/local-fit.d.ts

@@ -0,0 +1,14 @@
+import { EventLogger } from 'gd-eventlog';
+import { ActivityDetails, ActivityLogRecord, FitExportActivity, FitLapEntry, FitLogEntry, LapSummary } from '../../model';
+import { Sport } from 'incyclist-devices';
+export declare class LocalFitConverter {
+    protected logger: EventLogger;
+    constructor();
+    convert(activity: ActivityDetails): Promise<ArrayBuffer>;
+    protected getFitActivity(activity: ActivityDetails): FitExportActivity;
+    protected mapLapsToFit(laps: LapSummary[], activityStartTime: string): FitLapEntry[];
+    protected mapLogToFit(log: ActivityLogRecord): FitLogEntry;
+    protected encode(activity: FitExportActivity): ArrayBuffer;
+    protected mapSport(incyclistSport?: Sport): string;
+    protected getUserSettings(): import("../../../../settings").UserSettingsService;
+}

package/lib/types/activities/base/convert/tcx/tcx.d.ts

@@ -4,6 +4,7 @@ import { IActivityConverter } from '../types';
 import { ActivityDetails } from '../../model';
 import { TcxLapMarker } from './types';
 import { Step } from '../../../../workouts';
+import { Sport } from 'incyclist-devices';
 export declare class IncyclistAttribution extends AbstractSource {
     toXml(): string;
     constructor();
@@ -14,6 +15,7 @@ export declare class TcxConverter implements IActivityConverter {
     protected logger: EventLogger;
     constructor();
     convert(activity: ActivityDetails): Promise<string>;
+    protected mapSport(incyclistSport: Sport): 'Running' | 'Biking' | 'Other';
     protected createLaps(startTime: Date, activity: ActivityDetails, trackPoints: TrackPoint[]): ActivityLap[];
     protected createActivityLap(startTime: Date, activity: ActivityDetails, trackPoints: TrackPoint[]): ActivityLap[];
     protected getWorkoutLapMarkers(activity: ActivityDetails): Array<TcxLapMarker>;

package/lib/types/activities/base/model/index.d.ts

@@ -1,7 +1,9 @@
+import { Sport } from "incyclist-devices";
 import { FormattedNumber } from "../../../i18n";
 import { RoutePoint } from "../../../routes/base/types";
 import { Workout } from "../../../workouts";
 export declare const DEFAULT_ACTIVITY_TITLE = "Incyclist Ride";
+export declare const DEFAULT_SPORT_ACTIVITY_TITLE: Record<Sport, string>;
 export type ActivityUser = {
     uuid?: string;
     weight: number;
@@ -141,6 +143,7 @@ export type FitExportActivity = {
     href?: string;
     user: FitUser;
     screenshots: Array<FitScreenshots>;
+    sport?: Sport;
 };
 interface ActivityDetailsBase {
     type?: ActivityType;
@@ -170,6 +173,7 @@ interface ActivityDetailsBase {
     fitFileName?: string;
     links?: ActivityAppLinks;
     workout?: Workout;
+    sport?: Sport;
 }
 export interface ActivityDetails extends ActivityDetailsBase {
     distance: number;

package/lib/types/activities/base/repo/db.d.ts

@@ -3,7 +3,7 @@ import { JsonRepository } from "../../../api";
 import { Observer, PromiseObserver } from "../../../base/types/observer";
 import { ActivityDetails, ActivityInfo } from "../model";
 import { ActivitySearchCriteria } from "./types";
-export declare const DB_VERSION = "4";
+export declare const DB_VERSION = "5";
 export declare const DB_NAME = "db";
 export declare class ActivitiesRepository {
     protected repo: JsonRepository;

package/lib/types/activities/ride/service.d.ts

@@ -1,12 +1,12 @@
 import { IncyclistService } from "../../base/service";
 import { Observer, PromiseObserver } from "../../base/types/observer";
-import { DeviceData } from "incyclist-devices";
+import { DeviceData, Sport } from "incyclist-devices";
 import { ExtendedIncyclistCapability, HealthStatus } from "../../devices";
 import { ActivitiesRepository, ActivityConverterFactory, ActivityDetails, ActivityInfo, ActivityLogRecord, ActivityRouteType, ScreenShotInfo } from "../base";
 import { FreeRideStartSettings } from "../../routes/list/types";
 import { RouteSettings } from "../../routes/list/cards/types";
 import { RoutePoint } from "../../routes/base/types";
-import { ActivityState, ActivitySummaryDisplayProperties } from "./types";
+import { ActivityDashboardDataItem, ActivityState, ActivitySummaryDisplayProperties } from "./types";
 import { Route } from "../../routes/base/model/route";
 import { ActivityStatsCalculator } from "./stats";
 import { ActivityDuration } from "./duration";
@@ -37,6 +37,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected deviceDataHandler: any;
     protected gearChangeHandler: any;
     protected dataHealthHandler: any;
+    protected speedHandler: Record<Sport, (speed: number) => ActivityDashboardDataItem>;
     protected current: {
         route?: Route;
         position?: RoutePoint;
@@ -67,6 +68,9 @@ export declare class ActivityRideService extends IncyclistService {
     resume(requester?: 'user' | 'system'): void;
     ignoreEndPos(): void;
     getDashboardDisplayProperties(): any[];
+    protected getRowingPace(speed: number): ActivityDashboardDataItem;
+    protected getRunningPace(speed: number): ActivityDashboardDataItem;
+    protected getCyclingSpeed(speed: number): ActivityDashboardDataItem;
     protected buildDashboardInfo(currentValues: any, avgMaxStats: any, display: any): any[];
     getCurrentValues(): {
         position: {};
@@ -85,7 +89,7 @@ export declare class ActivityRideService extends IncyclistService {
     };
     protected getAverageValues(): {
         speedDetails: {
-            value: string;
+            value: string | number;
             label: string;
         };
         powerDetails: {
@@ -114,7 +118,7 @@ export declare class ActivityRideService extends IncyclistService {
     };
     protected getMaximumValues(): {
         speedDetails: {
-            value: string;
+            value: string | number;
             label: string;
         };
         powerDetails: {
@@ -173,6 +177,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected onDeviceHealthUpdate(udid: string, status: HealthStatus, capabilities: Array<ExtendedIncyclistCapability>): void;
     emit(eventName: string | symbol, ...args: any[]): boolean;
     protected _save(): Promise<void>;
+    protected _convertAndUpload(): Promise<boolean>;
     protected getSaveInterval(): number;
     protected updateRepo(): Promise<void>;
     protected getTargetFileName(format: string): Promise<string>;
@@ -188,7 +193,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected update(): void;
     protected isLoop(): boolean;
     protected createFreeRide(settings: FreeRideStartSettings): Route;
-    protected getMode(routeType: ActivityRouteType): "video" | "workout" | "follow route" | "free ride";
+    protected getMode(routeType: ActivityRouteType): "workout" | "video" | "follow route" | "free ride";
     protected updateActivityTime(): void;
     getRideProps(): any;
     protected logActivityUpdateMessage(): void;

package/lib/types/devices/ride/service.d.ts

@@ -1,6 +1,6 @@
 import { AdapterInfo, IncyclistDeviceSettings } from "../configuration";
 import { AdapterRideInfo, AdapterStateInfo, LegacyRoute, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./types";
-import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, IncyclistInterface, UpdateRequest } from "incyclist-devices";
+import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, IncyclistInterface, Sport, UpdateRequest } from "incyclist-devices";
 import { IncyclistService } from "../../base/service";
 import { Route } from "../../routes/base/model/route";
 import { RouteApiDetail } from "../../routes/base/api/types";
@@ -92,6 +92,7 @@ export declare class DeviceRideService extends IncyclistService {
     protected stopDuringInterfaceRestart(unhealthy: AdapterRideInfo): Promise<void>;
     private reconnectSingle;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
+    getSport(): Sport;
     startRetry(props: RideServiceDeviceProperties): Promise<boolean>;
     cancelStart(): Promise<boolean>;
     registerOnDataHandler(adapters: AdapterRideInfo[]): void;

package/lib/types/devices/types.d.ts

@@ -1,3 +1,5 @@
+import type { Sport } from 'incyclist-devices';
 export type * from './page/types';
 export type * from './ride/types';
 export type * from './configuration/types';
+export type { Sport };

package/lib/types/index.d.ts

@@ -20,4 +20,4 @@ export * from './utils';
 export * from './video';
 export * from './workouts';
 export type * from './types';
-export { CyclingModeProperyType } from 'incyclist-devices';
+export { CyclingModeProperyType, Sport } from 'incyclist-devices';

package/lib/types/ride/display/service.d.ts

@@ -120,7 +120,7 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected isSimulator(): boolean;
     protected getBike(): string;
     protected getBikeInterface(): string;
-    protected getLogRideMode(): "video" | "workout" | "free-ride" | "follow-route";
+    protected getLogRideMode(): "workout" | "video" | "free-ride" | "follow-route";
     protected isDebug(): boolean;
     protected isVirtualShiftingEnabled(): boolean;
     protected getActivityRide(): import("../../activities").ActivityRideService;

package/lib/types/routes/list/cards/RouteCard.d.ts

@@ -81,7 +81,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     getCurrentDownload(): Observer;
     getVideoDir(): string;
     setVideoDir(dir: string): void;
-    onVideoSelected(info: FileInfo): Promise<"Could not open file" | "Unsupported video format - Please select MP4 or AVI">;
+    onVideoSelected(info: FileInfo): Promise<"Unsupported video format - Please select MP4 or AVI" | "Could not open file">;
     download(): Observer;
     stopDownload(immediate?: boolean): void;
     deleteDownload(): Promise<void>;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.49-beta",
+  "version": "1.7.50",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
+    "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.0",
-    "incyclist-devices": "^3.0.12",
+    "incyclist-devices": "^3.0.13",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",