incyclist-services 1.7.50 → 1.7.52

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

@@ -40,6 +40,7 @@ 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;
+const DEFAULT_PRODUCT = 3843;
 let LocalFitConverter = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
@@ -68,7 +69,7 @@ let LocalFitConverter = (() => {
             }
         }
         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));
@@ -78,7 +79,7 @@ let LocalFitConverter = (() => {
                 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 };
         }
         mapLapsToFit(laps, activityStartTime) {
             const activityStartMs = new Date(activityStartTime).getTime();
@@ -102,13 +103,36 @@ let LocalFitConverter = (() => {
             const power = Math.round(powerOrg);
             return { time, speed, slope, cadence, heartrate, distance, power, lat, lon: lng, elevation };
         }
+        buildSerialNo() {
+            return Date.now() & 0xFFFFFFFF;
+        }
+        findProduct(name) {
+            const entry = Object.entries(fitsdk_1.Profile.types.garminProduct)
+                .find(([, value]) => value === name);
+            return entry ? Number(entry[0]) : DEFAULT_PRODUCT;
+        }
         encode(activity) {
             const encoder = new fitsdk_1.Encoder();
             const startTime = new Date(activity.startTime);
+            const manufacturer = this.getUserSettings().get('fitexport.manufacturer', 'garmin');
+            const productIdentifier = this.getUserSettings().get('fitexport.device', 'edge1040');
+            const storedSerial = this.getUserSettings().get('fitexport.serialNo', undefined);
+            const serialNumber = storedSerial ?? this.buildSerialNo();
+            if (!storedSerial) {
+                this.getUserSettings().set('fitexport.serialNo', serialNumber);
+            }
+            let product;
+            if (Number.isNaN(Number(productIdentifier))) {
+                product = this.findProduct(productIdentifier);
+            }
+            else {
+                product = productIdentifier;
+            }
             encoder.onMesg(fitsdk_1.Profile.MesgNum.FILE_ID, {
                 type: 'activity',
-                manufacturer: 'development',
-                product: 0,
+                manufacturer,
+                product,
+                serialNumber,
                 timeCreated: startTime,
             });
             encoder.onMesg(fitsdk_1.Profile.MesgNum.EVENT, {
@@ -184,7 +208,7 @@ let LocalFitConverter = (() => {
                 totalElapsedTime: activity.timeTotal,
                 totalTimerTime: activity.time,
                 totalDistance: activity.distance,
-                sport: 'cycling',
+                sport: this.mapSport(activity.sport),
                 subSport: 'virtualActivity',
                 event: 'session',
                 eventType: 'stopDisableAll',
@@ -200,6 +224,14 @@ let LocalFitConverter = (() => {
             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 (0, settings_1.useUserSettings)();
         }

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

@@ -29,7 +29,7 @@ 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));
@@ -39,7 +39,7 @@ 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/cjs/activities/base/convert/tcx/tcx.js

@@ -88,7 +88,8 @@ class TcxConverter {
             const trackPoints = this.creatTrackPoints(activity, startTime);
             const laps = this.createLaps(startTime, activity, trackPoints);
             const creator = new IncyclistAttribution();
-            const tcxActivity = new tcx_builder_1.Activity('Biking', { Id: startTime, Notes: 'Incyclist Ride', Laps: laps, Creator: creator });
+            const sport = this.mapSport(activity.sport);
+            const tcxActivity = new tcx_builder_1.Activity(sport, { Id: startTime, Notes: 'Incyclist Ride', Laps: laps, Creator: creator });
             const activityList = new tcx_builder_1.ActivityList({ activity: [tcxActivity] });
             const tcxObj = new tcx_builder_1.TrainingCenterDatabase({ activities: activityList });
             const xml = tcxObj.toXml();
@@ -100,6 +101,14 @@ 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/cjs/activities/base/model/index.js

@@ -1,4 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ACTIVITY_TITLE = void 0;
+exports.DEFAULT_SPORT_ACTIVITY_TITLE = exports.DEFAULT_ACTIVITY_TITLE = void 0;
 exports.DEFAULT_ACTIVITY_TITLE = 'Incyclist Ride';
+exports.DEFAULT_SPORT_ACTIVITY_TITLE = {
+    cycling: 'Incyclist Ride',
+    rowing: 'Incyclist Rowing',
+    running: 'Incyclist Run'
+};

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

@@ -45,7 +45,7 @@ const routes_1 = require("../../../routes");
 const factory_1 = require("./migration/factory");
 const Injection_1 = require("../../../base/decorators/Injection");
 const i18n_1 = require("../../../i18n");
-exports.DB_VERSION = '4';
+exports.DB_VERSION = '5';
 exports.DB_NAME = 'db';
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];

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

@@ -118,7 +118,8 @@ let Activity = (() => {
         }
         getTitle() {
             let title = this.info.summary.title;
-            if (title === model_1.DEFAULT_ACTIVITY_TITLE) {
+            const sport = this.details?.sport ?? 'cycling';
+            if (title === model_1.DEFAULT_ACTIVITY_TITLE || title === model_1.DEFAULT_SPORT_ACTIVITY_TITLE[sport]) {
                 if (this.details?.route?.title) {
                     title = this.details?.route.title;
                 }

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

@@ -27,7 +27,8 @@ const buildSummary = (activity, proposedName) => {
     const previewImage = preview?.fileName;
     const totalElevation = activity.totalElevation;
     let title = activity.title;
-    if (title === model_1.DEFAULT_ACTIVITY_TITLE) {
+    const sport = activity.sport ?? 'cycling';
+    if (title === model_1.DEFAULT_ACTIVITY_TITLE || title === model_1.DEFAULT_SPORT_ACTIVITY_TITLE[sport]) {
         if (activity.routeType === 'Video' && activity.route)
             title = activity.route.title ?? activity.route.name;
         else if (activity.route)

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

@@ -5,7 +5,7 @@ const i18n_1 = require("../../i18n");
 const createUIActivityInfo = (a) => {
     if (!a)
         return a;
-    const { summary, details } = a;
+    const { summary } = a;
     return {
         summary: (0, exports.createUIActivitySummary)(summary),
         details: undefined

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

@@ -62,7 +62,6 @@ const decorators_1 = require("../../base/decorators");
 const i18n_1 = require("../../i18n");
 const utils_3 = require("../list/utils");
 const sleep_1 = require("../../utils/sleep");
-const node_events_1 = require("node:events");
 const SAVE_INTERVAL = 5000;
 let ActivityRideService = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -106,6 +105,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');
@@ -168,7 +172,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');
@@ -266,6 +270,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;
@@ -283,9 +315,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
@@ -297,7 +330,9 @@ let ActivityRideService = (() => {
                 info.push({ title: 'Slope', data: [{ value: (0, utils_1.formatNumber)(slope, 1), unit: '%', info: slopeInfo }, elevationGain] });
             }
             info.push({ title: 'Heartrate', data: [{ value: (0, utils_1.formatNumber)(heartrate, 0), unit: 'bpm' }, heartrateDetails], dataState: this.current.dataState?.heartrate });
-            info.push({ title: 'Cadence', data: [{ value: (0, utils_1.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: (0, utils_1.formatNumber)(cadence, 0), unit: cadenceUnit }, cadenceDetails], dataState: this.current.dataState?.cadence };
+            info.push(cadenceInfo);
             if (gear) {
                 info.push({ title: 'Gear', data: [{ value: gear }] });
             }
@@ -334,7 +369,11 @@ let ActivityRideService = (() => {
                 const [C, U] = this.getUnitConversionShortcuts();
                 const stats = this.activity?.stats;
                 const maxSpeed = stats?.speed?.max;
-                const speedDetails = { value: (0, utils_1.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: (0, utils_1.formatNumber)(C(maxSpeed, 'speed'), 1), label: 'max' } :
+                    { value: data.value, label: 'max' };
                 const powerDetails = { value: (0, utils_1.formatNumber)(stats?.power?.max, 0), label: 'max' };
                 const heartrateDetails = { value: (0, utils_1.formatNumber)(stats?.hrm?.max, 0), label: 'max' };
                 const cadenceDetails = { value: (0, utils_1.formatNumber)(stats?.cadence?.max, 0), label: 'max' };
@@ -351,7 +390,11 @@ let ActivityRideService = (() => {
                 const [C, U] = this.getUnitConversionShortcuts();
                 const stats = this.activity?.stats;
                 const avgSpeed = stats?.speed?.avg;
-                const speedDetails = { value: (0, utils_1.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: (0, utils_1.formatNumber)(C(avgSpeed, 'speed'), 1), label: 'avg' } :
+                    { value: data.value, label: 'max' };
                 const powerDetails = { value: (0, utils_1.formatNumber)(stats?.power?.avg, 0), label: 'avg' };
                 const heartrateDetails = { value: (0, utils_1.formatNumber)(stats?.hrm?.avg, 0), label: 'avg' };
                 const cadenceDetails = { value: (0, utils_1.formatNumber)(stats?.cadence?.avg, 0), label: 'avg' };
@@ -466,47 +509,17 @@ let ActivityRideService = (() => {
             };
             const run = async () => {
                 await (0, sleep_1.sleep)(5);
-                let cntCompleted = 0;
                 let success = false;
-                const localEmitter = new node_events_1.EventEmitter();
-                const incCompleted = () => {
-                    cntCompleted++;
-                    if (cntCompleted >= 2) {
-                        localEmitter.emit('completed');
-                    }
-                };
-                localEmitter.once('completed', () => {
-                    (0, sleep_1.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();
+                    (0, sleep_1.sleep)(0).then(() => {
+                        delete this.saveObserver;
+                    });
                     this.isSaveDone = true;
                 }
                 catch {
-                    cntCompleted++;
                     success = false;
                 }
                 emit('done', success);
@@ -836,6 +849,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;
         }
@@ -1003,7 +1039,8 @@ let ActivityRideService = (() => {
                         this.current.position = undefined;
                     }
             }
-            const title = base_1.DEFAULT_ACTIVITY_TITLE;
+            const sport = this.getDeviceRide().getSport() ?? 'cycling';
+            const title = base_1.DEFAULT_SPORT_ACTIVITY_TITLE[sport];
             const id = requestedId ?? (0, uuid_1.v4)();
             const date = (0, utils_1.formatDateTime)(new Date(), "%Y%m%d%H%M%S", false);
             const name = `${title}-${date}`;
@@ -1030,7 +1067,8 @@ let ActivityRideService = (() => {
                 totalElevation: 0,
                 logs: [],
                 startPos, endPos, segment, realityFactor,
-                fileName
+                fileName,
+                sport
             };
             return activity;
         }

package/lib/cjs/api/rest/api.js

@@ -12,7 +12,7 @@ class ApiClient {
     logger;
     requests;
     init(props) {
-        const { uuid, apiKey, requestLog = true, version, appVersion, channel = 'desktop' } = props;
+        const { uuid, apiKey, requestLog = true, version, appVersion, channel = 'desktop', platform } = props;
         const headers = {
             "X-uuid": uuid,
             "X-API-Key": apiKey,
@@ -20,6 +20,9 @@ class ApiClient {
             "x-app-version": appVersion,
             "x-react-version": version
         };
+        if (platform) {
+            headers['x-app-platform'] = platform;
+        }
         this.axios = axios_1.default.create({ headers });
         if (requestLog) {
             this.logger = new gd_eventlog_1.EventLogger('API');

package/lib/cjs/api/rest/incyclist.js

@@ -20,6 +20,7 @@ class IncyclistRestApiClient {
             channel: appInfo?.getChannel(),
             appVersion: appInfo?.getAppVersion(),
             version: appInfo?.getUIVersion(),
+            platform: appInfo?.getOS()?.platform,
             requestLog: requestLog ?? true,
             apiKey,
             uuid

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

@@ -135,7 +135,6 @@ let DeviceRideService = (() => {
             return this.data;
         }
         pauseLogging() {
-            console.log('# PAUSE LOGGING');
             this.logPaused = true;
             const interfaces = this.getEnabledInterfaces();
             interfaces.forEach(i => i.pauseLogging());
@@ -145,7 +144,6 @@ let DeviceRideService = (() => {
                 .forEach(a => a.pauseLogging());
         }
         resumeLogging() {
-            console.log('# RESUME LOGGING');
             this.logPaused = false;
             const interfaces = this.getEnabledInterfaces();
             interfaces.forEach(i => i.resumeLogging());
@@ -927,6 +925,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/cjs/ride/display/service.js

@@ -306,7 +306,7 @@ let RideDisplayService = (() => {
         toggleLeftSideView() {
             this.toggleOverlay('sv-left');
         }
-        hideRightSideView() {
+        toggleRightSideView() {
             this.toggleOverlay('sv-right');
         }
         onArrowKey(event) {

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

@@ -33,6 +33,9 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeRideDisplayService = void 0;
 const activities_1 = require("../../activities");
@@ -44,13 +47,8 @@ const route_1 = require("../../routes/base/model/route");
 const geo_1 = require("../../utils/geo");
 const GpxDisplayService_1 = require("./GpxDisplayService");
 const utils_2 = require("../../utils");
-const pathInfo = (path) => {
-    return path.map(p => {
-        const pp = p;
-        const id = pp.id ?? '{lat:' + Number(p.lat).toFixed(4) + ',lng:' + Number(p.lng).toFixed(4) + '}';
-        return `${p.cnt},${p.routeDistance.toFixed(0)},${id})`;
-    });
-};
+const node_events_1 = __importDefault(require("node:events"));
+const sleep_1 = require("../../utils/sleep");
 const DEFAULT_OPTIONS_DELAY = 5000;
 let FreeRideDisplayService = (() => {
     let _classSuper = GpxDisplayService_1.GpxDisplayService;
@@ -85,6 +83,7 @@ let FreeRideDisplayService = (() => {
         onViewportChange = this.saveViewport.bind(this);
         onOptionsVisibleChangedHandler = this.onOptionsVisibleChanged.bind(this);
         onTurnHandler = this.onTurn.bind(this);
+        internalEmitter = new node_events_1.default();
         start() {
             try {
                 super.start();
@@ -409,13 +408,29 @@ let FreeRideDisplayService = (() => {
             return false;
         }
         getNextOptions(forStart) {
+            let options;
+            const freeRide = this.getFreeRideService();
+            const getOptions = async () => {
+                let finished = false;
+                const setFinished = () => { finished = true; };
+                this.internalEmitter.on('stop-query', setFinished);
+                do {
+                    try {
+                        options = await freeRide.getNextOptions(forStart);
+                    }
+                    catch (err) {
+                        this.logError(err, 'getNextOptions');
+                        options = undefined;
+                    }
+                    if (!options?.length && !finished && !forStart) {
+                        this.logEvent({ message: 'no options available - retry in 3000ms', });
+                        await (0, sleep_1.sleep)(3000);
+                    }
+                } while (!options?.length && !finished && !forStart);
+                this.internalEmitter.off('stop-query', setFinished);
+            };
             return new Promise(done => {
-                const freeRide = this.getFreeRideService();
-                freeRide.getNextOptions(forStart)
-                    .catch(err => {
-                    this.logError(err, 'getNextOptions');
-                    done();
-                })
+                getOptions()
                     .then(() => {
                     done();
                     if (this.isStarting) {
@@ -489,9 +504,15 @@ let FreeRideDisplayService = (() => {
                     const prev = { ...this.position, totalDistance: this.position.routeDistance };
                     let route = this.route;
                     if (newRouteDistance > route.description.distance) {
+                        this.internalEmitter.emit('stop-query');
                         route = this.route.clone();
                         const selectedOption = this.getFreeRideService().getSelectedOption();
-                        this.appendOption(route, selectedOption);
+                        if (selectedOption)
+                            this.appendOption(route, selectedOption);
+                        else {
+                            this.logEvent({ message: 'no continuation available' });
+                            return this.position;
+                        }
                     }
                     const nextPos = (0, routes_1.getNextPosition)(route, { routeDistance: activityPos.routeDistance, prev });
                     if (!nextPos) {

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

@@ -206,8 +206,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/cjs/routes/base/parsers/epm.js

@@ -10,6 +10,12 @@ class EPMParser extends xml_1.XMLParser {
     supportsExtension(extension) {
         return extension.toLowerCase() === 'epm';
     }
+    getPrimaryExtension() {
+        return 'epm';
+    }
+    getCompanionExtensions() {
+        return ['epp'];
+    }
     async loadPoints(context) {
         const { data, route } = context;
         route.points = [];

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

@@ -24,6 +24,11 @@ class ParserFactory {
             throw new Error(`invalid file format ${extension}`);
         return matching;
     }
+    isPrimaryExtension(extension) {
+        const ext = extension.toLowerCase();
+        const isPrimary = this.parsers.some(p => p.getPrimaryExtension() === ext);
+        return isPrimary;
+    }
     findMatching(extension, data) {
         const matching = this.parsers
             .filter(p => p.supportsExtension(extension))

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

@@ -52,6 +52,12 @@ let GeometryParser = (() => {
             const geometry = await this.getData(file, data);
             return await this.parse(file, geometry);
         }
+        getPrimaryExtension() {
+            return 'xml';
+        }
+        getCompanionExtensions() {
+            return [];
+        }
         supportsExtension(extension) {
             return extension.toLowerCase() === 'json';
         }

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

@@ -14,6 +14,12 @@ class GPXParser extends xml_1.XMLParser {
         super();
         this.props = props;
     }
+    getPrimaryExtension() {
+        return 'gpx';
+    }
+    getCompanionExtensions() {
+        return [];
+    }
     supportsExtension(extension) {
         return extension.toLowerCase() === 'gpx';
     }

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

@@ -20,6 +20,12 @@ class MultipleXMLParser {
     supportsExtension(extension) {
         return extension?.toLowerCase() === 'xml';
     }
+    getPrimaryExtension() {
+        return 'xml';
+    }
+    getCompanionExtensions() {
+        return [];
+    }
     supportsContent() {
         return true;
     }

package/lib/cjs/routes/base/parsers/tacx/TacxParser.js

@@ -39,6 +39,12 @@ class TacxParser {
     supportsContent(data) {
         return TacxReader_1.TacxFileReader.isValid(data);
     }
+    getPrimaryExtension() {
+        return 'rlv';
+    }
+    getCompanionExtensions() {
+        return ['pgmf'];
+    }
     buildContext(file) {
         const { dir, delimiter: d } = file;
         if (file.ext === 'rlv') {