incyclist-services 1.7.115 → 1.7.116

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

@@ -727,20 +727,20 @@ let ActivityRideService = (() => {
             let distanceGap;
             if (units === 'metric') {
                 if (distanceDelta < 1000)
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'm', digits: 0 }), units: 'm' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'm', digits: 0 }), unit: 'm' };
                 else {
                     const digits = distanceDelta < 10000 ? 1 : 0;
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'km', digits }), units: 'km' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'km', digits }), unit: 'km' };
                 }
             }
             else {
                 const yards = C(distanceDelta, 'distance', { from: 'm', to: 'yd' });
                 const miles = C(distanceDelta, 'distance', { from: 'm', to: 'mi' });
                 if (yards < 1000)
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'yd', digits: 0 }), units: 'yd' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'yd', digits: 0 }), unit: 'yd' };
                 else {
                     const digits = miles < 10 ? 1 : 0;
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'mi', digits }), units: 'mi' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'mi', digits }), unit: 'mi' };
                 }
             }
             return { distanceGap, routeDistance, lat, lng };

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

@@ -524,6 +524,7 @@ let RideDisplayService = (() => {
             observer.on('paused', (autoResume) => { this.onActivityPaused(autoResume); });
             observer.on('resumed', () => { this.onActivityResumed(); });
             observer.on('data', this.onActivityUpdate.bind(this));
+            observer.on('prevRides', this.onPrevRidesUpdate.bind(this));
         }
         updateActivityWorkout() {
             this.activity.workout = this.actualWorkout;
@@ -559,6 +560,9 @@ let RideDisplayService = (() => {
                 this.observer?.emit('data-update', data, currentValues);
             }
         }
+        onPrevRidesUpdate() {
+            this.observer?.emit('prev-rides-update');
+        }
         onWorkoutStopped() {
             this.logEvent({ message: 'Workout stopped by user', activity: this.activity?.id });
             const time = this.activity.time;

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

@@ -95,12 +95,14 @@ let RidePageService = (() => {
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
+        prevRidesShown = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
             this.eventHandler['state-update'] = this.onDisplayStateUpdate.bind(this);
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
             this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
+            this.eventHandler['prev-rides-update'] = this.onPrevRidesTick.bind(this);
             this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
@@ -133,6 +135,7 @@ let RidePageService = (() => {
                 this.logEvent({ message: 'page shown', page: pageLogName });
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
+                this.prevRidesShown = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
@@ -347,7 +350,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.prevRides),
+                ...this.buildWorkoutOverlayProps(props),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -359,7 +362,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.prevRides),
+                ...this.buildWorkoutOverlayProps(props),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -368,8 +371,8 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props, prevRides) {
-            const cornerWidget = this.getCornerWidget(prevRides);
+        buildWorkoutOverlayProps(props) {
+            const cornerWidget = this.getCornerWidget();
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
             try {
@@ -388,9 +391,9 @@ let RidePageService = (() => {
                 return { workoutAttached: false, cornerWidget };
             }
         }
-        getCornerWidget(prevRides) {
+        getCornerWidget() {
             try {
-                const available = this.getCornerWidgetStates(prevRides);
+                const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
@@ -401,17 +404,15 @@ let RidePageService = (() => {
                 return undefined;
             }
         }
-        getCornerWidgetStates(prevRides) {
+        getCornerWidgetStates() {
             const states = ['elevation'];
             if (this.isWorkoutAttached())
                 states.push('workout');
-            if (!!prevRides && prevRides.mode !== 'hidden')
-                states.push('prevRides');
             return states;
         }
         onToggleCornerWidget() {
             try {
-                const available = this.getCornerWidgetStates(this.buildPrevRides());
+                const available = this.getCornerWidgetStates();
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
@@ -853,6 +854,28 @@ let RidePageService = (() => {
                 return { mode: 'hidden', rows: [], hasMore: false };
             }
         }
+        onPrevRidesTick() {
+            try {
+                if (this.prevRidesShown)
+                    return;
+                if (this.buildPrevRides().rows.length === 0)
+                    return;
+                this.prevRidesShown = true;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onPrevRidesTick');
+            }
+        }
+        getPrevRidesRows() {
+            try {
+                return this.buildPrevRides()?.rows ?? [];
+            }
+            catch (err) {
+                this.logError(err, 'getPrevRidesRows');
+                return [];
+            }
+        }
         mapPrevRidesRow(row) {
             const isCurrent = row.title === 'current';
             const speed = typeof row.speed === 'object' ? row.speed?.value : row.speed;

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

@@ -721,20 +721,20 @@ let ActivityRideService = (() => {
             let distanceGap;
             if (units === 'metric') {
                 if (distanceDelta < 1000)
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'm', digits: 0 }), units: 'm' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'm', digits: 0 }), unit: 'm' };
                 else {
                     const digits = distanceDelta < 10000 ? 1 : 0;
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'km', digits }), units: 'km' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'km', digits }), unit: 'km' };
                 }
             }
             else {
                 const yards = C(distanceDelta, 'distance', { from: 'm', to: 'yd' });
                 const miles = C(distanceDelta, 'distance', { from: 'm', to: 'mi' });
                 if (yards < 1000)
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'yd', digits: 0 }), units: 'yd' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'yd', digits: 0 }), unit: 'yd' };
                 else {
                     const digits = miles < 10 ? 1 : 0;
-                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'mi', digits }), units: 'mi' };
+                    distanceGap = { value: C(distanceDelta, 'distance', { to: 'mi', digits }), unit: 'mi' };
                 }
             }
             return { distanceGap, routeDistance, lat, lng };

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

