incyclist-services 1.7.119 → 1.7.121

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

@@ -342,6 +342,7 @@ let ActiveRidesService = (() => {
                         return;
                     const displayItem = {
                         isUser: item.sessionId === this.session,
+                        isCoach: item.isCoach,
                         name: this.getName(item),
                         diffDistance: this.getDistanceDiff(item),
                         distance: this.getDistance(item),
@@ -685,6 +686,7 @@ let ActiveRidesService = (() => {
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -762,6 +764,7 @@ let ActiveRidesService = (() => {
                         this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                     }
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -784,8 +787,10 @@ let ActiveRidesService = (() => {
             if (!this.others?.length)
                 return;
             const idx = this.others.findIndex(ar => ar.sessionId === session);
-            if (idx !== -1)
-                this.others.splice(idx, 1);
+            if (idx === -1)
+                return;
+            this.others.splice(idx, 1);
+            this.observer.emit('update', this.getDisplayProps());
             if (!this.isStarted)
                 return;
             if (this.others.length === 0) {

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

@@ -47,6 +47,7 @@ const Injection_1 = require("../../../base/decorators/Injection");
 const i18n_1 = require("../../../i18n");
 exports.DB_VERSION = '5';
 exports.DB_NAME = 'db';
+const SHORT_RIDE_FILTER_CUTOFF = new Date('2026-08-28').getTime();
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -109,7 +110,7 @@ let ActivitiesRepository = (() => {
                 this.write();
             }
             if (writeDetails) {
-                this.writeDetails(activity);
+                await this.writeDetails(activity);
             }
         }
         migrate(activity, writeSummary = true) {
@@ -224,6 +225,16 @@ let ActivitiesRepository = (() => {
         }
         search(criteria) {
             let result = this.activities;
+            if (!this.isMobile()) {
+                result = result?.filter(ai => {
+                    const { rideTime, startTime } = ai.summary;
+                    if (rideTime < 1)
+                        return false;
+                    if (rideTime <= 30 && startTime < SHORT_RIDE_FILTER_CUTOFF)
+                        return false;
+                    return true;
+                });
+            }
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);
@@ -475,7 +486,7 @@ let ActivitiesRepository = (() => {
         }
         async writeDetails(activity) {
             const name = activity.summary.name;
-            this.getRepo().write(name, activity.details);
+            await this.getRepo().write(name, activity.details);
         }
         async scanForNewActivities() {
             try {
@@ -509,6 +520,13 @@ let ActivitiesRepository = (() => {
         getRouteList() {
             return (0, routes_1.useRouteList)();
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            return appInfo?.getChannel() === 'mobile';
+        }
         getBindings() {
             return (0, api_1.getBindings)();
         }

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

@@ -254,7 +254,7 @@ let Activity = (() => {
         isRouteAvailable() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             return this.getRouteList().getRouteDescription(this.details.route.id) !== undefined;
         }
@@ -277,7 +277,7 @@ let Activity = (() => {
         canStart() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             if (this.details.routeType === 'Video') {
                 const isOnline = this.getOnlineMonitoring().onlineStatus;

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

@@ -198,7 +198,7 @@ let ActivityRideService = (() => {
             this.disableDeviceHealthCheck();
             this.state = 'completed';
             this.updateActivityTime();
-            this._save();
+            await this._save();
             this.emit('completed');
             this.tsPauseStart = undefined;
             delete this.tsStart;
@@ -536,7 +536,7 @@ let ActivityRideService = (() => {
             if (this.state !== 'completed') {
                 await this.stop();
             }
-            this.getRepo().delete(this.activity.id);
+            await this.getRepo().delete(this.activity.id);
             this.state = 'idle';
         }
         save() {
@@ -552,7 +552,7 @@ let ActivityRideService = (() => {
                 let success = false;
                 try {
                     emit('start', success);
-                    await this._save();
+                    this._save();
                     success = await this._convertAndUpload();
                     (0, sleep_1.sleep)(0).then(() => {
                         delete this.saveObserver;
@@ -965,7 +965,7 @@ let ActivityRideService = (() => {
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
-                await this._save();
+                this._save();
                 emit('save.done', format, true);
                 return true;
             }

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

@@ -397,7 +397,7 @@ let DevicePairingService = (() => {
                 if (this.isScanning())
                     await this.stopScanning();
             }
-            this.state.capabilities.forEach(c => c.connectState = 'waiting');
+            (this.state.capabilities ?? []).forEach(c => c.connectState = 'waiting');
             this.state.waiting = true;
         }
         getCapability(capability) {
@@ -1361,7 +1361,7 @@ let DevicePairingService = (() => {
         pauseAdapters(adapters, enforced = false) {
             if (!adapters)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!enforced && !c.selected && c.connectState === 'failed')
                     return;
@@ -1372,7 +1372,7 @@ let DevicePairingService = (() => {
         resumeAdapters(adapters = this.state.adapters) {
             if (!adapters?.length)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!c.selected && c.connectState === 'failed')
                     return;

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

@@ -22,8 +22,11 @@ function isVirtualShiftingEnabled(mode) {
 function getLoadButtonMode(mode) {
     if (!mode)
         return 'power';
-    if (mode.isSIM() || mode.isResistance()) {
-        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
-    }
-    return 'power';
+    if (mode.isERG())
+        return 'power';
+    if (mode.isSIM() && isVirtualShiftingEnabled(mode))
+        return 'gear';
+    if (mode.isResistance())
+        return 'gear';
+    return 'hidden';
 }

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

@@ -39,6 +39,7 @@ const gd_eventlog_1 = require("gd-eventlog");
 const decorators_1 = require("../../base/decorators");
 const pages_1 = require("../../base/pages");
 const display_1 = require("../display");
+const devices_1 = require("../../devices");
 const sleep_1 = require("../../utils/sleep");
 const monitoring_1 = require("../../monitoring");
 const activities_1 = require("../../activities");
@@ -64,6 +65,7 @@ let RidePageService = (() => {
     let _getActivityRide_decorators;
     let _getUserSettings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getDeviceConfiguration_decorators;
     var RidePageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -73,11 +75,13 @@ let RidePageService = (() => {
             _getActivityRide_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getOnlineStatusMonitoring_decorators = [decorators_1.Injectable];
+            _getDeviceConfiguration_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRideDisplay_decorators, { kind: "method", name: "getRideDisplay", static: false, private: false, access: { has: obj => "getRideDisplay" in obj, get: obj => obj.getRideDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutRide_decorators, { kind: "method", name: "getWorkoutRide", static: false, private: false, access: { has: obj => "getWorkoutRide" in obj, get: obj => obj.getWorkoutRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getActivityRide_decorators, { kind: "method", name: "getActivityRide", static: false, private: false, access: { has: obj => "getActivityRide" in obj, get: obj => obj.getActivityRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __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);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RidePageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -92,10 +96,13 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        onDeviceModeChangedBound = this.onDeviceModeChanged.bind(this);
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
         prevRidesShown = false;
+        nearbyRiders;
+        nearbyRidersSubscribed = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
@@ -137,12 +144,14 @@ let RidePageService = (() => {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
                 this.prevRidesShown = false;
+                this.nearbyRidersSubscribed = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        this.getDeviceConfiguration().on('mode-changed', this.onDeviceModeChangedBound);
                         const state = service.getState();
                         if (state === 'Started' || state === 'Active' || state === 'Paused') {
                             this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
@@ -187,6 +196,7 @@ let RidePageService = (() => {
                 this.getRideDisplay().stop();
                 this.unregisterHandlers(this.rideObserver, this.eventHandler);
                 this.unsubscribeFromWorkoutObserver();
+                this.getDeviceConfiguration().off('mode-changed', this.onDeviceModeChangedBound);
                 this.menuProps = null;
                 this.isInitialized = false;
                 super.closePage();
@@ -278,9 +288,11 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
+                const loadControl = this.getLoadControlProps();
+                const showRideSettings = !this.isRideType('Workout');
                 this.menuProps = this.isWorkoutAttached()
-                    ? { showResume: state === 'Paused', ...this.getStepFlags() }
-                    : { showResume: state === 'Paused' };
+                    ? { showResume: state === 'Paused', ...this.getStepFlags(), loadControl, showRideSettings }
+                    : { showResume: state === 'Paused', loadControl, showRideSettings };
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -397,7 +409,7 @@ let RidePageService = (() => {
                 const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 return available.includes(current) ? current : available[0];
             }
             catch (err) {
@@ -414,7 +426,7 @@ let RidePageService = (() => {
         onToggleCornerWidget() {
             try {
                 const available = this.getCornerWidgetStates();
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
@@ -583,8 +595,7 @@ let RidePageService = (() => {
                 const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
                 if (plainErgAdjustment) {
                     const sign = deltaPct >= 0 ? 1 : -1;
-                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
-                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                    return this.getRideDisplay().adjustDevicePower(sign * this.getNominalErgWatts(deltaPct));
                 }
                 return deltaPct >= 0
                     ? this.getWorkoutRide().powerUp(deltaPct)
@@ -764,6 +775,40 @@ let RidePageService = (() => {
             const wo = this.getWorkoutRide().getDashboardDisplayProperties();
             return { canStepBack: !!wo.canShowBackward, canStepForward: !!wo.canShowForward };
         }
+        getLoadControlProps() {
+            const mode = this.getLoadButtonMode();
+            if (mode === 'hidden')
+                return { visible: false };
+            if (mode === 'gear')
+                return { visible: true, label: 'Gear', buttons: { inc1: '+1', dec1: '-1', inc5: '+5', dec5: '-5' } };
+            if (this.isWorkoutAttached()) {
+                const buttons = this.getWorkoutRide().getDashboardDisplayProperties().loadButtons;
+                return { visible: true, label: 'Load', buttons };
+            }
+            const small = this.getNominalErgWatts(1);
+            const big = this.getNominalErgWatts(5);
+            return {
+                visible: true,
+                label: 'Load',
+                buttons: { inc1: `+${small}W`, dec1: `-${small}W`, inc5: `+${big}W`, dec5: `-${big}W` }
+            };
+        }
+        getNominalErgWatts(magnitude) {
+            return Math.abs(magnitude) === 1 ? 5 : 50;
+        }
+        onDeviceModeChanged() {
+            setTimeout(() => {
+                try {
+                    if (!this.menuProps)
+                        return;
+                    this.menuProps = { ...this.menuProps, loadControl: this.getLoadControlProps() };
+                    this.updatePageDisplay();
+                }
+                catch (err) {
+                    this.logError(err, 'onDeviceModeChanged');
+                }
+            }, 0);
+        }
         getLastLogTime() {
             const logs = this.getActivityRide().getActivity()?.logs;
             if (!logs || logs.length === 0)
@@ -820,14 +865,18 @@ let RidePageService = (() => {
             }
         }
         buildPausedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: true, ...this.getStepFlags() }
-                : { showResume: true };
+                ? { showResume: true, ...this.getStepFlags(), loadControl, showRideSettings }
+                : { showResume: true, loadControl, showRideSettings };
         }
         buildFinishedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
-                : { showResume: false, finished: true };
+                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false, loadControl, showRideSettings }
+                : { showResume: false, finished: true, loadControl, showRideSettings };
         }
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
@@ -842,7 +891,8 @@ let RidePageService = (() => {
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
                 loadButtonMode: this.getLoadButtonMode(),
-                prevRides: this.buildPrevRides()
+                prevRides: this.buildPrevRides(),
+                nearbyRiders: this.nearbyRiders
             };
         }
         buildPrevRides() {
@@ -905,8 +955,55 @@ let RidePageService = (() => {
                 tsStart: row.tsStart
             };
         }
+        subscribeToNearbyRiders() {
+            try {
+                if (this.nearbyRidersSubscribed)
+                    return;
+                const observer = this.getActiveRidesObserver();
+                if (!observer)
+                    return;
+                observer.on('update', (rows) => {
+                    this.nearbyRiders = { rows: (rows ?? []).map(row => this.mapNearbyRiderRow(row)) };
+                    this.rideObserver?.emit('nearby-riders-update', this.nearbyRiders);
+                    this.updatePageDisplay();
+                });
+                this.nearbyRidersSubscribed = true;
+            }
+            catch (err) {
+                this.logError(err, 'subscribeToNearbyRiders');
+            }
+        }
+        mapNearbyRiderRow(row) {
+            return {
+                isUser: !!row.isUser,
+                isPaused: !!row.isPaused,
+                isCoach: !!row.isCoach,
+                name: row.name,
+                distance: row.distance ?? { value: 0, unit: '' },
+                diffDistance: row.diffDistance ?? { value: 0, unit: '' },
+                power: row.power,
+                mpower: row.mpower,
+                speed: row.speed,
+                avatar: row.avatar,
+                backgroundColor: row.backgroundColor,
+                textColor: row.textColor,
+                lat: row.lat,
+                lng: row.lng
+            };
+        }
+        getActiveRidesObserver() {
+            try {
+                const modeService = this.getRideDisplay()?.getRideModeService?.();
+                return modeService?.getActiveRidesObserver?.();
+            }
+            catch (err) {
+                this.logError(err, 'getActiveRidesObserver');
+                return undefined;
+            }
+        }
         onDisplayStateUpdate(state) {
             this.subscribeToWorkoutObserver();
+            this.subscribeToNearbyRiders();
             switch (state) {
                 case 'Paused':
                     this.menuProps = this.buildPausedMenuProps();
@@ -961,6 +1058,9 @@ let RidePageService = (() => {
         getOnlineStatusMonitoring() {
             return (0, monitoring_1.useOnlineStatusMonitoring)();
         }
+        getDeviceConfiguration() {
+            return (0, devices_1.useDeviceConfiguration)();
+        }
     };
     return RidePageService = _classThis;
 })();

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

@@ -83,6 +83,7 @@ let RouteDisplayService = (() => {
         prevPowerTs;
         nearbyRiders;
         _startSettings;
+        activeRidesObserver;
         init(service) {
             try {
                 super.init(service);
@@ -369,6 +370,7 @@ let RouteDisplayService = (() => {
             const session = this.getAppInfo().session;
             try {
                 const observer = this.getActiveRides().init(session);
+                this.activeRidesObserver = observer;
                 observer.on('update', (data) => {
                     this.nearbyRiders = data.filter(ar => !ar.isUser);
                 });
@@ -380,11 +382,15 @@ let RouteDisplayService = (() => {
         cleanupActiveRides() {
             try {
                 this.getActiveRides().stop();
+                delete this.activeRidesObserver;
             }
             catch (err) {
                 this.logError(err, 'cleanupActiveRides');
             }
         }
+        getActiveRidesObserver() {
+            return this.activeRidesObserver;
+        }
         savePosition(_startPos) {
         }
         getOriginalRoute() {

package/lib/cjs/routes/list/service.js

@@ -609,6 +609,8 @@ let RouteListService = (() => {
         }
         getRouteDescription(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id)?.description;
             }
             catch (err) {
@@ -617,6 +619,8 @@ let RouteListService = (() => {
         }
         getRoute(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id);
             }
             catch (err) {

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

@@ -339,6 +339,7 @@ let ActiveRidesService = (() => {
                         return;
                     const displayItem = {
                         isUser: item.sessionId === this.session,
+                        isCoach: item.isCoach,
                         name: this.getName(item),
                         diffDistance: this.getDistanceDiff(item),
                         distance: this.getDistance(item),
@@ -682,6 +683,7 @@ let ActiveRidesService = (() => {
                 if (!payload.user) {
                     this.getRemoteActivityDetails(session);
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -759,6 +761,7 @@ let ActiveRidesService = (() => {
                         this.logEvent({ message: 'group ride user joined', active: this.others.length + 1, activityId: this.activity?.id, route: this.activity.route?.title, routeHash: this.getRouteHash(), remote });
                     }
                 }
+                this.observer.emit('update', this.getDisplayProps());
             }
             catch (err) {
                 this.logError(err, 'onActivityStartEvent');
@@ -781,8 +784,10 @@ let ActiveRidesService = (() => {
             if (!this.others?.length)
                 return;
             const idx = this.others.findIndex(ar => ar.sessionId === session);
-            if (idx !== -1)
-                this.others.splice(idx, 1);
+            if (idx === -1)
+                return;
+            this.others.splice(idx, 1);
+            this.observer.emit('update', this.getDisplayProps());
             if (!this.isStarted)
                 return;
             if (this.others.length === 0) {

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

@@ -44,6 +44,7 @@ import { Injectable } from "../../../base/decorators/Injection";
 import { useUnitConverter } from "../../../i18n";
 export const DB_VERSION = '5';
 export const DB_NAME = 'db';
+const SHORT_RIDE_FILTER_CUTOFF = new Date('2026-08-28').getTime();
 let ActivitiesRepository = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -106,7 +107,7 @@ let ActivitiesRepository = (() => {
                 this.write();
             }
             if (writeDetails) {
-                this.writeDetails(activity);
+                await this.writeDetails(activity);
             }
         }
         migrate(activity, writeSummary = true) {
@@ -221,6 +222,16 @@ let ActivitiesRepository = (() => {
         }
         search(criteria) {
             let result = this.activities;
+            if (!this.isMobile()) {
+                result = result?.filter(ai => {
+                    const { rideTime, startTime } = ai.summary;
+                    if (rideTime < 1)
+                        return false;
+                    if (rideTime <= 30 && startTime < SHORT_RIDE_FILTER_CUTOFF)
+                        return false;
+                    return true;
+                });
+            }
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);
@@ -472,7 +483,7 @@ let ActivitiesRepository = (() => {
         }
         async writeDetails(activity) {
             const name = activity.summary.name;
-            this.getRepo().write(name, activity.details);
+            await this.getRepo().write(name, activity.details);
         }
         async scanForNewActivities() {
             try {
@@ -506,6 +517,13 @@ let ActivitiesRepository = (() => {
         getRouteList() {
             return useRouteList();
         }
+        isMobile() {
+            const { appInfo } = this.getBindings();
+            if (!appInfo) {
+                return false;
+            }
+            return appInfo?.getChannel() === 'mobile';
+        }
         getBindings() {
             return getBindings();
         }

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

@@ -251,7 +251,7 @@ let Activity = (() => {
         isRouteAvailable() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             return this.getRouteList().getRouteDescription(this.details.route.id) !== undefined;
         }
@@ -274,7 +274,7 @@ let Activity = (() => {
         canStart() {
             if (!this.details?.route)
                 return false;
-            if (this.details.routeType === 'Free-Ride')
+            if (this.details.routeType === 'Free-Ride' || this.details.routeType === 'None')
                 return false;
             if (this.details.routeType === 'Video') {
                 const isOnline = this.getOnlineMonitoring().onlineStatus;

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

@@ -192,7 +192,7 @@ let ActivityRideService = (() => {
             this.disableDeviceHealthCheck();
             this.state = 'completed';
             this.updateActivityTime();
-            this._save();
+            await this._save();
             this.emit('completed');
             this.tsPauseStart = undefined;
             delete this.tsStart;
@@ -530,7 +530,7 @@ let ActivityRideService = (() => {
             if (this.state !== 'completed') {
                 await this.stop();
             }
-            this.getRepo().delete(this.activity.id);
+            await this.getRepo().delete(this.activity.id);
             this.state = 'idle';
         }
         save() {
@@ -546,7 +546,7 @@ let ActivityRideService = (() => {
                 let success = false;
                 try {
                     emit('start', success);
-                    await this._save();
+                    this._save();
                     success = await this._convertAndUpload();
                     sleep(0).then(() => {
                         delete this.saveObserver;
@@ -959,7 +959,7 @@ let ActivityRideService = (() => {
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
-                await this._save();
+                this._save();
                 emit('save.done', format, true);
                 return true;
             }

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

@@ -391,7 +391,7 @@ let DevicePairingService = (() => {
                 if (this.isScanning())
                     await this.stopScanning();
             }
-            this.state.capabilities.forEach(c => c.connectState = 'waiting');
+            (this.state.capabilities ?? []).forEach(c => c.connectState = 'waiting');
             this.state.waiting = true;
         }
         getCapability(capability) {
@@ -1355,7 +1355,7 @@ let DevicePairingService = (() => {
         pauseAdapters(adapters, enforced = false) {
             if (!adapters)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!enforced && !c.selected && c.connectState === 'failed')
                     return;
@@ -1366,7 +1366,7 @@ let DevicePairingService = (() => {
         resumeAdapters(adapters = this.state.adapters) {
             if (!adapters?.length)
                 return;
-            const capabilities = this.state.capabilities;
+            const capabilities = this.state.capabilities ?? [];
             capabilities.forEach(c => {
                 if (!c.selected && c.connectState === 'failed')
                     return;

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

@@ -18,8 +18,11 @@ export function isVirtualShiftingEnabled(mode) {
 export function getLoadButtonMode(mode) {
     if (!mode)
         return 'power';
-    if (mode.isSIM() || mode.isResistance()) {
-        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
-    }
-    return 'power';
+    if (mode.isERG())
+        return 'power';
+    if (mode.isSIM() && isVirtualShiftingEnabled(mode))
+        return 'gear';
+    if (mode.isResistance())
+        return 'gear';
+    return 'hidden';
 }

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

@@ -36,6 +36,7 @@ import { EventLogger } from "gd-eventlog";
 import { Injectable, Singleton } from "../../base/decorators";
 import { IncyclistPageService } from "../../base/pages";
 import { useRideDisplay } from "../display";
+import { useDeviceConfiguration } from "../../devices";
 import { sleep } from "../../utils/sleep";
 import { useOnlineStatusMonitoring } from "../../monitoring";
 import { useActivityRide } from "../../activities";
@@ -61,6 +62,7 @@ let RidePageService = (() => {
     let _getActivityRide_decorators;
     let _getUserSettings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getDeviceConfiguration_decorators;
     var RidePageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -70,11 +72,13 @@ let RidePageService = (() => {
             _getActivityRide_decorators = [Injectable];
             _getUserSettings_decorators = [Injectable];
             _getOnlineStatusMonitoring_decorators = [Injectable];
+            _getDeviceConfiguration_decorators = [Injectable];
             __esDecorate(this, null, _getRideDisplay_decorators, { kind: "method", name: "getRideDisplay", static: false, private: false, access: { has: obj => "getRideDisplay" in obj, get: obj => obj.getRideDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutRide_decorators, { kind: "method", name: "getWorkoutRide", static: false, private: false, access: { has: obj => "getWorkoutRide" in obj, get: obj => obj.getWorkoutRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getActivityRide_decorators, { kind: "method", name: "getActivityRide", static: false, private: false, access: { has: obj => "getActivityRide" in obj, get: obj => obj.getActivityRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __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);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RidePageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -89,10 +93,13 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        onDeviceModeChangedBound = this.onDeviceModeChanged.bind(this);
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
         prevRidesShown = false;
+        nearbyRiders;
+        nearbyRidersSubscribed = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
@@ -134,12 +141,14 @@ let RidePageService = (() => {
                 EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
                 this.prevRidesShown = false;
+                this.nearbyRidersSubscribed = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        this.getDeviceConfiguration().on('mode-changed', this.onDeviceModeChangedBound);
                         const state = service.getState();
                         if (state === 'Started' || state === 'Active' || state === 'Paused') {
                             this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
@@ -184,6 +193,7 @@ let RidePageService = (() => {
                 this.getRideDisplay().stop();
                 this.unregisterHandlers(this.rideObserver, this.eventHandler);
                 this.unsubscribeFromWorkoutObserver();
+                this.getDeviceConfiguration().off('mode-changed', this.onDeviceModeChangedBound);
                 this.menuProps = null;
                 this.isInitialized = false;
                 super.closePage();
@@ -275,9 +285,11 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
+                const loadControl = this.getLoadControlProps();
+                const showRideSettings = !this.isRideType('Workout');
                 this.menuProps = this.isWorkoutAttached()
-                    ? { showResume: state === 'Paused', ...this.getStepFlags() }
-                    : { showResume: state === 'Paused' };
+                    ? { showResume: state === 'Paused', ...this.getStepFlags(), loadControl, showRideSettings }
+                    : { showResume: state === 'Paused', loadControl, showRideSettings };
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -394,7 +406,7 @@ let RidePageService = (() => {
                 const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 return available.includes(current) ? current : available[0];
             }
             catch (err) {
@@ -411,7 +423,7 @@ let RidePageService = (() => {
         onToggleCornerWidget() {
             try {
                 const available = this.getCornerWidgetStates();
-                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'workout');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
@@ -580,8 +592,7 @@ let RidePageService = (() => {
                 const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
                 if (plainErgAdjustment) {
                     const sign = deltaPct >= 0 ? 1 : -1;
-                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
-                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                    return this.getRideDisplay().adjustDevicePower(sign * this.getNominalErgWatts(deltaPct));
                 }
                 return deltaPct >= 0
                     ? this.getWorkoutRide().powerUp(deltaPct)
@@ -761,6 +772,40 @@ let RidePageService = (() => {
             const wo = this.getWorkoutRide().getDashboardDisplayProperties();
             return { canStepBack: !!wo.canShowBackward, canStepForward: !!wo.canShowForward };
         }
+        getLoadControlProps() {
+            const mode = this.getLoadButtonMode();
+            if (mode === 'hidden')
+                return { visible: false };
+            if (mode === 'gear')
+                return { visible: true, label: 'Gear', buttons: { inc1: '+1', dec1: '-1', inc5: '+5', dec5: '-5' } };
+            if (this.isWorkoutAttached()) {
+                const buttons = this.getWorkoutRide().getDashboardDisplayProperties().loadButtons;
+                return { visible: true, label: 'Load', buttons };
+            }
+            const small = this.getNominalErgWatts(1);
+            const big = this.getNominalErgWatts(5);
+            return {
+                visible: true,
+                label: 'Load',
+                buttons: { inc1: `+${small}W`, dec1: `-${small}W`, inc5: `+${big}W`, dec5: `-${big}W` }
+            };
+        }
+        getNominalErgWatts(magnitude) {
+            return Math.abs(magnitude) === 1 ? 5 : 50;
+        }
+        onDeviceModeChanged() {
+            setTimeout(() => {
+                try {
+                    if (!this.menuProps)
+                        return;
+                    this.menuProps = { ...this.menuProps, loadControl: this.getLoadControlProps() };
+                    this.updatePageDisplay();
+                }
+                catch (err) {
+                    this.logError(err, 'onDeviceModeChanged');
+                }
+            }, 0);
+        }
         getLastLogTime() {
             const logs = this.getActivityRide().getActivity()?.logs;
             if (!logs || logs.length === 0)
@@ -817,14 +862,18 @@ let RidePageService = (() => {
             }
         }
         buildPausedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: true, ...this.getStepFlags() }
-                : { showResume: true };
+                ? { showResume: true, ...this.getStepFlags(), loadControl, showRideSettings }
+                : { showResume: true, loadControl, showRideSettings };
         }
         buildFinishedMenuProps() {
+            const loadControl = this.getLoadControlProps();
+            const showRideSettings = !this.isRideType('Workout');
             return this.isWorkoutAttached()
-                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
-                : { showResume: false, finished: true };
+                ? { showResume: false, finished: true, canStepBack: false, canStepForward: false, loadControl, showRideSettings }
+                : { showResume: false, finished: true, loadControl, showRideSettings };
         }
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
@@ -839,7 +888,8 @@ let RidePageService = (() => {
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
                 loadButtonMode: this.getLoadButtonMode(),
-                prevRides: this.buildPrevRides()
+                prevRides: this.buildPrevRides(),
+                nearbyRiders: this.nearbyRiders
             };
         }
         buildPrevRides() {
@@ -902,8 +952,55 @@ let RidePageService = (() => {
                 tsStart: row.tsStart
             };
         }
+        subscribeToNearbyRiders() {
+            try {
+                if (this.nearbyRidersSubscribed)
+                    return;
+                const observer = this.getActiveRidesObserver();
+                if (!observer)
+                    return;
+                observer.on('update', (rows) => {
+                    this.nearbyRiders = { rows: (rows ?? []).map(row => this.mapNearbyRiderRow(row)) };
+                    this.rideObserver?.emit('nearby-riders-update', this.nearbyRiders);
+                    this.updatePageDisplay();
+                });
+                this.nearbyRidersSubscribed = true;
+            }
+            catch (err) {
+                this.logError(err, 'subscribeToNearbyRiders');
+            }
+        }
+        mapNearbyRiderRow(row) {
+            return {
+                isUser: !!row.isUser,
+                isPaused: !!row.isPaused,
+                isCoach: !!row.isCoach,
+                name: row.name,
+                distance: row.distance ?? { value: 0, unit: '' },
+                diffDistance: row.diffDistance ?? { value: 0, unit: '' },
+                power: row.power,
+                mpower: row.mpower,
+                speed: row.speed,
+                avatar: row.avatar,
+                backgroundColor: row.backgroundColor,
+                textColor: row.textColor,
+                lat: row.lat,
+                lng: row.lng
+            };
+        }
+        getActiveRidesObserver() {
+            try {
+                const modeService = this.getRideDisplay()?.getRideModeService?.();
+                return modeService?.getActiveRidesObserver?.();
+            }
+            catch (err) {
+                this.logError(err, 'getActiveRidesObserver');
+                return undefined;
+            }
+        }
         onDisplayStateUpdate(state) {
             this.subscribeToWorkoutObserver();
+            this.subscribeToNearbyRiders();
             switch (state) {
                 case 'Paused':
                     this.menuProps = this.buildPausedMenuProps();
@@ -958,6 +1055,9 @@ let RidePageService = (() => {
         getOnlineStatusMonitoring() {
             return useOnlineStatusMonitoring();
         }
+        getDeviceConfiguration() {
+            return useDeviceConfiguration();
+        }
     };
     return RidePageService = _classThis;
 })();

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

@@ -77,6 +77,7 @@ let RouteDisplayService = (() => {
         prevPowerTs;
         nearbyRiders;
         _startSettings;
+        activeRidesObserver;
         init(service) {
             try {
                 super.init(service);
@@ -363,6 +364,7 @@ let RouteDisplayService = (() => {
             const session = this.getAppInfo().session;
             try {
                 const observer = this.getActiveRides().init(session);
+                this.activeRidesObserver = observer;
                 observer.on('update', (data) => {
                     this.nearbyRiders = data.filter(ar => !ar.isUser);
                 });
@@ -374,11 +376,15 @@ let RouteDisplayService = (() => {
         cleanupActiveRides() {
             try {
                 this.getActiveRides().stop();
+                delete this.activeRidesObserver;
             }
             catch (err) {
                 this.logError(err, 'cleanupActiveRides');
             }
         }
+        getActiveRidesObserver() {
+            return this.activeRidesObserver;
+        }
         savePosition(_startPos) {
         }
         getOriginalRoute() {

package/lib/esm/routes/list/service.js

@@ -603,6 +603,8 @@ let RouteListService = (() => {
         }
         getRouteDescription(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id)?.description;
             }
             catch (err) {
@@ -611,6 +613,8 @@ let RouteListService = (() => {
         }
         getRoute(id) {
             try {
+                if (!id)
+                    return undefined;
                 return this.getVisibleRoutes().find(r => r.description.id === id);
             }
             catch (err) {

package/lib/types/activities/active-rides/types.d.ts

@@ -78,6 +78,7 @@ export type ActiveRideListDisplayItem = {
     isUser?: boolean;
     avatar?: ActiveRideListAvatar;
     isPaused?: boolean;
+    isCoach?: boolean;
     name: string;
     distance?: number | {
         value: number;

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

@@ -55,6 +55,7 @@ export declare class ActivitiesRepository {
     protected logError(err: Error, fn: string, logProps?: any): void;
     protected getRepo(): JsonRepository;
     protected getRouteList(): import("../../../routes").RouteListService;
+    protected isMobile(): boolean;
     protected getBindings(): import("../../../api").IncyclistBindings;
     protected getUnitConverter(): import("../../../i18n").UnitConverterService;
 }

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

@@ -1,8 +1,8 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, NearbyRiderRowProps, LoadControlButtonLabels, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
 import { ISecretBinding } from "../../api/secret";
-import { PrevRidesListDisplayProps } from "../../activities";
+import { ActiveRideListDisplayItem, PrevRidesListDisplayProps } from "../../activities";
 import type { LoadButtonMode, PowerAdjustmentResult, StepCountdownTick, WorkoutDisplayProperties } from "../../workouts/ride/types";
 import type { Workout } from "../../workouts/base/model";
 import type { StepDefinition } from "../../workouts/base/model/types";
@@ -16,10 +16,13 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected menuProps: RideMenuProps | null;
     protected isInitialized: boolean;
     protected startGateProps: StartGateProps | null;
+    protected onDeviceModeChangedBound: any;
     protected prevRidesVisibleRows: number;
     protected prevRidesMode: 'condensed' | 'list';
     protected gestureHintDismissed: boolean;
     protected prevRidesShown: boolean;
+    protected nearbyRiders?: RidePageDisplayProps['nearbyRiders'];
+    protected nearbyRidersSubscribed: boolean;
     protected viewTransition: boolean;
     constructor();
     initPage(): Promise<RideType | undefined>;
@@ -91,6 +94,13 @@ export declare class RidePageService extends IncyclistPageService implements IRi
         canStepBack: boolean;
         canStepForward: boolean;
     };
+    protected getLoadControlProps(): {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    protected getNominalErgWatts(magnitude: number): number;
+    protected onDeviceModeChanged(): void;
     protected getLastLogTime(): number;
     protected getElapsedActivityTime(): number;
     protected getEmptyWorkoutDisplayProps(): WorkoutRidePageDisplayProps;
@@ -115,11 +125,17 @@ export declare class RidePageService extends IncyclistPageService implements IRi
             rows: PrevRidesRowProps[];
             hasMore: boolean;
         };
+        nearbyRiders: {
+            rows: NearbyRiderRowProps[];
+        };
     };
     protected buildPrevRides(): RidePageDisplayProps['prevRides'];
     protected onPrevRidesTick(): void;
     getPrevRidesRows(): PrevRidesRowProps[];
     protected mapPrevRidesRow(row: PrevRidesListDisplayProps): PrevRidesRowProps;
+    protected subscribeToNearbyRiders(): void;
+    protected mapNearbyRiderRow(row: ActiveRideListDisplayItem): NearbyRiderRowProps;
+    protected getActiveRidesObserver(): IObserver | undefined;
     protected onDisplayStateUpdate(state: CurrentRideState): void;
     protected updatePageDisplay(): void;
     protected registerHandlers(observer: IObserver | null | undefined, map: Record<string, any>): void;
@@ -131,5 +147,6 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected getActivityRide(): import("../../activities").ActivityRideService;
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getOnlineStatusMonitoring(): import("../../monitoring").OnlineStateMonitoringService;
+    protected getDeviceConfiguration(): import("../../devices").DeviceConfigurationService;
 }
 export declare const getRidePageService: () => IRidePageService;

package/lib/types/ride/page/types.d.ts

@@ -5,15 +5,28 @@ import { CurrentPosition, CurrentRideState, GPXStartOverlayProps, RideViewType,
 import type { LoadButtonMode, PowerAdjustmentResult } from "../../workouts/ride/types";
 import type { WorkoutGraphPlanBar } from "../../workouts/base/graph/types";
 import type { Avatar } from "../../avatars";
+import type { ActiveRideListAvatar } from "../../activities";
 export interface StartGateProps {
     title: string;
     body: string;
 }
+export interface LoadControlButtonLabels {
+    inc1: string;
+    dec1: string;
+    inc5: string;
+    dec5: string;
+}
 export interface RideMenuProps {
     showResume?: boolean;
     finished?: boolean;
     canStepBack?: boolean;
     canStepForward?: boolean;
+    loadControl?: {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    showRideSettings?: boolean;
 }
 export interface RidePageDisplayProps {
     rideState: CurrentRideState;
@@ -36,6 +49,9 @@ export interface RidePageDisplayProps {
         rows: PrevRidesRowProps[];
         hasMore: boolean;
     };
+    nearbyRiders?: {
+        rows: NearbyRiderRowProps[];
+    };
 }
 export interface PrevRidesRowProps {
     position: number;
@@ -51,6 +67,31 @@ export interface PrevRidesRowProps {
     lng?: number;
     tsStart?: number;
 }
+export interface NearbyRiderRowProps {
+    isUser: boolean;
+    isPaused: boolean;
+    isCoach: boolean;
+    name: string;
+    distance: {
+        value: number;
+        unit: string;
+    };
+    diffDistance: {
+        value: number;
+        unit: string;
+    };
+    power?: number;
+    mpower?: number;
+    speed?: {
+        value: number;
+        unit: string;
+    };
+    avatar: ActiveRideListAvatar;
+    backgroundColor?: string;
+    textColor?: string;
+    lat?: number;
+    lng?: number;
+}
 export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
     video?: VideoDisplayProps;
     videos?: VideoDisplayProps[];
@@ -139,6 +180,12 @@ export interface WorkoutDashboardLine {
 export type WorkoutRideMenuProps = RideMenuProps & {
     canStepBack: boolean;
     canStepForward: boolean;
+    loadControl: {
+        visible: boolean;
+        label?: 'Load' | 'Gear';
+        buttons?: LoadControlButtonLabels;
+    };
+    showRideSettings: boolean;
 };
 export interface WorkoutGestureHint {
     visible: boolean;

package/lib/types/ride/route/RouteDisplayService.d.ts

@@ -8,6 +8,7 @@ import { RouteSettings } from "../../routes/list/cards/types";
 import { ActiveRideListDisplayItem, ScreenShotInfo } from "../../activities";
 import { ActivityUpdate, CurrentActivityData } from "../../activities/ride/types";
 import { RoutePoint } from "../../types";
+import { Observer } from "../../base/types";
 export declare class RouteDisplayService extends RideModeService {
     protected prevRequestSlope?: number;
     protected position?: CurrentPosition;
@@ -18,6 +19,7 @@ export declare class RouteDisplayService extends RideModeService {
     protected prevPowerTs?: number;
     protected nearbyRiders?: ActiveRideListDisplayItem[];
     protected _startSettings?: RouteSettings;
+    protected activeRidesObserver?: Observer;
     init(service: ICurrentRideService): void;
     getDeviceStartSettings(): {
         realityFactor: number;
@@ -60,6 +62,7 @@ export declare class RouteDisplayService extends RideModeService {
     protected checkFinishOptions(position: CurrentPosition): boolean;
     protected prepareActiveRides(): void;
     cleanupActiveRides(): void;
+    getActiveRidesObserver(): Observer | undefined;
     protected savePosition(_startPos?: number): void;
     getOriginalRoute(): Route;
     getCurrentRoute(): Route;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.119",
+  "version": "1.7.121",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.213.0",
     "axios": "^1.19.0",
-    "incyclist-devices": "^3.0.33",
+    "incyclist-devices": "^3.0.34",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",