incyclist-services 1.3.26 → 1.3.28

package/lib/activities/base/convert/converter.d.ts

@@ -1,6 +1,7 @@
 import { ActivityDetails } from "../model";
 import { ActivityConverterFactory } from "./factory";
 export declare class ActivityConverter {
-    static factory?: ActivityConverterFactory;
+    protected static factory?: ActivityConverterFactory;
     static convert(activity: ActivityDetails, format: string): Promise<unknown>;
+    static _reset(): void;
 }

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

@@ -24,5 +24,8 @@ class ActivityConverter {
             return yield ActivityConverter.factory.convert(activity, format);
         });
     }
+    static _reset() {
+        ActivityConverter.factory = undefined;
+    }
 }
 exports.ActivityConverter = ActivityConverter;

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

@@ -24,6 +24,15 @@ export declare class ActivitiesRepository {
     getAll(): ActivityInfo[];
     getWithDetails(id: string): Promise<ActivityInfo>;
     search(criteria: ActivitySearchCriteria): Array<ActivityInfo>;
+    private checkIdFilter;
+    private checkHashFilter;
+    private checkStartPosFilter;
+    private checkEndPosFilter;
+    private checkRealityFactorFilter;
+    private checkIsSavedFilter;
+    private checkUploadStatusFilter;
+    private checkTimeFilter;
+    private checkDistanceFilter;
     protected writeRepo(): Promise<void>;
     protected write(enforce?: boolean): void;
     protected emitDone(): void;

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

@@ -78,7 +78,7 @@ let ActivitiesRepository = (() => {
         save(activity_1) {
             return __awaiter(this, arguments, void 0, function* (activity, writeDetails = true) {
                 const stringify = (json) => { try {
-                    JSON.stringify(json);
+                    return JSON.stringify(json);
                 }
                 catch (_a) { } };
                 let prev;
@@ -146,31 +146,64 @@ let ActivitiesRepository = (() => {
         }
         search(criteria) {
             let result = this.activities;
+            result = this.checkIdFilter(result, criteria);
+            result = this.checkHashFilter(result, criteria);
+            result = this.checkStartPosFilter(result, criteria);
+            result = this.checkEndPosFilter(result, criteria);
+            result = this.checkRealityFactorFilter(result, criteria);
+            result = this.checkIsSavedFilter(result, criteria);
+            result = this.checkUploadStatusFilter(result, criteria);
+            result = this.checkTimeFilter(result, criteria);
+            result = this.checkDistanceFilter(result, criteria);
+            return result;
+        }
+        checkIdFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.routeId)) {
                 result = result.filter(ai => ai.summary.routeId === criteria.routeId);
             }
+            return result;
+        }
+        checkHashFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.routeHash)) {
                 result = result.filter(ai => ai.summary.routeHash === criteria.routeHash);
             }
+            return result;
+        }
+        checkStartPosFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.startPos) !== undefined) {
                 result = result.filter(ai => ai.summary.startPos === criteria.startPos);
             }
+            return result;
+        }
+        checkEndPosFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.endPos) !== undefined) {
                 result = result.filter(ai => ai.summary.endPos === criteria.endPos);
             }
+            return result;
+        }
+        checkRealityFactorFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.realityFactor) !== undefined) {
                 result = result.filter(ai => { var _a; return ((_a = ai.summary.realityFactor) !== null && _a !== void 0 ? _a : 100) === criteria.realityFactor; });
             }
+            return result;
+        }
+        checkIsSavedFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.isSaved) !== undefined) {
                 result = result.filter(ai => ai.summary.isSaved === criteria.isSaved);
             }
+            return result;
+        }
+        checkUploadStatusFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.uploadStatus) !== undefined) {
                 if (Array.isArray(criteria.uploadStatus)) {
                     result = result.filter(ai => {
-                        const requested = criteria.uploadStatus;
-                        const actual = ai.summary.uploadStatus;
-                        const r = requested.sort().map(us => `${us.service}:${us.status}`).join(';');
-                        const a = actual.sort().map(us => `${us.service}:${us.status}`).join(';');
+                        const requested = Array.from(criteria.uploadStatus);
+                        const actual = Array.from(ai.summary.uploadStatus);
+                        const sortFn = (a, b) => a.service.localeCompare(b.service);
+                        requested.sort(sortFn);
+                        actual.sort(sortFn);
+                        const r = requested.map(us => `${us.service}:${us.status}`).join(';');
+                        const a = actual.map(us => `${us.service}:${us.status}`).join(';');
                         return r === a;
                     });
                 }
@@ -184,9 +217,15 @@ let ActivitiesRepository = (() => {
                     });
                 }
             }
