incyclist-services 1.1.82 → 1.1.83

package/lib/devices/ride/service.js

@@ -382,8 +382,8 @@ class DeviceRideService extends events_1.default {
                 if ((_a = ai.adapter) === null || _a === void 0 ? void 0 : _a.isControllable()) {
                     bike = ai.adapter;
                     const modeInfo = this.configurationService.getModeSettings(ai.udid);
-                    mode = modeInfo.mode;
-                    settings = modeInfo.settings;
+                    mode = modeInfo === null || modeInfo === void 0 ? void 0 : modeInfo.mode;
+                    settings = (modeInfo === null || modeInfo === void 0 ? void 0 : modeInfo.settings) || {};
                     if (!this.simulatorEnforced && forceErgMode) {
                         const modes = bike.getSupportedCyclingModes().filter(C => C.supportsERGMode());
                         if (modes.length > 0) {

package/lib/routes/list/cards/FreeRideCard.js

@@ -4,6 +4,7 @@ exports.FreeRideCard = void 0;
 const observer_1 = require("../../../base/types/observer");
 const settings_1 = require("../../../settings");
 const utils_1 = require("../../../utils");
+const valid_1 = require("../../../utils/valid");
 const route_1 = require("../../base/model/route");
 const service_1 = require("../service");
 const base_1 = require("./base");
@@ -75,6 +76,8 @@ class FreeRideCard extends base_1.BaseCard {
         else {
             this.position = this.getUserSetting(`position`, null);
         }
+        if (!(0, valid_1.valid)(this.position.lat) || !(0, valid_1.valid)(this.position.lng))
+            this.position = undefined;
     }
     saveSettings() {
         if (!this.position)

package/lib/routes/list/cards/RouteCard.d.ts

@@ -90,7 +90,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     }): Promise<void>;
     protected emitUpdate(): void;
     updateRoute(route: Route): void;
-    protected buildSettingsKey(): string;
+    protected buildSettingsKey(legacy?: boolean): string;
     protected createPreview(): Promise<void>;
     protected deleteRouteUserSettings(): void;
     protected deleteFromUIList(): void;

package/lib/routes/list/cards/RouteCard.js

@@ -111,9 +111,22 @@ class RouteCard extends base_1.BaseCard {
         return this.deleteable;
     }
     openSettings() {
-        const defaultSettings = { startPos: 0, realityFactor: 100 };
+        this.startSettings = { startPos: 0, realityFactor: 100, type: this.getCardType() };
+        let migrate = false;
+        const legacy = this.buildSettingsKey(true);
+        const legacySettings = (0, settings_1.useUserSettings)().get(legacy, null);
+        if (legacySettings) {
+            this.startSettings = legacySettings;
+            migrate = true;
+        }
         const key = this.buildSettingsKey();
-        this.startSettings = (0, settings_1.useUserSettings)().get(key, defaultSettings);
+        const startSettings = (0, settings_1.useUserSettings)().get(key, null);
+        if (startSettings) {
+            this.startSettings = startSettings;
+        }
+        if (migrate) {
+            (0, settings_1.useUserSettings)().set(key, this.startSettings);
+        }
         return this.startSettings;
     }
     changeSettings(props) {
@@ -316,9 +329,9 @@ class RouteCard extends base_1.BaseCard {
         this.save();
         this.emitUpdate();
     }
-    buildSettingsKey() {
+    buildSettingsKey(legacy = false) {
         const type = this.route.description.hasVideo ? 'video' : 'followRoute';
-        const id = this.route.description.id;
+        const id = legacy ? this.route.description.legacyId : this.route.description.id;
         const key = `routeSelection.${type}.prevSetting.${id}`;
         return key;
     }

package/package.json

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