incyclist-services 1.7.85 → 1.7.86

package/lib/cjs/devices/pairing/service.js

@@ -832,6 +832,12 @@ let DevicePairingService = (() => {
                     this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
                     return;
                 }
+                const deletedCapabilities = (this.state.deleted || [])
+                    .filter(e => e.udid === udid)
+                    .map(e => e.capability);
+                deletedCapabilities.forEach(capability => {
+                    this.getDeviceConfiguration().delete(udid, capability, true);
+                });
                 const adapter = this.getDeviceConfiguration().getAdapter(udid);
                 if (adapter) {
                     adapter.onScanStart();
@@ -1411,7 +1417,7 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
-            this.getDeviceConfiguration().delete(udid, capability, shouldEmit);
+            this.getDeviceConfiguration().delete(udid, capability, true);
             this.addToDeletedList(capability, udid);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
@@ -1446,13 +1452,6 @@ let DevicePairingService = (() => {
             const c = this.getCapability(capability);
             this.state.deleted.push({ capability: c.capability, udid });
         }
-        removeFromDeletedList(capability, udid) {
-            const c = this.getCapability(capability);
-            const idx = this.state.deleted.findIndex(e => e.capability === c.capability && e.udid === udid);
-            if (idx === -1)
-                return;
-            this.state.deleted.splice(idx, 1);
-        }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);
             return this.state.deleted.some(e => e.capability === capability.capability && e.udid === udid);

package/lib/cjs/maps/MapArea/utils.js

@@ -134,11 +134,13 @@ function concatPaths(path, path2, position, wayId) {
     }
     if (position === 'after') {
         append.shift();
-        path.push(...append);
+        append.forEach(p => path.push(p));
     }
     else {
         path.shift();
-        path.unshift(...append);
+        const newPath = append.concat(path);
+        path.length = 0;
+        newPath.forEach(p => path.push(p));
     }
 }
 function splitAtPointInfo(way, split) {

package/lib/cjs/workouts/base/graph/series.js

@@ -115,8 +115,8 @@ function formatRange(low, high, unit, rangePrefix = '') {
     const v = high ?? low;
     return v === undefined ? '' : `${Math.round(v)}${unit}`;
 }
-function getStepTargetText(step, ftp, powerOverrideWatts) {
-    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+function getStepTargetText(step, ftp) {
+    const { min: minPower, max: maxPower } = resolvePowerWatts(step.power, ftp);
     const ascending = step.steady || step.cooldown === false;
     const lowPower = ascending ? minPower : maxPower;
     const highPower = ascending ? maxPower : minPower;

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

@@ -427,7 +427,7 @@ let WorkoutRidePageService = (() => {
             if (!limits)
                 return empty;
             const currentStep = {
-                label: (0, graph_1.getStepTargetText)(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
+                label: (0, graph_1.getStepTargetText)(limits.step ?? {}, ftp),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
@@ -456,7 +456,7 @@ let WorkoutRidePageService = (() => {
             const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
-            const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp);
             const duration = (0, graph_1.getStepDuration)({ duration: limits.duration });
             const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
             return { text, mode: wo.mode ?? null };

package/lib/esm/devices/pairing/service.js

@@ -826,6 +826,12 @@ let DevicePairingService = (() => {
                     this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
                     return;
                 }
+                const deletedCapabilities = (this.state.deleted || [])
+                    .filter(e => e.udid === udid)
+                    .map(e => e.capability);
+                deletedCapabilities.forEach(capability => {
+                    this.getDeviceConfiguration().delete(udid, capability, true);
+                });
                 const adapter = this.getDeviceConfiguration().getAdapter(udid);
                 if (adapter) {
                     adapter.onScanStart();
@@ -1405,7 +1411,7 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
-            this.getDeviceConfiguration().delete(udid, capability, shouldEmit);
+            this.getDeviceConfiguration().delete(udid, capability, true);
             this.addToDeletedList(capability, udid);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
@@ -1440,13 +1446,6 @@ let DevicePairingService = (() => {
             const c = this.getCapability(capability);
             this.state.deleted.push({ capability: c.capability, udid });
         }
-        removeFromDeletedList(capability, udid) {
-            const c = this.getCapability(capability);
-            const idx = this.state.deleted.findIndex(e => e.capability === c.capability && e.udid === udid);
-            if (idx === -1)
-                return;
-            this.state.deleted.splice(idx, 1);
-        }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);
             return this.state.deleted.some(e => e.capability === capability.capability && e.udid === udid);

package/lib/esm/maps/MapArea/utils.js

@@ -98,11 +98,13 @@ export function concatPaths(path, path2, position, wayId) {
     }
     if (position === 'after') {
         append.shift();
-        path.push(...append);
+        append.forEach(p => path.push(p));
     }
     else {
         path.shift();
-        path.unshift(...append);
+        const newPath = append.concat(path);
+        path.length = 0;
+        newPath.forEach(p => path.push(p));
     }
 }
 export function splitAtPointInfo(way, split) {

package/lib/esm/workouts/base/graph/series.js

@@ -107,8 +107,8 @@ function formatRange(low, high, unit, rangePrefix = '') {
     const v = high ?? low;
     return v === undefined ? '' : `${Math.round(v)}${unit}`;
 }
-export function getStepTargetText(step, ftp, powerOverrideWatts) {
-    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+export function getStepTargetText(step, ftp) {
+    const { min: minPower, max: maxPower } = resolvePowerWatts(step.power, ftp);
     const ascending = step.steady || step.cooldown === false;
     const lowPower = ascending ? minPower : maxPower;
     const highPower = ascending ? maxPower : minPower;

package/lib/esm/workouts/ride/page/service.js

@@ -424,7 +424,7 @@ let WorkoutRidePageService = (() => {
             if (!limits)
                 return empty;
             const currentStep = {
-                label: getStepTargetText(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
+                label: getStepTargetText(limits.step ?? {}, ftp),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
@@ -453,7 +453,7 @@ let WorkoutRidePageService = (() => {
             const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
-            const target = getStepTargetText(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const target = getStepTargetText(limits.step ?? {}, wo.ftp);
             const duration = getStepDuration({ duration: limits.duration });
             const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
             return { text, mode: wo.mode ?? null };

package/lib/types/devices/pairing/service.d.ts

@@ -137,7 +137,6 @@ export declare class DevicePairingService extends IncyclistService {
     protected _stopDeviceSelection(changed: boolean): Promise<void>;
     private numberOfSelectedCababilities;
     protected addToDeletedList(capability: IncyclistCapability | CapabilityData, udid: string): void;
-    protected removeFromDeletedList(capability: IncyclistCapability | CapabilityData, udid: string): void;
     protected isOnDeletedList(c: IncyclistCapability | CapabilityData, udid: string): boolean;
     mappedCapability(c: CapabilityInformation): CapabilityData;
     protected mappedCapabilities(capabilities: DeviceConfigurationInfo): Array<CapabilityData>;

package/lib/types/workouts/base/graph/series.d.ts

@@ -4,10 +4,7 @@ import { WorkoutGraphPlanBar, WorkoutGraphSeriesOptions } from "./types";
 export declare const WORKOUT_ZONE_COLORS: string[];
 export declare function getStepDuration(step: StepDefinition): string;
 export declare function getStepPower(step: StepDefinition, ftp?: number): string;
-export declare function getStepTargetText(step: StepDefinition, ftp?: number, powerOverrideWatts?: {
-    min?: number;
-    max?: number;
-}): string;
+export declare function getStepTargetText(step: StepDefinition, ftp?: number): string;
 export interface FlattenedStep {
     step: Step;
     start: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.85",
+  "version": "1.7.86",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },