incyclist-services 1.7.1 → 1.7.3

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

@@ -54,7 +54,7 @@ export declare class ActiveRidesService extends IncyclistService {
     protected getName(item: any): any;
     protected randomName(id?: string): string;
     protected addCurrentActivity(): void;
-    protected getAvatar(item: ActiveRideEntry): import("../..").Avatar;
+    protected getAvatar(item: ActiveRideEntry): import("../../avatars").Avatar;
     protected getRelativePower(r: ActiveRideEntry): number;
     protected getLap(r: ActiveRideEntry, overwrite?: boolean): number;
     protected getRoutePosDistance(r: ActiveRideEntry): number;
@@ -72,7 +72,7 @@ export declare class ActiveRidesService extends IncyclistService {
     };
     protected getRideInfo(): ActiveRideRoute;
     protected getType(type: ActivityRouteType): ActiveRideRouteType;
-    protected get activity(): import("..").ActivityDetails;
+    protected get activity(): import("../base").ActivityDetails;
     protected getRouteHash(): string;
     protected getUserName(user?: {
         firstname?: string;
@@ -107,7 +107,7 @@ export declare class ActiveRidesService extends IncyclistService {
     protected getActivityRide(): ActivityRideService;
     protected getRouteList(): RouteListService;
     getCoachesService(): CoachesService;
-    getUnitConverter(): import("../..").UnitConverterService;
+    getUnitConverter(): import("../../i18n").UnitConverterService;
     protected getUnitConversionShortcuts(): any[];
     protected getMessageQueue(): ActiveRideListMessageQueue;
     protected getApi(): IncyclistActiveRidesApi;

package/lib/activities/base/api/active-rides/api.d.ts

@@ -9,5 +9,5 @@ export declare class IncyclistActiveRidesApi {
     getBySessionId(sessionId: string): Promise<ActiveRideEntry[]>;
     protected getApi(): AxiosInstance;
     protected getBaseUrl(): string;
-    getUserSettings(): import("../../../..").UserSettingsService;
+    getUserSettings(): import("../../../../settings").UserSettingsService;
 }

package/lib/activities/base/api/fitconvert/fitconvert.d.ts

@@ -5,5 +5,5 @@ export declare class IncyclistFitConvertApi {
     convertToFit(data: FitExportActivity): Promise<ArrayBuffer>;
     protected getApi(): AxiosInstance;
     protected getBaseUrl(): string;
-    getUserSettings(): import("../../../..").UserSettingsService;
+    getUserSettings(): import("../../../../settings").UserSettingsService;
 }

package/lib/activities/base/convert/fit/remote-fit.d.ts

@@ -9,5 +9,5 @@ export declare class RemoteFitConverter {
     protected getApi(): IncyclistFitConvertApi;
     protected getFitActivity(activity: ActivityDetails): FitExportActivity;
     protected mapLogToFit(log: ActivityLogRecord): FitLogEntry;
-    protected getUserSettings(): import("../../../..").UserSettingsService;
+    protected getUserSettings(): import("../../../../settings").UserSettingsService;
 }

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

@@ -8,7 +8,7 @@ export declare class IncyclistAttribution extends AbstractSource {
     toXml(): string;
     constructor();
     protected getAppInfo(): import("../../../../api/appInfo").IAppInfo;
-    protected getBindings(): import("../../../..").IncyclistBindings;
+    protected getBindings(): import("../../../../api").IncyclistBindings;
 }
 export declare class TcxConverter implements IActivityConverter {
     protected logger: EventLogger;
@@ -19,5 +19,5 @@ export declare class TcxConverter implements IActivityConverter {
     protected getWorkoutLapMarkers(activity: ActivityDetails): Array<TcxLapMarker>;
     protected createLapMarkerFromStep(s: Step, activityDuration: number): TcxLapMarker;
     protected creatTrackPoints(activity: ActivityDetails, startTime: Date): TrackPoint[];
-    protected getRideService(): import("../../..").ActivityRideService;
+    protected getRideService(): import("../../../ride").ActivityRideService;
 }

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

@@ -1,3 +1,4 @@
+import { FormattedNumber } from "../../../i18n";
 import { RoutePoint } from "../../../routes/base/types";
 import { Workout } from "../../../workouts";
 export declare const DEFAULT_ACTIVITY_TITLE = "Incyclist Ride";
@@ -12,23 +13,28 @@ export type ActivityRoute = {
     name: string;
     title?: string;
 };
-export type ActivityStatsRecord = {
-    min: number;
-    max: number;
-    avg: number;
+export type ActivityStatsRecord<T> = {
+    min: T;
+    max: T;
+    avg: T;
     cntVal: number;
-    sum: number;
-    minAllowed?: number;
-    weighted?: number;
-};
-export type ActivityStats = {
-    hrm?: ActivityStatsRecord;
-    cadence?: ActivityStatsRecord;
-    speed: ActivityStatsRecord;
-    slope?: ActivityStatsRecord;
-    power: ActivityStatsRecord;
+    sum: T;
+    minAllowed?: T;
+    weighted?: T;
+};
+interface ActivityStatsBase {
+    hrm?: ActivityStatsRecord<number>;
+    cadence?: ActivityStatsRecord<number>;
+    slope?: ActivityStatsRecord<number>;
+    power: ActivityStatsRecord<number>;
     powerCurve?: Record<string, number>;
-};
+}
+export interface ActivityStats extends ActivityStatsBase {
+    speed: ActivityStatsRecord<number>;
+}
+export interface ActivityStatsUI extends ActivityStatsBase {
+    speed: ActivityStatsRecord<number | FormattedNumber>;
+}
 export interface ActivityAppLink {
     error?: string;
     activity_id?: string;
@@ -56,7 +62,7 @@ export type ActivityDB = {
     activities: Array<ActivitySummary>;
     isComplete: boolean;
 };
-export type ActivitySummary = {
+export type ActivitySummaryBase = {
     id: string;
     title: string;
     name: string;
@@ -65,18 +71,24 @@ export type ActivitySummary = {
     previewImage?: string;
     startTime: number;
     rideTime: number;
-    distance: number;
     startPos: number;
     endPos?: number;
     segment?: string;
     realityFactor: number;
-    totalElevation: number;
     uploadStatus: Array<UploadInfo>;
     isCompleted?: boolean;
     isSaved?: boolean;
     saveRideTime?: number;
     laps?: Array<LapSummary>;
 };
+export type ActivitySummary = ActivitySummaryBase & {
+    distance: number;
+    totalElevation: number;
+};
+export type ActivitySummaryUI = ActivitySummaryBase & {
+    distance: number | FormattedNumber;
+    totalElevation: number | FormattedNumber;
+};
 export type LapSummary = {
     num: number;
     startPos: number;
@@ -130,7 +142,7 @@ export type FitExportActivity = {
     user: FitUser;
     screenshots: Array<FitScreenshots>;
 };
-export interface ActivityDetails {
+interface ActivityDetailsBase {
     type?: ActivityType;
     version?: string;
     title: string;
@@ -141,15 +153,12 @@ export interface ActivityDetails {
     time: number;
     timeTotal: number;
     timePause: number;
-    distance: number;
     startPos: number;
     endPos?: number;
     segment?: string;
     startpos?: number;
     endpos?: number;
-    totalElevation: number;
     logs: Array<ActivityLogRecord>;
-    stats?: ActivityStats;
     screenshots?: Array<ScreenShotInfo>;
     routeType?: ActivityRouteType;
     realityFactor: number;
@@ -162,6 +171,16 @@ export interface ActivityDetails {
     links?: ActivityAppLinks;
     workout?: Workout;
 }
+export interface ActivityDetails extends ActivityDetailsBase {
+    distance: number;
+    totalElevation: number;
+    stats?: ActivityStats;
+}
+export interface ActivityDetailsUI extends ActivityDetailsBase {
+    distance: number | FormattedNumber;
+    totalElevation: number | FormattedNumber;
+    stats?: ActivityStatsUI;
+}
 export type ActivityLogRecord = {
     time: number;
     timeDelta: number;
@@ -180,3 +199,8 @@ export type ActivityInfo = {
     summary: ActivitySummary;
     details?: ActivityDetails;
 };
+export type ActivityInfoUI = {
+    summary: ActivitySummaryUI;
+    details?: ActivityDetailsUI;
+};
+export {};

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

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

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

@@ -41,6 +41,7 @@ import { buildSummary } from "../utils";
 import { useRouteList } from "../../../routes";
 import { ActivitiesDBMigratorFactory } from "./migration/factory";
 import { Injectable } from "../../../base/decorators/Injection";
+import { useUnitConverter } from "../../../i18n";
 export const DB_VERSION = '4';
 export const DB_NAME = 'db';
 let ActivitiesRepository = (() => {
@@ -50,12 +51,15 @@ let ActivitiesRepository = (() => {
     let _classThis;
     let _instanceExtraInitializers = [];
     let _getBindings_decorators;
+    let _getUnitConverter_decorators;
     var ActivitiesRepository = class {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
             _getBindings_decorators = [Injectable];
+            _getUnitConverter_decorators = [Injectable];
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesRepository = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -244,12 +248,20 @@ let ActivitiesRepository = (() => {
             return result;
         }
         checkStartPosFilter(result, criteria) {
-            if (result?.length > 0 && criteria?.startPos !== undefined) {
-                result = result.filter(ai => ai.summary.startPos === criteria.startPos);
+            let startPos = criteria?.startPos;
+            if (typeof startPos !== 'number' && startPos?.value !== undefined) {
+                startPos = this.getUnitConverter().convert(startPos.value, 'distance', { from: startPos.unit, to: 'm' });
+            }
+            if (result?.length > 0 && startPos !== undefined) {
+                result = result.filter(ai => ai.summary.startPos === startPos);
             }
             return result;
         }
         checkEndPosFilter(result, criteria) {
+            let endPos = criteria?.endPos;
+            if (typeof endPos !== 'number' && endPos?.value !== undefined) {
+                endPos = this.getUnitConverter().convert(endPos.value, 'distance', { from: endPos.unit, to: 'm' });
+            }
             if (result?.length > 0 && criteria?.endPos !== undefined) {
                 result = result.filter(ai => ai.summary.endPos === criteria.endPos);
             }
@@ -497,6 +509,9 @@ let ActivitiesRepository = (() => {
         getBindings() {
             return getBindings();
         }
+        getUnitConverter() {
+            return useUnitConverter();
+        }
     };
     return ActivitiesRepository = _classThis;
 })();

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

@@ -1,9 +1,10 @@
+import { FormattedNumber } from "../../../i18n";
 import { UploadInfo } from "../model";
 export interface ActivitySearchCriteria {
     routeId?: string;
     routeHash?: string;
-    startPos?: number;
-    endPos?: number;
+    startPos?: number | FormattedNumber;
+    endPos?: number | FormattedNumber;
     realityFactor?: number;
     uploadStatus?: UploadInfo | Array<UploadInfo>;
     isSaved?: boolean;

package/lib/activities/base/utils/activity.d.ts

@@ -14,10 +14,10 @@ export declare class Activity implements ActivityInfo {
     protected currentUploads: Record<string, boolean>;
     protected logger: EventLogger;
     constructor(info: ActivityInfo);
-    get summary(): import("..").ActivitySummary;
-    set summary(summary: import("..").ActivitySummary);
-    get details(): import("..").ActivityDetails;
-    set details(details: import("..").ActivityDetails);
+    get summary(): import("../model").ActivitySummary;
+    set summary(summary: import("../model").ActivitySummary);
+    get details(): import("../model").ActivityDetails;
+    set details(details: import("../model").ActivityDetails);
     get id(): string;
     setLoading(loading: PromiseObserver<void>): void;
     isLoading(): boolean;
@@ -41,9 +41,9 @@ export declare class Activity implements ActivityInfo {
     protected save(withDetails?: boolean): Promise<void>;
     protected logError(err: Error, fn: string, context?: object): void;
     protected getRepo(): ActivitiesRepository;
-    protected getAppsService(): import("../../..").AppsService;
-    protected getBindings(): import("../../..").IncyclistBindings;
-    protected getRouteList(): import("../../..").RouteListService;
+    protected getAppsService(): import("../../../apps").AppsService;
+    protected getBindings(): import("../../../api").IncyclistBindings;
+    protected getRouteList(): import("../../../routes").RouteListService;
     protected getActivityConverter(): typeof ActivityConverter;
     protected getActivityUploadFactory(): ActivityUploadFactory;
 }

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

@@ -50,8 +50,9 @@ export declare class ActivityListService extends IncyclistService {
     protected emitLists(event: 'loaded' | 'updated'): void;
     protected getRepo(): ActivitiesRepository;
     protected getActivityUploadFactory(): ActivityUploadFactory;
-    protected getAppState(): import("../..").AppStateService;
-    protected getRouteList(): import("../..").RouteListService;
+    protected getAppState(): import("../../appstate").AppStateService;
+    protected getRouteList(): import("../../routes").RouteListService;
+    protected getUnitConverter(): import("../../i18n").UnitConverterService;
     reset(): void;
 }
 export declare const useActivityList: () => ActivityListService;

package/lib/activities/list/service.js

@@ -37,10 +37,12 @@ import { Injectable } from "../../base/decorators/Injection";
 import { IncyclistService } from "../../base/service";
 import { Singleton } from "../../base/types";
 import { Observer, PromiseObserver } from "../../base/types/observer";
+import { useUnitConverter } from "../../i18n";
 import { useRouteList } from "../../routes";
 import { waitNextTick } from "../../utils";
 import { ActivitiesRepository, Activity } from "../base";
 import { ActivityUploadFactory } from "../upload";
+import { createUIActivityDetails, createUIActivityInfo } from "./utils";
 let ActivityListService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -52,6 +54,7 @@ let ActivityListService = (() => {
     let _getActivityUploadFactory_decorators;
     let _getAppState_decorators;
     let _getRouteList_decorators;
+    let _getUnitConverter_decorators;
     var ActivityListService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -60,10 +63,12 @@ let ActivityListService = (() => {
             _getActivityUploadFactory_decorators = [Injectable];
             _getAppState_decorators = [Injectable];
             _getRouteList_decorators = [Injectable];
+            _getUnitConverter_decorators = [Injectable];
             __esDecorate(this, null, _getRepo_decorators, { kind: "method", name: "getRepo", static: false, private: false, access: { has: obj => "getRepo" in obj, get: obj => obj.getRepo }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getActivityUploadFactory_decorators, { kind: "method", name: "getActivityUploadFactory", static: false, private: false, access: { has: obj => "getActivityUploadFactory" in obj, get: obj => obj.getActivityUploadFactory }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivityListService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -362,19 +367,33 @@ let ActivityListService = (() => {
             const loading = this.isStillLoading();
             const observer = loading ? this.getListObserver() : undefined;
             const activities = loading ? undefined : this.getPastActivities();
+            const activitiesUI = activities === undefined ? undefined : activities.map(createUIActivityInfo);
             const filter = this.filter;
-            return { filter, activities, loading, observer };
+            return { filter, activities: activitiesUI, loading, observer };
         }
         getSelectedActivityDisplayProps() {
-            const activity = this.selected.details;
+            const activity = createUIActivityDetails(this.selected.details);
+            const [C, U] = this.getUnitConverter().getUnitConversionShortcuts();
             const logs = activity?.logs ?? [];
             const points = logs.map(p => ({ lat: p.lat, lng: p.lng ?? p.lon }));
+            const getDistance = () => {
+                if (activity?.distance === undefined)
+                    return undefined;
+                if (typeof activity?.distance === 'number')
+                    return { value: C(activity.distance, 'distance', { digits: 1 }), unit: U('distance') };
+                return activity?.distance;
+            };
+            const distance = getDistance();
+            const startPosVal = activity?.segment ? undefined : activity?.startPos;
+            const startPos = startPosVal === undefined ? undefined : { value: C(startPosVal, 'distance', { digits: 1 }), unit: U('distance') };
+            const totalElevation = this.selected.getElevation();
+            const elevation = totalElevation === undefined ? undefined : { value: C(totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
             const props = {
                 title: this.selected.getTitle(),
-                distance: activity?.distance,
+                distance,
                 duration: activity?.time,
-                elevation: this.selected.getElevation(),
-                startPos: activity?.segment ? undefined : activity?.startPos,
+                elevation,
+                startPos,
                 segment: activity?.segment,
                 started: activity ? new Date(activity.startTime) : undefined,
                 showMap: true,
@@ -384,6 +403,7 @@ let ActivityListService = (() => {
                 canStart: this.selected.canStart(),
                 canOpen: this.selected.isRouteAvailable(),
                 uploads: this.selected.getUploadStatus(),
+                units: this.getUnitConverter().getDefaultUnits()
             };
             return props;
         }
@@ -416,6 +436,9 @@ let ActivityListService = (() => {
         getRouteList() {
             return useRouteList();
         }
+        getUnitConverter() {
+            return useUnitConverter();
+        }
         reset() {
             const keys = Object.keys(this.observers);
             for (const key of keys) {

package/lib/activities/list/types.d.ts

@@ -1,7 +1,8 @@
 import { Avatar } from "../../avatars";
 import { Observer } from "../../base/types";
+import { Dimension, FormattedNumber, Unit } from "../../i18n";
 import { RouteInfo } from "../../routes/base/types";
-import { ActivityDetails, ActivityInfo, ActivitySearchCriteria, ActivityStats } from "../base";
+import { ActivityDetails, ActivityDetailsUI, ActivityInfoUI, ActivitySearchCriteria, ActivityStats } from "../base";
 export type PastActivityLogEntry = {
     routeHash?: string;
     routeId?: string;
@@ -10,12 +11,12 @@ export type PastActivityLogEntry = {
     time?: number;
     power?: number;
     heartrate?: number;
-    speed?: number;
+    speed?: number | FormattedNumber;
     distance?: number;
     routeDistance?: number;
     lap?: number;
     timeGap: string;
-    distanceGap: string;
+    distanceGap: string | FormattedNumber;
     lat?: number;
     lng?: number;
 };
@@ -25,7 +26,7 @@ export interface PrevRidesListDisplayProps extends PastActivityLogEntry {
     avatar?: Avatar;
 }
 export type ActivityListDisplayProperties = {
-    activities?: Array<ActivityInfo>;
+    activities?: Array<ActivityInfoUI>;
     filter?: ActivitySearchCriteria;
     loading?: boolean;
     observer?: Observer;
@@ -37,10 +38,10 @@ export interface ActivityErrorDisplayProperties extends SelectedActivityResponse
     error: string;
 }
 export interface SelectedActivityDisplayProperties extends SelectedActivityResponse {
-    distance: number;
+    distance: number | FormattedNumber;
     duration: number;
-    elevation: number;
-    startPos?: number;
+    elevation: number | FormattedNumber;
+    startPos?: number | FormattedNumber;
     segment?: string;
     started: Date;
     showMap: boolean;
@@ -48,11 +49,12 @@ export interface SelectedActivityDisplayProperties extends SelectedActivityRespo
         lat: number;
         lng: number;
     }>;
-    activity: ActivityDetails;
+    activity: ActivityDetailsUI;
     exports: Array<DisplayExportInfo>;
     canStart: boolean;
     canOpen: boolean;
     uploads: Array<DisplayUploadInfo>;
+    units: Record<Dimension, Unit>;
 }
 export type DisplayExportInfo = {
     type: string;

package/lib/activities/list/utils.d.ts

@@ -0,0 +1,4 @@
+import { ActivityDetails, ActivityDetailsUI, ActivityInfo, ActivityInfoUI, ActivitySummary, ActivitySummaryUI } from "../base";
+export declare const createUIActivityInfo: (a: ActivityInfo) => ActivityInfoUI;
+export declare const createUIActivitySummary: (summary: ActivitySummary) => ActivitySummaryUI;
+export declare const createUIActivityDetails: (details: ActivityDetails) => ActivityDetailsUI;

package/lib/activities/list/utils.js

@@ -0,0 +1,50 @@
+import { getUnitConversionShortcuts } from "../../i18n";
+export const createUIActivityInfo = (a) => {
+    if (!a)
+        return a;
+    const { summary, details } = a;
+    return {
+        summary: createUIActivitySummary(summary),
+        details: createUIActivityDetails(details)
+    };
+};
+export const createUIActivitySummary = (summary) => {
+    if (!summary)
+        return summary;
+    const ui = { ...summary };
+    const [C, U] = getUnitConversionShortcuts();
+    ui.distance = { value: C(summary.distance, 'distance', { digits: 1 }), unit: U('distance') };
+    if (ui.distance.value > 100)
+        ui.distance.value = Math.round(ui.distance.value);
+    ui.totalElevation = { value: C(summary.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    return ui;
+};
+export const createUIActivityDetails = (details) => {
+    if (!details)
+        return details;
+    const ui = { ...details };
+    const [C, U] = getUnitConversionShortcuts();
+    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
+    if (ui.distance.value > 100)
+        ui.distance.value = Math.round(ui.distance.value);
+    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    const formatSpeed = (v) => {
+        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
+    };
+    if (ui.stats?.speed) {
+        const fields = ['min', 'max', 'avg'];
+        for (const field of fields) {
+            ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
+        }
+    }
+    ui.logs = [];
+    for (const log of details.logs ?? []) {
+        const { speed, distance, elevation } = log;
+        const uiLog = { ...log };
+        uiLog.speed = C(speed, 'speed', { digits: 1 });
+        uiLog.distance = C(distance, 'distance', { digits: 2 });
+        uiLog.elevation = C(elevation, 'elevation', { digits: 0 });
+        ui.logs.push(uiLog);
+    }
+    return ui;
+};

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

@@ -144,7 +144,7 @@ export declare class ActivityRideService extends IncyclistService {
     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;
+        distanceGap: any;
         routeDistance: any;
         lat: any;
         lng: any;
@@ -184,14 +184,14 @@ export declare class ActivityRideService extends IncyclistService {
     protected startWorker(): void;
     protected stopWorker(): void;
     protected createObserver(): Observer;
-    protected getUserSettings(): import("../..").UserSettingsService;
-    protected getRouteList(): import("../..").RouteListService;
-    protected getDeviceRide(): import("../..").DeviceRideService;
-    protected getDeviceConfiguration(): import("../..").DeviceConfigurationService;
+    protected getUserSettings(): import("../../settings").UserSettingsService;
+    protected getRouteList(): import("../../routes").RouteListService;
+    protected getDeviceRide(): import("../../devices").DeviceRideService;
+    protected getDeviceConfiguration(): import("../../devices").DeviceConfigurationService;
     protected getActivityUploadFactory(): ActivityUploadFactory;
     protected getActivityConverterfactory(): ActivityConverterFactory;
     protected getFileSystemBinding(): import("../../api/fs").IFileSystem;
     protected getUnitConversionShortcuts(): any[];
-    protected getUnitConverter(): import("../..").UnitConverterService;
+    protected getUnitConverter(): import("../../i18n").UnitConverterService;
 }
 export declare const useActivityRide: () => ActivityRideService;