incyclist-services 1.7.112 → 1.7.113

package/lib/cjs/ride/page/service.js

@@ -344,7 +344,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
+                ...this.buildWorkoutOverlayProps(props),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -356,7 +356,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
+                ...this.buildWorkoutOverlayProps(props),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -365,7 +365,7 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props, startOverlayCleared) {
+        buildWorkoutOverlayProps(props) {
             const cornerWidget = this.getCornerWidget();
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
@@ -377,10 +377,7 @@ let RidePageService = (() => {
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(props.workout, wo.ftp),
                     steps: this.buildUpcomingSteps(props.workout, wo.ftp),
-                    dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(startOverlayCleared),
-                    loadIncrement: this.getLoadIncrement(),
-                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                    dashboard: this.buildDashboardLine(wo)
                 };
             }
             catch (err) {
@@ -543,10 +540,15 @@ let RidePageService = (() => {
         }
         adjustLoad(deltaPct) {
             try {
-                if (deltaPct >= 0)
-                    return this.getWorkoutRide().powerUp(deltaPct);
-                else
-                    return this.getWorkoutRide().powerDown(-deltaPct);
+                const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
+                if (plainErgAdjustment) {
+                    const sign = deltaPct >= 0 ? 1 : -1;
+                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
+                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                }
+                return deltaPct >= 0
+                    ? this.getWorkoutRide().powerUp(deltaPct)
+                    : this.getWorkoutRide().powerDown(-deltaPct);
             }
             catch (err) {
                 this.logError(err, 'adjustLoad');
@@ -579,10 +581,7 @@ let RidePageService = (() => {
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
-                    dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(base.startOverlayProps === null),
-                    loadIncrement: this.getLoadIncrement(),
-                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                    dashboard: this.buildDashboardLine(wo)
                 };
             }
             catch (err) {
@@ -786,12 +785,16 @@ let RidePageService = (() => {
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
             const isStarting = state === 'Idle' || state === 'Starting' || state === 'Error';
+            const startOverlayProps = isStarting ? this.getRideDisplay().getStartOverlayProps() : null;
             return {
                 rideState: state,
                 rideType: this.getRideDisplay().getRideType(),
-                startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
+                startOverlayProps,
                 menuProps: this.menuProps,
-                startGateProps: this.startGateProps
+                startGateProps: this.startGateProps,
+                gestureHint: this.buildGestureHint(startOverlayProps === null),
+                loadIncrement: this.getLoadIncrement(),
+                loadButtonMode: this.getLoadButtonMode()
             };
         }
         onDisplayStateUpdate(state) {