incyclist-services 1.3.25 → 1.3.26

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

@@ -3,7 +3,7 @@ import { JsonRepository } from "../../../api";
 import { Observer, PromiseObserver } from "../../../base/types/observer";
 import { ActivityDetails, ActivityInfo } from "../model";
 import { ActivitySearchCriteria } from "./types";
-export declare const DB_VERSION = "1";
+export declare const DB_VERSION = "2";
 export declare const DB_NAME = "db";
 export declare class ActivitiesRepository {
     protected repo: JsonRepository;

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

@@ -54,7 +54,7 @@ const types_1 = require("../../../base/types");
 const observer_1 = require("../../../base/types/observer");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
-exports.DB_VERSION = '1';
+exports.DB_VERSION = '2';
 exports.DB_NAME = 'db';
 let ActivitiesRepository = (() => {
     let _classDecorators = [types_1.Singleton];

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

@@ -7,7 +7,7 @@ import { ActivitiesRepository, ActivityConverterFactory, ActivityDetails, Activi
 import { FreeRideStartSettings } from "../../routes/list/types";
 import { RouteSettings } from "../../routes/list/cards/RouteCard";
 import { RoutePoint } from "../../routes/base/types";
-import { ActivityState } from "./types";
+import { ActivityState, ActivitySummaryDisplayProperties } from "./types";
 import { Route } from "../../routes/base/model/route";
 import { ActivityStatsCalculator } from "./stats";
 import { ActivityDuration } from "./duration";
@@ -60,7 +60,7 @@ export declare class ActivityRideService extends IncyclistService {
     resume(requester?: 'user' | 'system'): void;
     ignoreEndPos(): void;
     getDashboardDisplayProperties(): any[];
-    getActivitySummaryDisplayProperties(): {};
+    getActivitySummaryDisplayProperties(): ActivitySummaryDisplayProperties;
     getActivity(): ActivityDetails;
     setTitle(title: string): void;
     delete(): Promise<void>;

package/lib/activities/ride/service.js

@@ -216,7 +216,7 @@ let ActivityRideService = (() => {
                     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 = (_v = this.getTotalElevation() - this.current.elevationGainDisplay) !== null && _v !== void 0 ? _v : 0;
+                    let elevationGainRemaining = this.getTotalElevation() - ((_v = this.current.elevationGainDisplay) !== null && _v !== void 0 ? _v : 0);
                     if (isNaN(elevationGainRemaining))
                         elevationGainRemaining = undefined;
                     if (elevationGainRemaining < 0)
@@ -251,10 +251,12 @@ let ActivityRideService = (() => {
         getActivitySummaryDisplayProperties() {
             var _a, _b;
             try {
-                const route = (0, routes_1.useRouteList)().getSelected();
+                const route = this.getRouteList().getSelected();
+                const startSettings = this.getRouteList().getStartSettings();
+                const isFreeRide = (startSettings === null || startSettings === void 0 ? void 0 : startSettings.type) === 'Free-Ride';
                 const showSave = this.activity !== undefined && !this.isSaveDone;
                 const showContinue = this.state !== 'completed';
-                const showMap = (_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.hasGpx;
+                const showMap = isFreeRide || ((_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.hasGpx);
                 const preview = showMap ? undefined : (_b = route === null || route === void 0 ? void 0 : route.description) === null || _b === void 0 ? void 0 : _b.previewUrl;
                 const props = {
                     activity: this.activity,
@@ -696,7 +698,7 @@ let ActivityRideService = (() => {
             return log;
         }
         createActivity(requestedId) {
-            var _a;
+            var _a, _b;
             const user = this.getUserSettings().get('user', {});
             const { weight, ftp } = user;
             const uuid = this.getUserSettings().get('uuid', undefined);
@@ -735,7 +737,7 @@ let ActivityRideService = (() => {
                         realityFactor = s.realityFactor;
                         routeId = selectedRoute.description.id;
                         routeHash = selectedRoute.description.routeHash;
-                        routeName = selectedRoute.description.title;
+                        routeName = (_b = selectedRoute.description.originalName) !== null && _b !== void 0 ? _b : selectedRoute.description.title;
                         routeType = selectedRoute.description.hasVideo ? 'Video' : 'GPX';
                         this.current.position = (0, route_1.getPosition)(selectedRoute, { distance: startPos });
                     }

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

@@ -1 +1,9 @@
+import { ActivityDetails } from "../base";
 export type ActivityState = 'ininitalized' | 'active' | 'paused' | 'completed' | 'idle';
+export type ActivitySummaryDisplayProperties = {
+    activity?: ActivityDetails;
+    showSave?: boolean;
+    showContinue?: boolean;
+    showMap?: boolean;
+    preview?: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.25",
+  "version": "1.3.26",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },