incyclist-services 1.6.3 → 1.6.4

package/lib/ride/route/RLVDisplayService.d.ts

@@ -3,7 +3,7 @@ import { Observer } from "../../base/types";
 import { LocalizationService } from "../../i18n";
 import { RouteListService } from "../../routes";
 import { Route } from "../../routes/base/model/route";
-import { RouteInfoText } from "../../routes/base/types";
+import { RouteInfoText, RoutePoint } from "../../routes/base/types";
 import { VideoConversion, VideoSyncHelper } from "../../video";
 import { CurrentPosition, CurrentRideDisplayProps, InfotextDisplayProps, OverlayDisplayProps, RLVDisplayProps } from "../base";
 import { RouteDisplayService } from "./RouteDisplayService";
@@ -45,6 +45,7 @@ export declare class RLVDisplayService extends RouteDisplayService {
     getDisplayProperties(props: CurrentRideDisplayProps): RLVDisplayProps;
     protected getInfotextDisplayProps(): InfotextDisplayProps;
     protected checkFinishOptions(position: CurrentPosition): boolean;
+    protected preparePointsForMerge(currentPoints: RoutePoint[], nextPoints: RoutePoint[]): void;
     protected onNextVideo(): void;
     protected checkInfotextDisplayProps(time: number): void;
     protected getUIText(input: string): string;

package/lib/ride/route/RLVDisplayService.js

@@ -49,6 +49,7 @@ const types_1 = require("../../base/types");
 const i18n_1 = require("../../i18n");
 const utils_1 = require("../../maps/MapArea/utils");
 const routes_1 = require("../../routes");
+const geo_1 = require("../../utils/geo");
 const video_1 = require("../../video");
 const RouteDisplayService_1 = require("./RouteDisplayService");
 let RLVDisplayService = (() => {
@@ -209,6 +210,22 @@ let RLVDisplayService = (() => {
                     return false;
                 }
             }
+            preparePointsForMerge(currentPoints, nextPoints) {
+                (0, routes_1.correctDistanceValues)(currentPoints);
+                (0, routes_1.correctDistanceValues)(nextPoints);
+                nextPoints.forEach(p => {
+                    delete p.routeDistance;
+                    delete p.cnt;
+                    delete p.elevationGain;
+                    delete p.slope;
+                });
+                const pLastCurrent = currentPoints[currentPoints.length - 1];
+                const pFirstNext = nextPoints[0];
+                const distance = (0, geo_1.distanceBetween)(pLastCurrent, pFirstNext);
+                const elevationGain = distance < 5 ? 0 : pLastCurrent.slope * distance / 100;
+                const elevationDelta = (pLastCurrent.elevation + elevationGain) - pFirstNext.elevation;
+                nextPoints.forEach(p => { p.elevation += elevationDelta; });
+            }
             onNextVideo() {
                 const old = this.currentVideo;
                 const next = this.currentVideo.next;
@@ -225,8 +242,11 @@ let RLVDisplayService = (() => {
                 setTimeout(() => {
                     old.syncHelper.reset();
                 }, 2000);
-                (0, utils_1.concatPaths)(this.getCurrentRoute().details.points, next.route.details.points, 'after');
-                (0, routes_1.validateRoute)(this.getCurrentRoute(), true);
+                const currentPoints = this.getCurrentRoute().details.points;
+                const nextPoints = next.route.details.points;
+                this.preparePointsForMerge(currentPoints, nextPoints);
+                (0, utils_1.concatPaths)(currentPoints, nextPoints, 'after');
+                (0, routes_1.validateRoute)(this.getCurrentRoute(), false);
                 this.emit('route-updated', this.getCurrentRoute());
                 this.logEvent({ message: 'switching to next video', route: this.getCurrentRoute().details.title,
                     segment: this.currentVideo.route.description.title, offset: this.offset, segmentDistance: this.currentVideo.route.description.distance,

package/lib/ride/route/RouteDisplayService.js

@@ -89,12 +89,12 @@ let RouteDisplayService = (() => {
                     return;
                 }
                 try {
+                    const prevPosition = Object.assign({}, this.position);
                     const newPosition = this.updatePosition(activityPos);
                     if (!newPosition)
                         return;
                     const isCompleted = this.checkFinishOptions(newPosition);
                     if (!isCompleted) {
-                        const prevPosition = this.position;
                         this.position = Object.assign({}, newPosition);
                         const { lat, lng, routeDistance, lap } = newPosition;
                         this.onPositionUpdate({ route: this.getOriginalRoute(), position: this.position });
@@ -275,7 +275,7 @@ let RouteDisplayService = (() => {
                         const current = this.toLapPoint(this.position);
                         props = { routeDistance: activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance, prev: current };
                         const next = (0, routes_1.getNextPosition)(this.getCurrentRoute(), props);
-                        return this.fromLapPoint(next);
+                        this.position = this.fromLapPoint(next);
                     }
                     return this.position;
                 }

package/lib/routes/base/utils/route.d.ts

@@ -7,6 +7,7 @@ export declare const validateSlopes: (points: Array<RoutePoint>) => void;
 export declare const updateSlopes: (points: Array<RoutePoint>, validateOnly?: boolean) => void;
 export declare const getSegments: (route: Route) => Array<RouteSegment>;
 export declare const addDetails: (route: Route, details: RouteApiDetail) => void;
+export declare const correctDistanceValues: (points: RoutePoint[]) => void;
 export declare const validateRoute: (route: Route | RouteApiDetail, reset?: boolean) => void;
 export declare const validateDistance: (points: Array<RoutePoint>) => void;
 export declare const getTotalElevation: (route: RouteApiDetail) => number;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextVideoId = exports.hasNextVideo = exports.createFromJson = exports.getPointAtDistance = exports.getHeading = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateCnt = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.validateSlopes = exports.checkIsLoop = void 0;
+exports.getNextVideoId = exports.hasNextVideo = exports.createFromJson = exports.getPointAtDistance = exports.getHeading = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateCnt = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.correctDistanceValues = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.validateSlopes = exports.checkIsLoop = void 0;
 const utils_1 = require("../../../utils");
 const clone_1 = __importDefault(require("../../../utils/clone"));
 const geo_1 = require("../../../utils/geo");
@@ -179,6 +179,15 @@ const addVideoDetails = (route, details) => {
     route.description.hasGpx = details.points.find(p => p.lat && p.lng) !== undefined;
     route.description.next = (_c = details.video) === null || _c === void 0 ? void 0 : _c.next;
 };
+const correctDistanceValues = (points) => {
+    points.forEach((p, idx) => {
+        if (idx == 0) {
+            return;
+        }
+        p.distance = p.routeDistance - points[idx - 1].routeDistance;
+    });
+};
+exports.correctDistanceValues = correctDistanceValues;
 const validateRoute = (route, reset = false) => {
     var _a;
     if (!((_a = route === null || route === void 0 ? void 0 : route.points) === null || _a === void 0 ? void 0 : _a.length))

package/lib/workouts/list/service.js

@@ -93,7 +93,10 @@ let WorkoutListService = (() => {
             this.getWorkoutCalendar().off('updated', this.onUpdate);
             this.getWorkoutCalendar().reset();
         }
-        getSelected() { return this.selectedWorkout; }
+        getSelected() {
+            const workoutShown = this.getAppState().getState('workoutShown');
+            return workoutShown ? this.selectedWorkout : undefined;
+        }
         setScreenProps(props) { this.screenProps = props; }
         getScreenProps() { return this.screenProps; }
         open() {

package/package.json

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