incyclist-services 1.3.8 → 1.3.10

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

@@ -6,6 +6,7 @@ type RemainingTimeProps = {
     routePos: number;
     power?: number;
     speed?: number;
+    endPos?: number;
 };
 type RemainingTimeCache = {
     remaining: RemainingInfo;
@@ -24,6 +25,6 @@ export declare class ActivityDuration {
     protected cache: RemainingTimeCache;
     constructor(activity: ActivityDetails);
     getRemainingTime(props: RemainingTimeProps): number;
-    protected calculateRemainingTime(route: Route, routePos: number, power: number, m: number, v?: number, realityFactor?: number): Array<RemainingInfo>;
+    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

@@ -24,7 +24,7 @@ class ActivityDuration {
     getRemainingTime(props) {
         var _a, _b;
         try {
-            const { route, routePos, power, speed = 0 } = props || {};
+            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;
@@ -43,7 +43,7 @@ class ActivityDuration {
                 }
             }
             const tsStart = Date.now();
-            const res = this.calculateRemainingTime(route, routePos, calcPower, m, v, realityFactor);
+            const res = this.calculateRemainingTime(route, routePos, calcPower, m, v, realityFactor, endPos);
             if (!res || !Array.isArray(res) || res.length === 0) {
                 return undefined;
             }
@@ -56,13 +56,13 @@ class ActivityDuration {
             return undefined;
         }
     }
-    calculateRemainingTime(route, routePos, power, m, v = 0, realityFactor = 1) {
+    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 = route.distance;
+        const totalDistance = endPos !== undefined ? endPos : route.distance;
         const fromStart = [];
         let vPrev = v;
         let timeSinceStart = 0;
@@ -95,6 +95,8 @@ class ActivityDuration {
                 try {
                     if (p.routeDistance < startDistance && (i === gpxData.length - 1 || gpxData[i + 1].routeDistance < startDistance))
                         return;
+                    if (endPos !== undefined && p.routeDistance > endPos)
+                        return;
                     const segmentEnd = i === gpxData.length - 1 ? totalDistance : gpxData[i + 1].routeDistance;
                     const segmentLength = segmentEnd - segmentStart;
                     const slope = (p.slope || 0) * (realityFactor || 0);

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

@@ -36,6 +36,7 @@ export declare class ActivityRideService extends IncyclistService {
         route?: Route;
         position?: RoutePoint;
         deviceData: DeviceData;
+        endPos?: number;
         tsDeviceData?: number;
         tsUpdate?: number;
         routeDistance?: number;
@@ -52,6 +53,7 @@ export declare class ActivityRideService extends IncyclistService {
     stop(): void;
     pause(autoResume?: boolean): void;
     resume(requester?: 'user' | 'system'): void;
+    ignoreEndPos(): void;
     getDashboardDisplayProperties(): any[];
     getActivitySummaryDisplayProperties(): {};
     getActivity(): ActivityDetails;

package/lib/activities/ride/service.js

@@ -162,6 +162,9 @@ let ActivityRideService = (() => {
             this._save();
             this.isSaveDone = false;
         }
+        ignoreEndPos() {
+            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 {
@@ -178,7 +181,7 @@ let ActivityRideService = (() => {
                     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) });
+                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) {
@@ -267,14 +270,12 @@ let ActivityRideService = (() => {
             });
         }
         save() {
-            console.log('~~~ ActivityRide.save', this.saveObserver !== undefined, this.isSaveDone);
             if (this.saveObserver) {
                 return this.saveObserver;
             }
             const emit = (event, ...args) => {
                 if (this.saveObserver)
                     this.saveObserver.emit(event, ...args);
-                console.log('~~~ ActivityRide.emit', event, args, this.saveObserver !== undefined, this.isSaveDone);
             };
             const run = () => __awaiter(this, void 0, void 0, function* () {
                 let success = false;
@@ -309,7 +310,6 @@ let ActivityRideService = (() => {
                 return success;
             });
             this.saveObserver = new observer_1.PromiseObserver(run());
-            console.log('~~~ ActivityRide.save returns', this.saveObserver !== undefined, this.isSaveDone);
             return this.saveObserver;
         }
         getObserver() {
@@ -529,6 +529,7 @@ let ActivityRideService = (() => {
                         (0, route_1.validateRoute)(selectedRoute);
                         const s = startSettings;
                         startPos = s.startPos;
+                        this.current.endPos = s.endPos;
                         realityFactor = s.realityFactor;
                         routeId = selectedRoute.description.id;
                         routeHash = selectedRoute.description.routeHash;
@@ -611,8 +612,8 @@ let ActivityRideService = (() => {
             const route = this.current.route;
             if (!route)
                 return 0;
-            const totalRouteDistance = (_a = route.points[route.points.length - 1]) === null || _a === void 0 ? void 0 : _a.routeDistance;
             const isLoop = (0, route_1.checkIsLoop)(route);
+            const totalRouteDistance = this.current.endPos !== undefined && !isLoop ? this.current.endPos : (_a = route.points[route.points.length - 1]) === null || _a === void 0 ? void 0 : _a.routeDistance;
             if (isLoop) {
                 const currentLap = Math.floor(((_b = this.current.routeDistance) !== null && _b !== void 0 ? _b : 0) / totalRouteDistance);
                 return totalRouteDistance - ((_c = this.activity.startPos) !== null && _c !== void 0 ? _c : 0) + currentLap * totalRouteDistance;
@@ -626,10 +627,16 @@ let ActivityRideService = (() => {
             const route = this.current.route;
             if (!route)
                 return 0;
-            const totalElevation = (_a = route.points[route.points.length - 1]) === null || _a === void 0 ? void 0 : _a.elevationGain;
-            const totalRouteDistance = (_b = route.points[route.points.length - 1]) === null || _b === void 0 ? void 0 : _b.routeDistance;
-            const gainAtStart = (0, route_1.getElevationGainAt)(route, (_c = this.activity.startPos) !== null && _c !== void 0 ? _c : 0);
             const isLoop = (0, route_1.checkIsLoop)(route);
+            const totalRouteDistance = this.current.endPos !== undefined && !isLoop ? this.current.endPos : (_a = route.points[route.points.length - 1]) === null || _a === void 0 ? void 0 : _a.routeDistance;
+            let totalElevation = (_b = route.points[route.points.length - 1]) === null || _b === void 0 ? void 0 : _b.elevationGain;
+            if (this.current.endPos !== undefined && !isLoop) {
+                const endPosPoint = route.points.find(p => p.routeDistance >= this.current.endPos);
+                if (endPosPoint) {
+                    totalElevation = endPosPoint.elevationGain;
+                }
+            }
+            const gainAtStart = (0, route_1.getElevationGainAt)(route, (_c = this.activity.startPos) !== null && _c !== void 0 ? _c : 0);
             if (isLoop) {
                 const currentLap = Math.floor(((_d = this.current.routeDistance) !== null && _d !== void 0 ? _d : 0) / totalRouteDistance);
                 return totalElevation - gainAtStart + currentLap * totalElevation;

package/lib/activities/upload/strava.js

@@ -210,7 +210,7 @@ let StravaUpload = (() => {
                 }
                 this.getUserSettings().set('user.auth.strava', {
                     accesstoken: this.config.accessToken,
-                    refreshToken: this.config.refreshToken,
+                    refreshtoken: this.config.refreshToken,
                     expiration: this.config.expiration.toISOString()
                 });
             }

package/package.json

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