+            return result;
+        }
+        checkTimeFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.minTime) !== undefined) {
                 result = result.filter(ai => ai.summary.rideTime >= criteria.minTime);
             }
+            return result;
+        }
+        checkDistanceFilter(result, criteria) {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.minDistance) !== undefined) {
                 result = result.filter(ai => ai.summary.distance >= criteria.minDistance);
             }
@@ -256,13 +295,12 @@ let ActivitiesRepository = (() => {
                         yield this.bulkAddActivities(names);
                     }
                     if (cnt !== this.activities.length) {
-                        yield this.write(true);
+                        this.write(true);
                     }
                     yield this.fixMissingHash();
                     return;
                 }
                 yield this.buildFromLegacy();
-                return;
             });
         }
         buildFromLegacy() {
@@ -272,7 +310,7 @@ let ActivitiesRepository = (() => {
                 if (names) {
                     yield this.bulkAddActivities(names);
                 }
-                yield this.write(true);
+                this.write(true);
             });
         }
         listActivities() {
@@ -293,7 +331,7 @@ let ActivitiesRepository = (() => {
                         promises.push(this.loadDetails(ai.summary.name).then(() => { var _a, _b; return ai.summary.routeHash = (_b = (_a = ai.details) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.hash; }));
                     });
                     yield Promise.allSettled(promises);
-                    yield this.write(true);
+                    this.write(true);
                 }
                 catch (err) {
                     this.logError(err, 'fixMissingHash');
@@ -345,7 +383,6 @@ let ActivitiesRepository = (() => {
                         }
                     }
                 });
-                return;
             });
         }
         writeDetails(activity) {

package/lib/activities/base/utils/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSummary = void 0;
 const buildSummary = (activity, proposedName) => {
     var _a;
-    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, endPos, segment, realityFactor = 100, links, laps } = activity;
+    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, endPos, realityFactor = 100, links, laps } = activity;
     const name = proposedName !== null && proposedName !== void 0 ? proposedName : activity.name;
     const routeId = route === null || route === void 0 ? void 0 : route.id;
     const routeHash = route === null || route === void 0 ? void 0 : route.hash;

package/lib/activities/ride/duration.d.ts

@@ -25,6 +25,8 @@ export declare class ActivityDuration {
     protected cache: RemainingTimeCache;
     constructor(activity: ActivityDetails);
     getRemainingTime(props: RemainingTimeProps): number;
+    private checkIfCacheIsInvalid;
+    protected getUpdateFrequency(time: number): number;
     protected calculateRemainingTime(route: Route, routePos: number, power: number, m: number, v?: number, realityFactor?: number, endPos?: number): Array<RemainingInfo>;
 }
 export {};

package/lib/activities/ride/duration.js

@@ -22,20 +22,17 @@ class ActivityDuration {
         this.logger = new gd_eventlog_1.EventLogger('ActivityDuration');
     }
     getRemainingTime(props) {
-        var _a, _b;
+        var _a, _b, _c;
         try {
             const { route, routePos, power, speed = 0, endPos } = props || {};
             const { stats, time = 0, user } = this.activity;
             const calcPower = ((_a = stats === null || stats === void 0 ? void 0 : stats.power) === null || _a === void 0 ? void 0 : _a.avg) || power;
-            const m = (user.weight || 75) + 10;
+            const m = ((_b = user.weight) !== null && _b !== void 0 ? _b : 75) + 10;
             const v = speed / 3.6;
-            const realityFactor = ((_b = this.activity.realityFactor) !== null && _b !== void 0 ? _b : 100) / 100;
-            if ((routePos > route.distance) ||
-                (this.cache && this.cache.totalDistance !== route.distance)) {
-                delete this.cache;
-            }
+            const realityFactor = ((_c = this.activity.realityFactor) !== null && _c !== void 0 ? _c : 100) / 100;
+            this.checkIfCacheIsInvalid(routePos, route);
             if (this.cache) {
-                const updateFrequency = time > 300 ? 3000 : (time > 150 ? 5000 : 10000);
+                let updateFrequency = this.getUpdateFrequency(time);
                 const timeSinceLastUpdate = Date.now() - this.cache.ts;
                 if (timeSinceLastUpdate < updateFrequency) {
                     const timeRemaining = this.cache.remaining.timeRemaining - (Date.now() - this.cache.ts) / 1000;
@@ -56,13 +53,27 @@ class ActivityDuration {
             return undefined;
         }
     }
+    checkIfCacheIsInvalid(routePos, route) {
+        if ((routePos > route.distance) ||
+            (this.cache && this.cache.totalDistance !== route.distance)) {
+            delete this.cache;
+        }
+    }
+    getUpdateFrequency(time) {
+        let updateFrequency = 10000;
+        if (time > 150)
+            updateFrequency = 5000;
+        if (time > 300)
+            updateFrequency = 3000;
+        return updateFrequency;
+    }
     calculateRemainingTime(route, routePos, power, m, v = 0, realityFactor = 1, endPos) {
         if (!route)
             return;
         const gpxData = route.points;
         const isLap = (0, route_1.checkIsLoop)(route);
         const lapDistance = isLap ? routePos % route.distance : routePos;
-        const totalDistance = endPos !== undefined ? endPos : route.distance;
+        const totalDistance = endPos !== null && endPos !== void 0 ? endPos : route.distance;
         const fromStart = [];
         let vPrev = v;
         let timeSinceStart = 0;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncyclistService } from "../../base/service";
 import { Observer, PromiseObserver } from "../../base/types/observer";
 import { DeviceData } from "incyclist-devices";
@@ -60,6 +59,64 @@ export declare class ActivityRideService extends IncyclistService {
     resume(requester?: 'user' | 'system'): void;
     ignoreEndPos(): void;
     getDashboardDisplayProperties(): any[];
+    protected buildDashboardInfo(currentValues: any, avgMaxStats: any, display: any): any[];
+    protected getCurrentValues(): {
+        distance: number;
+        time: number;
+        speed: number;
+        power: number;
+        slope: number;
+        heartrate: number;
+        cadence: number;
+        timeRemaining: number;
+        distanceRemaining: number;
+    };
+    protected getAverageValues(): {
+        speedDetails: {
+            value: string;
+            label: string;
+        };
+        powerDetails: {
+            value: string;
+            label: string;
+        };
+        heartrateDetails: {
+            value: string;
+            label: string;
+        };
+        cadenceDetails: {
+            value: string;
+            label: string;
+        };
+        elevationGain: {
+            value: string;
+            label: string;
+            unit: string;
+        };
+    };
+    protected getMaximumValues(): {
+        speedDetails: {
+            value: string;
+            label: string;
+        };
+        powerDetails: {
+            value: string;
+            label: string;
+        };
+        heartrateDetails: {
+            value: string;
+            label: string;
+        };
+        cadenceDetails: {
+            value: string;
+            label: string;
+        };
+        elevationGain: {
+            value: string;
+            label: string;
+            unit: string;
+        };
+    };
     getActivitySummaryDisplayProperties(): ActivitySummaryDisplayProperties;
     getActivity(): ActivityDetails;
     setTitle(title: string): void;
@@ -71,6 +128,15 @@ export declare class ActivityRideService extends IncyclistService {
     getPrevRideStats(current: ActivityLogRecord): PastActivityInfo;
     getPrevRidesListDisplay(maxEntries?: number): Array<PrevRidesListDisplayProps>;
     protected getPrevActivityLog(ai: ActivityInfo, current: ActivityLogRecord): PastActivityLogEntry | null;
+    protected getRecordWithSameOrBiggerTime(logs: any, current: any): any;
+    protected calculateDistanceGap(ai: ActivityInfo, res: any, current: any): {
+        distanceGap: string;
+        routeDistance: any;
+        lat: any;
+        lng: any;
+    };
+    protected calculateTimeGap(sameDistance: any, current: any): string;
+    protected getRecordWithSameOrBiggerDistance(logs: any, current: any): any;
     protected getCurrentActivityLog(ai: ActivityInfo, current: ActivityLogRecord): PastActivityLogEntry | null;
     protected onPositionUpdate(position: RoutePoint): void;
     protected onDeviceData(data: DeviceData): void;

package/lib/activities/ride/service.js

@@ -186,60 +186,12 @@ let ActivityRideService = (() => {
             delete this.current.endPos;
         }
         getDashboardDisplayProperties() {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
             try {
-                const distance = ((_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.distance) !== null && _b !== void 0 ? _b : 0) / 1000;
-                const speed = ((_c = this.current.deviceData.speed) !== null && _c !== void 0 ? _c : 0);
-                const power = ((_d = this.current.deviceData.power) !== null && _d !== void 0 ? _d : 0);
-                const slope = (_e = this.current.position) === null || _e === void 0 ? void 0 : _e.slope;
-                const heartrate = this.current.deviceData.heartrate;
-                const cadence = ((_f = this.current.deviceData.cadence) !== null && _f !== void 0 ? _f : 0);
-                const time = (_h = (_g = this.activity) === null || _g === void 0 ? void 0 : _g.time) !== null && _h !== void 0 ? _h : 0;
+                const currentValues = this.getCurrentValues();
+                const { time } = currentValues;
                 const display = Math.floor(time / 3) % 2;
-                let distanceRemaining = (this.getTotalDistance() / 1000 - distance);
-                if (isNaN(distanceRemaining))
-                    distanceRemaining = undefined;
-                if (distanceRemaining < 0)
-                    distanceRemaining = 0;
-                const timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: this.current.deviceData.speed, routePos: this.activity.distance + ((_j = this.activity.startPos) !== null && _j !== void 0 ? _j : 0), endPos: this.current.endPos });
-                let speedDetails, powerDetails, elevationGain, heartrateDetails, cadenceDetails;
-                const stats = (_k = this.activity) === null || _k === void 0 ? void 0 : _k.stats;
-                if (display === 0) {
-                    speedDetails = { value: (0, utils_1.formatNumber)((_l = stats === null || stats === void 0 ? void 0 : stats.speed) === null || _l === void 0 ? void 0 : _l.max, 1), label: 'max' };
-                    powerDetails = { value: (0, utils_1.formatNumber)((_m = stats === null || stats === void 0 ? void 0 : stats.power) === null || _m === void 0 ? void 0 : _m.max, 0), label: 'max' };
-                    heartrateDetails = { value: (0, utils_1.formatNumber)((_o = stats === null || stats === void 0 ? void 0 : stats.hrm) === null || _o === void 0 ? void 0 : _o.max, 0), label: 'max' };
-                    cadenceDetails = { value: (0, utils_1.formatNumber)((_p = stats === null || stats === void 0 ? void 0 : stats.cadence) === null || _p === void 0 ? void 0 : _p.max, 0), label: 'max' };
-                    elevationGain = { value: (0, utils_1.formatNumber)((_q = this.current.elevationGainDisplay) !== null && _q !== void 0 ? _q : 0, 0), label: 'elev gain', unit: 'm' };
-                }
-                else {
-                    speedDetails = { value: (0, utils_1.formatNumber)((_r = stats === null || stats === void 0 ? void 0 : stats.speed) === null || _r === void 0 ? void 0 : _r.avg, 1), label: 'avg' };
-                    powerDetails = { value: (0, utils_1.formatNumber)((_s = stats === null || stats === void 0 ? void 0 : stats.power) === null || _s === void 0 ? void 0 : _s.avg, 0), label: 'avg' };
-                    heartrateDetails = { value: (0, utils_1.formatNumber)((_t = stats === null || stats === void 0 ? void 0 : stats.hrm) === null || _t === void 0 ? void 0 : _t.avg, 0), label: 'avg' };
-                    cadenceDetails = { value: (0, utils_1.formatNumber)((_u = stats === null || stats === void 0 ? void 0 : stats.cadence) === null || _u === void 0 ? void 0 : _u.avg, 0), label: 'avg' };
-                    let elevationGainRemaining = this.getTotalElevation() - ((_v = this.current.elevationGainDisplay) !== null && _v !== void 0 ? _v : 0);
-                    if (isNaN(elevationGainRemaining))
-                        elevationGainRemaining = undefined;
-                    if (elevationGainRemaining < 0)
-                        elevationGainRemaining = 0;
-                    const value = elevationGainRemaining !== undefined ? `-${(0, utils_1.formatNumber)(elevationGainRemaining, 0)}` : undefined;
-                    elevationGain = { value, label: 'elev gain', unit: 'm' };
-                }
-                const info = [];
-                info.push({ title: 'Time', data: [
-                        { value: (0, utils_1.formatTime)(time, true) },
-                        { value: timeRemaining !== undefined ? `-${(0, utils_1.formatTime)(timeRemaining, true)}` : undefined }
-                    ]
-                }),
-                    info.push({ title: 'Distance', data: [{ value: (0, utils_1.formatNumber)(distance, 2), unit: 'km' }, { value: distanceRemaining !== undefined ? `-${(0, utils_1.formatNumber)(distanceRemaining, 2)}` : undefined }] });
-                info.push({ title: 'Speed', data: [{ value: (0, utils_1.formatNumber)(speed, 1), unit: 'km/h' }, speedDetails], dataState: (_w = this.current.dataState) === null || _w === void 0 ? void 0 : _w.speed });
-                info.push({ title: 'Power', data: [{ value: (0, utils_1.formatNumber)(power, 0), unit: 'W' }, powerDetails], dataState: (_x = this.current.dataState) === null || _x === void 0 ? void 0 : _x.power });
-                if (((_y = this.activity) === null || _y === void 0 ? void 0 : _y.routeType) !== 'Free-Ride') {
-                    const rf = (_0 = (_z = this.activity) === null || _z === void 0 ? void 0 : _z.realityFactor) !== null && _0 !== void 0 ? _0 : 100;
-                    const slopeInfo = rf === 100 ? '' : `RF ${rf.toFixed(0)}%`;
-                    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: (_1 = this.current.dataState) === null || _1 === void 0 ? void 0 : _1.heartrate });
-                info.push({ title: 'Cadence', data: [{ value: (0, utils_1.formatNumber)(cadence, 0), unit: 'rpm' }, cadenceDetails], dataState: (_2 = this.current.dataState) === null || _2 === void 0 ? void 0 : _2.cadence });
+                const avgMaxStats = (display === 0) ? this.getAverageValues() : this.getMaximumValues();
+                const info = this.buildDashboardInfo(currentValues, avgMaxStats, display);
                 this.logger.logEvent({ message: 'Dashboard update', items: info.map(i => { var _a, _b, _c, _d; return `${i.title}:${((_a = i.data[0]) === null || _a === void 0 ? void 0 : _a.value) || ''}:${((_b = i.data[1]) === null || _b === void 0 ? void 0 : _b.value) || ''}${((_c = i.data[1]) === null || _c === void 0 ? void 0 : _c.label) ? '(' + ((_d = i.data[1]) === null || _d === void 0 ? void 0 : _d.label) + ')' : ''}`; }).join('|') });
                 return info;
             }
@@ -248,6 +200,72 @@ let ActivityRideService = (() => {
                 return [];
             }
         }
+        buildDashboardInfo(currentValues, avgMaxStats, display) {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const { distance, time, speed, power, slope, heartrate, cadence, distanceRemaining, timeRemaining } = currentValues;
+            const { speedDetails, powerDetails, elevationGain, heartrateDetails, cadenceDetails } = avgMaxStats;
+            const info = [];
+            info.push({
+                title: 'Time', data: [
+                    { value: (0, utils_1.formatTime)(time, true) },
+                    { value: timeRemaining !== undefined ? `-${(0, utils_1.formatTime)(timeRemaining, true)}` : undefined }
+                ]
+            });
+            info.push({ title: 'Distance', data: [{ value: (0, utils_1.formatNumber)(distance, 2), unit: 'km' }, { value: distanceRemaining !== undefined ? `-${(0, utils_1.formatNumber)(distanceRemaining, 2)}` : undefined }] });
+            info.push({ title: 'Speed', data: [{ value: (0, utils_1.formatNumber)(speed, 1), unit: 'km/h' }, speedDetails], dataState: (_a = this.current.dataState) === null || _a === void 0 ? void 0 : _a.speed });
+            info.push({ title: 'Power', data: [{ value: (0, utils_1.formatNumber)(power, 0), unit: 'W' }, powerDetails], dataState: (_b = this.current.dataState) === null || _b === void 0 ? void 0 : _b.power });
+            if (((_c = this.activity) === null || _c === void 0 ? void 0 : _c.routeType) !== 'Free-Ride') {
+                const rf = (_e = (_d = this.activity) === null || _d === void 0 ? void 0 : _d.realityFactor) !== null && _e !== void 0 ? _e : 100;
+                const slopeInfo = rf === 100 ? '' : `RF ${rf.toFixed(0)}%`;
+                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: (_f = this.current.dataState) === null || _f === void 0 ? void 0 : _f.heartrate });
+            info.push({ title: 'Cadence', data: [{ value: (0, utils_1.formatNumber)(cadence, 0), unit: 'rpm' }, cadenceDetails], dataState: (_g = this.current.dataState) === null || _g === void 0 ? void 0 : _g.cadence });
+            return info;
+        }
+        getCurrentValues() {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const distance = ((_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.distance) !== null && _b !== void 0 ? _b : 0) / 1000;
+            const speed = ((_c = this.current.deviceData.speed) !== null && _c !== void 0 ? _c : 0);
+            const power = ((_d = this.current.deviceData.power) !== null && _d !== void 0 ? _d : 0);
+            const slope = (_e = this.current.position) === null || _e === void 0 ? void 0 : _e.slope;
+            const heartrate = this.current.deviceData.heartrate;
+            const cadence = ((_f = this.current.deviceData.cadence) !== null && _f !== void 0 ? _f : 0);
+            const time = (_h = (_g = this.activity) === null || _g === void 0 ? void 0 : _g.time) !== null && _h !== void 0 ? _h : 0;
+            let distanceRemaining = (this.getTotalDistance() / 1000 - distance);
+            if (isNaN(distanceRemaining))
+                distanceRemaining = undefined;
+            if (distanceRemaining < 0)
+                distanceRemaining = 0;
+            const timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: this.current.deviceData.speed, routePos: this.activity.distance + ((_j = this.activity.startPos) !== null && _j !== void 0 ? _j : 0), endPos: this.current.endPos });
+            return { distance, time, speed, power, slope, heartrate, cadence, timeRemaining, distanceRemaining };
+        }
+        getAverageValues() {
+            var _a, _b, _c, _d, _e, _f;
+            const stats = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.stats;
+            const speedDetails = { value: (0, utils_1.formatNumber)((_b = stats === null || stats === void 0 ? void 0 : stats.speed) === null || _b === void 0 ? void 0 : _b.max, 1), label: 'max' };
+            const powerDetails = { value: (0, utils_1.formatNumber)((_c = stats === null || stats === void 0 ? void 0 : stats.power) === null || _c === void 0 ? void 0 : _c.max, 0), label: 'max' };
+            const heartrateDetails = { value: (0, utils_1.formatNumber)((_d = stats === null || stats === void 0 ? void 0 : stats.hrm) === null || _d === void 0 ? void 0 : _d.max, 0), label: 'max' };
+            const cadenceDetails = { value: (0, utils_1.formatNumber)((_e = stats === null || stats === void 0 ? void 0 : stats.cadence) === null || _e === void 0 ? void 0 : _e.max, 0), label: 'max' };
+            const elevationGain = { value: (0, utils_1.formatNumber)((_f = this.current.elevationGainDisplay) !== null && _f !== void 0 ? _f : 0, 0), label: 'elev gain', unit: 'm' };
+            return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+        }
+        getMaximumValues() {
+            var _a, _b, _c, _d, _e, _f;
+            const stats = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.stats;
+            const speedDetails = { value: (0, utils_1.formatNumber)((_b = stats === null || stats === void 0 ? void 0 : stats.speed) === null || _b === void 0 ? void 0 : _b.avg, 1), label: 'avg' };
+            const powerDetails = { value: (0, utils_1.formatNumber)((_c = stats === null || stats === void 0 ? void 0 : stats.power) === null || _c === void 0 ? void 0 : _c.avg, 0), label: 'avg' };
+            const heartrateDetails = { value: (0, utils_1.formatNumber)((_d = stats === null || stats === void 0 ? void 0 : stats.hrm) === null || _d === void 0 ? void 0 : _d.avg, 0), label: 'avg' };
+            const cadenceDetails = { value: (0, utils_1.formatNumber)((_e = stats === null || stats === void 0 ? void 0 : stats.cadence) === null || _e === void 0 ? void 0 : _e.avg, 0), label: 'avg' };
+            let elevationGainRemaining = this.getTotalElevation() - ((_f = this.current.elevationGainDisplay) !== null && _f !== void 0 ? _f : 0);
+            if (isNaN(elevationGainRemaining))
+                elevationGainRemaining = undefined;
+            if (elevationGainRemaining < 0)
+                elevationGainRemaining = 0;
+            const value = elevationGainRemaining !== undefined ? `-${(0, utils_1.formatNumber)(elevationGainRemaining, 0)}` : undefined;
+            const elevationGain = { value, label: 'elev gain', unit: 'm' };
+            return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+        }
         getActivitySummaryDisplayProperties() {
             var _a, _b;
             try {
@@ -312,7 +330,7 @@ let ActivityRideService = (() => {
                         this.convert('FIT');
                     }
                     else {
-                        convertSuccess == (yield this.convert('FIT'));
+                        convertSuccess = yield this.convert('FIT');
                         if (convertSuccess)
                             format = 'FIT';
                     }
@@ -368,9 +386,9 @@ let ActivityRideService = (() => {
             if (logs.length === 0)
                 return logs;
             logs.push(this.getCurrentActivityLog(activities[0], current));
-            const sorted = logs.sort((a, b) => b.distance - a.distance);
-            this.current.prevRidesLogs = sorted;
-            return sorted;
+            logs.sort((a, b) => b.distance - a.distance);
+            this.current.prevRidesLogs = logs;
+            return logs;
         }
         getPrevRidesListDisplay(maxEntries = 12) {
             const prevRides = this.current.prevRidesLogs;
@@ -384,7 +402,6 @@ let ActivityRideService = (() => {
                 return Object.assign({ position, avatar }, a);
             });
             if (props.length > maxEntries) {
-                const len = props.length;
                 const currentIdx = props.findIndex(a => a.title === 'current');
                 if (currentIdx < maxEntries - 1) {
                     let deleted = props.splice(maxEntries - 1);
@@ -425,7 +442,6 @@ let ActivityRideService = (() => {
             return props;
         }
         getPrevActivityLog(ai, current) {
-            var _a, _b, _c;
             try {
                 if (!ai.details || !ai.summary) {
                     return null;
@@ -434,57 +450,16 @@ let ActivityRideService = (() => {
                 const totalDistance = ai.summary.distance;
                 if (!(current === null || current === void 0 ? void 0 : current.distance) || current.distance > totalDistance)
                     return null;
-                let prev = undefined;
-                let res = (0, clone_1.default)(logs.find((log, idx) => {
-                    if (log.time >= current.time) {
-                        if (idx > 0)
-                            prev = logs[idx - 1];
-                        return true;
-                    }
-                    return false;
-                }));
-                if (!res) {
-                    res = (0, clone_1.default)(logs[logs.length - 1]);
-                    if (!res) {
-                        return null;
-                    }
-                }
-                else {
-                    if (Math.abs(res.time - current.time) > 0.1) {
-                        const t = res.time - current.time;
-                        const v = res.speed / 3.6;
-                        res.distance -= (v * t);
-                    }
-                }
-                const distanceDelta = current.distance - res.distance;
-                const { power, heartrate, distance, speed } = res;
-                const routeDistance = res.distance + ai.summary.startPos;
-                let lat, lng;
-                if ((_c = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.description) === null || _c === void 0 ? void 0 : _c.hasGpx) {
-                    const point = (0, route_1.getPosition)(this.current.route, { distance: routeDistance, nearest: true });
-                    lat = point === null || point === void 0 ? void 0 : point.lat;
-                    lng = point === null || point === void 0 ? void 0 : point.lng;
-                }
-                let prefix = Math.sign(distanceDelta) > 0 ? '+' : '';
-                const distanceGap = prefix + (Math.abs(distanceDelta) > 1000 ? `${(distanceDelta / 1000).toFixed(1)}km` : `${distanceDelta.toFixed(0)}m`);
-                prev = undefined;
-                res = (0, clone_1.default)(logs.find((log, idx) => {
-                    if (log.distance >= current.distance) {
-                        if (idx > 0)
-                            prev = logs[idx - 1];
-                        return true;
-                    }
-                    return false;
-                }));
-                if (!res)
+                let prefix = '';
+                const sameTime = this.getRecordWithSameOrBiggerTime(logs, current);
+                if (!sameTime)
                     return null;
-                const s = res.distance - current.distance;
-                const v = res.speed / 3.6;
-                const t = v === 0 ? Infinity : s / v;
-                res.time -= t;
-                const timeDelta = res.time - current.time;
-                prefix = Math.sign(timeDelta) > 0 ? '+' : '-';
-                const timeGap = prefix + (Math.abs(timeDelta) < 60 ? `${Math.abs(timeDelta).toFixed(1)}s` : (0, utils_1.formatTime)(Math.abs(timeDelta), true));
+                const { power, heartrate, distance, speed } = sameTime;
+                const { distanceGap, routeDistance, lat, lng } = this.calculateDistanceGap(ai, sameTime, current);
+                let sameDistance = this.getRecordWithSameOrBiggerDistance(logs, current);
+                if (!sameDistance)
+                    return null;
+                const timeGap = this.calculateTimeGap(sameDistance, current);
                 const routeHash = ai.summary.routeHash;
                 const routeId = ai.summary.routeId;
                 const tsStart = ai.summary.startTime;
@@ -497,6 +472,58 @@ let ActivityRideService = (() => {
                 return null;
             }
         }
+        getRecordWithSameOrBiggerTime(logs, current) {
+            let res = (0, clone_1.default)(logs.find((log) => {
+                if (log.time >= current.time) {
+                    return true;
+                }
+                return false;
+            }));
+            if (res) {
+                if (Math.abs(res.time - current.time) > 0.1) {
+                    const t = res.time - current.time;
+                    const v = res.speed / 3.6;
+                    res.distance -= (v * t);
+                }
+            }
+            else {
+                res = (0, clone_1.default)(logs[logs.length - 1]);
+            }
+            return res;
+        }
+        calculateDistanceGap(ai, res, current) {
+            var _a, _b, _c;
+            const distanceDelta = current.distance - res.distance;
+            const routeDistance = res.distance + ai.summary.startPos;
+            let lat, lng;
+            if ((_c = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.description) === null || _c === void 0 ? void 0 : _c.hasGpx) {
+                const point = (0, route_1.getPosition)(this.current.route, { distance: routeDistance, nearest: true });
+                lat = point === null || point === void 0 ? void 0 : point.lat;
+                lng = point === null || point === void 0 ? void 0 : point.lng;
+            }
+            let prefix = Math.sign(distanceDelta) > 0 ? '+' : '';
+            const distanceGap = prefix + (Math.abs(distanceDelta) > 1000 ? `${(distanceDelta / 1000).toFixed(1)}km` : `${distanceDelta.toFixed(0)}m`);
+            return { distanceGap, routeDistance, lat, lng };
+        }
+        calculateTimeGap(sameDistance, current) {
+            const s = sameDistance.distance - current.distance;
+            const v = sameDistance.speed / 3.6;
+            const t = v === 0 ? Infinity : s / v;
+            sameDistance.time -= t;
+            const timeDelta = sameDistance.time - current.time;
+            let prefix = Math.sign(timeDelta) > 0 ? '+' : '-';
+            const timeGap = prefix + (Math.abs(timeDelta) < 60 ? `${Math.abs(timeDelta).toFixed(1)}s` : (0, utils_1.formatTime)(Math.abs(timeDelta), true));
+            return timeGap;
+        }
+        getRecordWithSameOrBiggerDistance(logs, current) {
+            const res = (0, clone_1.default)(logs.find((log) => {
+                if (log.distance >= current.distance) {
+                    return true;
+                }
+                return false;
+            }));
+            return res;
+        }
         getCurrentActivityLog(ai, current) {
             try {
                 const timeGap = '';
@@ -505,7 +532,6 @@ let ActivityRideService = (() => {
                 const routeId = ai.summary.routeId;
                 const tsStart = ai.summary.startTime;
                 const title = 'current';
-                const routeDistance = current.distance;
                 const { power, heartrate, distance, speed, lat, lng } = current;
                 const calculate = { routeHash, routeId, tsStart, title, power, heartrate, speed, distance, timeGap, distanceGap, lat, lng };
                 calculate.routeDistance = calculate.distance + ai.summary.startPos;