incyclist-services 1.4.23 → 1.4.24

package/lib/activities/ride/service.js

@@ -847,37 +847,37 @@ let ActivityRideService = (() => {
             this.current.tsUpdate = tsNow;
         }
         getTotalDistance() {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             const route = this.current.route;
             if (!route)
                 return 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;
+            const totalRouteDistance = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.endPos) !== null && _b !== void 0 ? _b : (_c = route.points[route.points.length - 1]) === null || _c === void 0 ? void 0 : _c.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;
+                const currentLap = Math.floor(((_d = this.current.routeDistance) !== null && _d !== void 0 ? _d : 0) / totalRouteDistance);
+                return totalRouteDistance - ((_e = this.activity.startPos) !== null && _e !== void 0 ? _e : 0) + currentLap * totalRouteDistance;
             }
             else {
-                return totalRouteDistance - ((_d = this.activity.startPos) !== null && _d !== void 0 ? _d : 0);
+                return totalRouteDistance - ((_f = this.activity.startPos) !== null && _f !== void 0 ? _f : 0);
             }
         }
         getTotalElevation() {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             const route = this.current.route;
             if (!route)
                 return 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 totalRouteDistance = (_b = (_a = this.current) === null || _a === void 0 ? void 0 : _a.endPos) !== null && _b !== void 0 ? _b : (_c = route.points[route.points.length - 1]) === null || _c === void 0 ? void 0 : _c.routeDistance;
+            let totalElevation = (_d = route.points[route.points.length - 1]) === null || _d === void 0 ? void 0 : _d.elevationGain;
+            if (((_e = this.current) === null || _e === void 0 ? void 0 : _e.endPos) !== undefined) {
                 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);
+            const gainAtStart = (0, route_1.getElevationGainAt)(route, (_f = this.activity.startPos) !== null && _f !== void 0 ? _f : 0);
             if (isLoop) {
-                const currentLap = Math.floor(((_d = this.current.routeDistance) !== null && _d !== void 0 ? _d : 0) / totalRouteDistance);
+                const currentLap = Math.floor(((_g = this.current.routeDistance) !== null && _g !== void 0 ? _g : 0) / totalRouteDistance);
                 return totalElevation - gainAtStart + currentLap * totalElevation;
             }
             else {

package/lib/routes/base/parsers/utils.js

@@ -96,8 +96,9 @@ const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
 };
 exports.getReferencedFileInfo = getReferencedFileInfo;
 const buildFromFile = (info, referenced, scheme = 'file') => {
+    var _a;
     if (referenced.file) {
-        const fileName = info.filename.replace(info.name, referenced.file);
+        const fileName = (_a = info.filename) === null || _a === void 0 ? void 0 : _a.replace(info.name, referenced.file);
         return `file:///${fileName}`;
     }
     return referenced.url;

package/lib/routes/base/parsers/xml.js

@@ -247,6 +247,8 @@ class XMLParser {
                         prevTime = 0;
                     }
                     else {
+                        if (mapping.frame == prev.frame || mapping.distance === prev.distance)
+                            return;
                         const time = addMapping(mapping, prev, idx, startFrame, prevTime);
                         prevTime = time;
                     }
@@ -275,6 +277,11 @@ class XMLParser {
                 routeDistance: Number(a.distance),
                 elevation: Number(a.height),
             }));
+            route.points = route.points.filter((p, idx) => {
+                if (idx === 0)
+                    return true;
+                return (p.routeDistance !== route.points[idx - 1].routeDistance);
+            });
             const points = route.points;
             if ((points === null || points === void 0 ? void 0 : points.length) > 0) {
                 route.distance = points[points.length - 1].routeDistance;
@@ -294,6 +301,13 @@ class XMLParser {
             route.elevation = 0;
             const points = [];
             positions.forEach((pos, i) => {
+                if (i > 0) {
+                    const prev = positions[i - 1];
+                    if (prev.distance === pos.distance) {
+                        console.log('# found duplicate position');
+                        return;
+                    }
+                }
                 const altitude = getAltitude(altitudes, positions, i, prevAltitude);
                 const elevationGain = altitude - prevAltitude;
                 const pi = createPoint(pos, altitude, prevDistance);

package/lib/routes/list/service.js

@@ -1050,7 +1050,9 @@ let RouteListService = (() => {
             }
         }
         resetCards() {
-            this.getLists().forEach(list => {
+            var _a;
+            const lists = (_a = this.getLists()) !== null && _a !== void 0 ? _a : [];
+            lists.forEach(list => {
                 list.getCards().forEach((card) => {
                     card.reset(true);
                 });

package/lib/workouts/ride/service.js

@@ -403,9 +403,9 @@ let WorkoutRide = (() => {
             const ftp = this.settings.ftp;
             const wo = this.workout;
             const limits = wo.getLimits(time, true);
-            this.currentStep = limits.step;
-            const request = { time: 0, duration: 0, remaining: 0 };
             if (limits !== undefined) {
+                this.currentStep = limits.step;
+                const request = { time: 0, duration: 0, remaining: 0 };
                 request.time = Math.round(time);
                 request.minPower = this.getPowerVal(limits.power, 'min');
                 request.maxPower = this.getPowerVal(limits.power, 'max');
@@ -415,7 +415,7 @@ let WorkoutRide = (() => {
                 request.maxHrm = ((_d = limits.hrm) === null || _d === void 0 ? void 0 : _d.max) ? Math.round(limits.hrm.max) : undefined;
                 this.currentLimits = Object.assign(Object.assign({}, request), { duration: limits.duration, remaining: limits.remaining });
             }
-            this.isFreeRide = limits.power === undefined || limits.power === null;
+            this.isFreeRide = (limits === null || limits === void 0 ? void 0 : limits.power) === undefined || (limits === null || limits === void 0 ? void 0 : limits.power) === null;
             this.logger.logEvent(Object.assign(Object.assign({ message: 'workout requests' }, this.currentLimits), { ftp }));
             this.emit('request-update', this.currentLimits);
         }

package/package.json

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