@@ -521,6 +521,7 @@ let RideDisplayService = (() => {
             observer.on('paused', (autoResume) => { this.onActivityPaused(autoResume); });
             observer.on('resumed', () => { this.onActivityResumed(); });
             observer.on('data', this.onActivityUpdate.bind(this));
+            observer.on('prevRides', this.onPrevRidesUpdate.bind(this));
         }
         updateActivityWorkout() {
             this.activity.workout = this.actualWorkout;
@@ -556,6 +557,9 @@ let RideDisplayService = (() => {
                 this.observer?.emit('data-update', data, currentValues);
             }
         }
+        onPrevRidesUpdate() {
+            this.observer?.emit('prev-rides-update');
+        }
         onWorkoutStopped() {
             this.logEvent({ message: 'Workout stopped by user', activity: this.activity?.id });
             const time = this.activity.time;

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

@@ -92,12 +92,14 @@ let RidePageService = (() => {
         prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
         prevRidesMode = 'list';
         gestureHintDismissed = false;
+        prevRidesShown = false;
         viewTransition = false;
         constructor() {
             super('RidePage');
             this.eventHandler['state-update'] = this.onDisplayStateUpdate.bind(this);
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
             this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
+            this.eventHandler['prev-rides-update'] = this.onPrevRidesTick.bind(this);
             this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
@@ -130,6 +132,7 @@ let RidePageService = (() => {
                 this.logEvent({ message: 'page shown', page: pageLogName });
                 EventLogger.setGlobalConfig('page', pageLogName);
                 this.gestureHintDismissed = false;
+                this.prevRidesShown = false;
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
@@ -344,7 +347,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.prevRides),
+                ...this.buildWorkoutOverlayProps(props),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -356,7 +359,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.prevRides),
+                ...this.buildWorkoutOverlayProps(props),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -365,8 +368,8 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props, prevRides) {
-            const cornerWidget = this.getCornerWidget(prevRides);
+        buildWorkoutOverlayProps(props) {
+            const cornerWidget = this.getCornerWidget();
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
             try {
@@ -385,9 +388,9 @@ let RidePageService = (() => {
                 return { workoutAttached: false, cornerWidget };
             }
         }
-        getCornerWidget(prevRides) {
+        getCornerWidget() {
             try {
-                const available = this.getCornerWidgetStates(prevRides);
+                const available = this.getCornerWidgetStates();
                 if (available.length <= 1)
                     return undefined;
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
@@ -398,17 +401,15 @@ let RidePageService = (() => {
                 return undefined;
             }
         }
-        getCornerWidgetStates(prevRides) {
+        getCornerWidgetStates() {
             const states = ['elevation'];
             if (this.isWorkoutAttached())
                 states.push('workout');
-            if (!!prevRides && prevRides.mode !== 'hidden')
-                states.push('prevRides');
             return states;
         }
         onToggleCornerWidget() {
             try {
-                const available = this.getCornerWidgetStates(this.buildPrevRides());
+                const available = this.getCornerWidgetStates();
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
                 const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
@@ -850,6 +851,28 @@ let RidePageService = (() => {
                 return { mode: 'hidden', rows: [], hasMore: false };
             }
         }
+        onPrevRidesTick() {
+            try {
+                if (this.prevRidesShown)
+                    return;
+                if (this.buildPrevRides().rows.length === 0)
+                    return;
+                this.prevRidesShown = true;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onPrevRidesTick');
+            }
+        }
+        getPrevRidesRows() {
+            try {
+                return this.buildPrevRides()?.rows ?? [];
+            }
+            catch (err) {
+                this.logError(err, 'getPrevRidesRows');
+                return [];
+            }
+        }
         mapPrevRidesRow(row) {
             const isCurrent = row.title === 'current';
             const speed = typeof row.speed === 'object' ? row.speed?.value : row.speed;

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

@@ -72,6 +72,7 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected onActivityPaused(autoResume: any): void;
     protected onActivityResumed(): void;
     protected onActivityUpdate(): void;
+    protected onPrevRidesUpdate(): void;
     protected onWorkoutStopped(): void;
     protected onWorkoutCompleted(): void;
     protected checkCyclingModeToggle(): void;

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

@@ -19,6 +19,7 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected prevRidesVisibleRows: number;
     protected prevRidesMode: 'condensed' | 'list';
     protected gestureHintDismissed: boolean;
+    protected prevRidesShown: boolean;
     protected viewTransition: boolean;
     constructor();
     initPage(): Promise<RideType | undefined>;
@@ -43,9 +44,9 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected getGPXRideDisplayProps(): GPXRidePageDisplayProps;
     protected buildWorkoutOverlayProps(props: CurrentRideDisplayProps & {
         showWorkout?: boolean;
-    }, prevRides: RidePageDisplayProps['prevRides']): Partial<RidePageDisplayProps>;
-    protected getCornerWidget(prevRides: RidePageDisplayProps['prevRides']): 'elevation' | 'workout' | 'prevRides' | undefined;
-    protected getCornerWidgetStates(prevRides: RidePageDisplayProps['prevRides']): Array<'elevation' | 'workout' | 'prevRides'>;
+    }): Partial<RidePageDisplayProps>;
+    protected getCornerWidget(): 'elevation' | 'workout' | undefined;
+    protected getCornerWidgetStates(): Array<'elevation' | 'workout'>;
     onToggleCornerWidget(): void;
     onExpandPrevRides(): void;
     onCollapsePrevRides(): void;
@@ -114,6 +115,8 @@ export declare class RidePageService extends IncyclistPageService implements IRi
         };
     };
     protected buildPrevRides(): RidePageDisplayProps['prevRides'];
+    protected onPrevRidesTick(): void;
+    getPrevRidesRows(): PrevRidesRowProps[];
     protected mapPrevRidesRow(row: PrevRidesListDisplayProps): PrevRidesRowProps;
     protected onDisplayStateUpdate(state: CurrentRideState): void;
     protected updatePageDisplay(): void;

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

@@ -30,7 +30,7 @@ export interface RidePageDisplayProps {
     loadIncrement?: number;
     workoutAttached?: boolean;
     loadButtonMode?: LoadButtonMode;
-    cornerWidget?: 'elevation' | 'workout' | 'prevRides';
+    cornerWidget?: 'elevation' | 'workout';
     prevRides?: {
         mode: 'hidden' | 'condensed' | 'list';
         rows: PrevRidesRowProps[];
@@ -99,6 +99,7 @@ export interface IRidePageService extends RidePageCallbacks, IPageService {
     isWorkoutAttached(): boolean;
     setPrevRidesVisibleRows(n: number): void;
     setPrevRidesMode(mode: 'condensed' | 'list'): void;
+    getPrevRidesRows(): PrevRidesRowProps[];
 }
 export interface WorkoutGraphPoint {
     x: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.115",
+  "version": "1.7.116",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },