incyclist-services 1.0.59 → 1.0.60

package/lib/devices/access/service.js

@@ -66,7 +66,7 @@ class DeviceAccessService extends events_1.default {
                 existing.state = state;
                 (0, merge_1.merge)(existing.properties || this.defaultProps, props);
                 this.emit('interface-changed', ifaceName, Object.assign({}, existing));
-                if (!existing.interface.isConnected()) {
+                if (!existing.interface.isConnected() && (props === null || props === void 0 ? void 0 : props.autoConnect)) {
                     this.emit('interface-changed', ifaceName, Object.assign(Object.assign({}, existing), { state: 'connecting' }));
                     const conected = yield this.connect(ifaceName);
                     const state = conected ? 'connected' : 'disconnected';
@@ -175,6 +175,7 @@ class DeviceAccessService extends events_1.default {
                         this.connect(name); });
                     return;
                 }
+                console.log('~~~ DEBUG:connect if', ifaceName, this.interfaces[ifaceName]);
                 if (((_a = this.interfaces[ifaceName]) === null || _a === void 0 ? void 0 : _a.enabled) === false)
                     return;
                 const impl = this.getInterface(ifaceName);

package/lib/devices/pairing/service.js

@@ -371,7 +371,7 @@ class DevicePairingService extends service_2.IncyclistService {
             const current = getInterfaceSettings(ifName, prev);
             if (settings.enabled && !current.enabled) {
                 const { port, protocol } = settings;
-                this.access.enableInterface(ifName, undefined, { port: Number(port), protocol });
+                this.access.enableInterface(ifName, undefined, { port: Number(port), protocol, autoConnect: true });
                 this.selectFromInterface(ifName);
             }
             else if (!settings.enabled && current.enabled) {
@@ -670,7 +670,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     connectInterface(name) {
         try {
-            this.access.enableInterface(name);
+            this.access.enableInterface(name, undefined, { autoConnect: true });
         }
         catch (err) {
             this.logError(err, 'enableInterface');

package/lib/routes/list/ImportCard.d.ts

@@ -0,0 +1,8 @@
+import { RouteState } from "../base/types";
+import { CardInfo, CardType } from "./types";
+export declare class ImportCard implements CardInfo {
+    type: CardType;
+    state: RouteState;
+    title?: string;
+    constructor(state: any, title?: any);
+}

package/lib/routes/list/ImportCard.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportCard = void 0;
+class ImportCard {
+    constructor(state, title) {
+        this.type = 'import';
+        this.state = state;
+        this.title = title || 'Import Route';
+    }
+}
+exports.ImportCard = ImportCard;

package/lib/routes/list/service.d.ts

@@ -1,8 +1,9 @@
-import { Page, InternalRouteListState, List, RouteInfo, Route, RouteListEntry, RouteListStartProps, RouteListData, RouteStartSettings, onRouteStatusUpdateCallback, onCarouselStateChangedCallback, RoutesDB } from "./types";
+import { Page, InternalRouteListState, List, RouteInfo, Route, RouteListEntry, RouteListStartProps, RouteListData, RouteStartSettings, onRouteStatusUpdateCallback, onCarouselStateChangedCallback, RoutesDB, FreeRideSettings } from "./types";
 import IncyclistRoutesApi from "../base/api";
 import { RouteApiDescription, RouteApiDetail } from "../base/api/types";
 import { IncyclistService } from "../../base/service";
 import { IJsonRepositoryBinding, JsonRepository } from "../../api";
+import { LatLng } from "../../utils/geo";
 type filterFn = (route: Route, idx: number, obj: Route[]) => boolean;
 export declare class RouteListService extends IncyclistService {
     protected static _instance: any;
@@ -30,14 +31,21 @@ export declare class RouteListService extends IncyclistService {
     onResize(pageId: string): void;
     openStartSettings(r: RouteInfo | string): RouteStartSettings;
     cancelStartSettings(r: RouteInfo | string): {};
+    acceptStartSettings(r: RouteInfo | string, startSettings: RouteStartSettings): {};
+    openFreeRideSettings(): FreeRideSettings;
+    cancelFreeRideSettings(): void;
+    changeFreeRideSettings(props: {
+        position: LatLng;
+    }): void;
+    acceptFreeRideSettings(options: any): void;
+    import(pageId: any, files: any): void;
     setCardUpdateHandler(pageId: string, r: RouteInfo | string, list: List, idx: number, onRouteStateChanged: onRouteStatusUpdateCallback, onCarouselStateChanged: onCarouselStateChangedCallback): void;
     onCarouselInitialized(pageId: string, list: List, startIdx: number, visibleSize: number): void;
     onCarouselUpdated(pageId: string, list: List, startIdx: number, visibleSize: number): void;
-    acceptStartSettings(r: RouteInfo | string, startSettings: RouteStartSettings): {};
     getSelectedRoute(): RouteApiDetail;
     getStartSettings(routeId?: string): RouteStartSettings;
     startRide(r?: RouteInfo | string): {};
-    stopRide(r?: RouteInfo | string): {};
+    stopRide(r?: RouteInfo | string): void;
     startDownload(routeId: any, onStatusUpdate: any): void;
     cancelDownload(routeId: any): void;
     protected _preload(carouselSize?: number, detailsOnly?: boolean): Promise<void>;
@@ -47,6 +55,10 @@ export declare class RouteListService extends IncyclistService {
         realityFactor: number;
         segment: any;
     };
+    protected loadFreeRideSettingsFromUserSettings(): {
+        position: LatLng;
+    };
+    protected writeFreeRideSettingsToUserSettings(position: LatLng): void;
     protected writeStartSettingsToUserSettings(route: Route, startSettings: RouteStartSettings): void;
     protected writeStartSettings(route: Route, startSettings: RouteStartSettings): void;
     protected getUserSetting(key: string, defValue?: any): any;

package/lib/routes/list/service.js

@@ -21,6 +21,8 @@ const settings_1 = require("../../settings");
 const api_2 = require("../../api");
 const clone_1 = __importDefault(require("../../utils/clone"));
 const FreeRideCard_1 = require("./FreeRideCard");
+const ImportCard_1 = require("./ImportCard");
+const utils_1 = require("../../utils");
 class RouteListService extends service_1.IncyclistService {
     static getInstance(binding) {
         if (!RouteListService._instance)
@@ -131,6 +133,7 @@ class RouteListService extends service_1.IncyclistService {
         try {
             if (!route)
                 return {};
+            this.state.selectedType = 'route';
             let startSettings = route.startSettings;
             this.stopRide();
             if (!startSettings) {
@@ -146,6 +149,7 @@ class RouteListService extends service_1.IncyclistService {
     }
     cancelStartSettings(r) {
         var _a;
+        delete this.state.selectedType;
         const route = this.getRouteFromStartProps(r);
         try {
             route.startState = 'idle';
@@ -156,6 +160,61 @@ class RouteListService extends service_1.IncyclistService {
             return {};
         }
     }
+    acceptStartSettings(r, startSettings) {
+        var _a;
+        const route = this.getRouteFromStartProps(r);
+        try {
+            this.writeStartSettings(route, startSettings);
+            route.startState = 'selected';
+        }
+        catch (err) {
+            this.logError(err, 'acceptStartSettings', { info: { id: route === null || route === void 0 ? void 0 : route.id, title: (_a = route === null || route === void 0 ? void 0 : route.data) === null || _a === void 0 ? void 0 : _a.title } });
+            return {};
+        }
+    }
+    openFreeRideSettings() {
+        this.state.selectedType = 'free-ride';
+        try {
+            this.stopRide();
+            const settings = this.loadFreeRideSettingsFromUserSettings();
+            return settings;
+        }
+        catch (err) {
+            this.logError(err, 'openFreeRideSettings');
+            return {};
+        }
+    }
+    cancelFreeRideSettings() {
+        delete this.state.selectedType;
+        delete this.state.selectedPosition;
+        delete this.state.selectedOptions;
+    }
+    changeFreeRideSettings(props) {
+        const { position: pos } = props;
+        const position = utils_1.geo.getLatLng(pos);
+        this.state.selectedPosition = position;
+        this.writeFreeRideSettingsToUserSettings(position);
+    }
+    acceptFreeRideSettings(options) {
+        this.state.selectedOptions = options;
+        this.state.selectedType = 'free-ride';
+    }
+    import(pageId, files) {
+        console.log('~~~ import ', pageId, files);
+        const page = this.getPage(pageId);
+        console.log('~~~ import ', files, page);
+        const route = {
+            id: Date.now().toString(),
+            data: {
+                type: 'route',
+                id: Date.now().toString(),
+                state: 'prepared',
+                title: 'Test'
+            }
+        };
+        this.addRouteToList('myRoutes', route);
+        this.emitPageUpdate();
+    }
     setCardUpdateHandler(pageId, r, list, idx, onRouteStateChanged, onCarouselStateChanged) {
         const route = this.getRouteFromStartProps(r);
         if (!route)
@@ -206,46 +265,51 @@ class RouteListService extends service_1.IncyclistService {
             }
         });
     }
-    acceptStartSettings(r, startSettings) {
-        var _a;
-        const route = this.getRouteFromStartProps(r);
-        try {
-            this.writeStartSettings(route, startSettings);
-            route.startState = 'selected';
-        }
-        catch (err) {
-            this.logError(err, 'acceptStartSettings', { info: { id: route === null || route === void 0 ? void 0 : route.id, title: (_a = route === null || route === void 0 ? void 0 : route.data) === null || _a === void 0 ? void 0 : _a.title } });
-            return {};
-        }
-    }
     getSelectedRoute() {
         const route = this.getRoute(v => v.startState === 'selected');
         return route === null || route === void 0 ? void 0 : route.details;
     }
     getStartSettings(routeId) {
-        const route = routeId ? this.getRoute(routeId) : this.getRoute(v => v.startState === 'selected');
-        return route === null || route === void 0 ? void 0 : route.startSettings;
+        console.log('~~ getStartSettings', this.state);
+        switch (this.state.selectedType) {
+            case 'free-ride':
+                return { type: 'free-ride', options: this.state.selectedOptions, position: this.state.selectedPosition };
+                break;
+            case 'route':
+                {
+                    const route = routeId ? this.getRoute(routeId) : this.getRoute(v => v.startState === 'selected');
+                    if (route)
+                        return Object.assign({ type: 'route' }, route.startSettings);
+                }
+                break;
+            default:
+                return;
+        }
     }
     startRide(r) {
         var _a;
-        const route = r ? this.getRoute(v => v.startState === 'selected') : this.getRouteFromStartProps(r);
-        try {
-            route.startState = 'started';
-        }
-        catch (err) {
-            this.logError(err, 'startRide', { info: { id: route === null || route === void 0 ? void 0 : route.id, title: (_a = route === null || route === void 0 ? void 0 : route.data) === null || _a === void 0 ? void 0 : _a.title } });
-            return {};
+        if (this.state.selectedType === 'route') {
+            const route = r ? this.getRoute(v => v.startState === 'selected') : this.getRouteFromStartProps(r);
+            try {
+                route.startState = 'started';
+            }
+            catch (err) {
+                this.logError(err, 'startRide', { info: { id: route === null || route === void 0 ? void 0 : route.id, title: (_a = route === null || route === void 0 ? void 0 : route.data) === null || _a === void 0 ? void 0 : _a.title } });
+                return {};
+            }
         }
     }
     stopRide(r) {
         var _a;
+        delete this.state.selectedType;
         const route = r ? this.getRoute(v => v.startState === 'selected') : this.getRouteFromStartProps(r);
+        if (!route)
+            return;
         try {
             route.startState = 'idle';
         }
         catch (err) {
             this.logError(err, 'stopRide', { info: { id: route === null || route === void 0 ? void 0 : route.id, title: (_a = route === null || route === void 0 ? void 0 : route.data) === null || _a === void 0 ? void 0 : _a.title } });
-            return {};
         }
     }
     startDownload(routeId, onStatusUpdate) {
@@ -315,6 +379,21 @@ class RouteListService extends service_1.IncyclistService {
         }
         return { startPos, realityFactor, segment };
     }
+    loadFreeRideSettingsFromUserSettings() {
+        let position;
+        const prevSetting = this.getUserSetting(`routeSelection.freeRide`, null);
+        if (prevSetting) {
+            position = prevSetting.position;
+        }
+        else {
+            position = this.getUserSetting(`position`, null);
+        }
+        return { position };
+    }
+    writeFreeRideSettingsToUserSettings(position) {
+        const userSettings = (0, settings_1.useUserSettings)();
+        userSettings.set('routeSelection.freeRide', { position });
+    }
     writeStartSettingsToUserSettings(route, startSettings) {
         var _a;
         const routeId = route.id;
@@ -364,6 +443,11 @@ class RouteListService extends service_1.IncyclistService {
                 const route = { data: card, id: 'free-ride', };
                 data.unshift(route);
             }
+            if (list === 'myRoutes' && !data.find(r => r.data.type === 'import')) {
+                const card = new ImportCard_1.ImportCard('loaded');
+                const route = { data: card, id: 'import', };
+                data.unshift(route);
+            }
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
                 lists.push(this.getRouteListDataEntry(list, data, language, listHeader));
             }

package/lib/routes/list/types.d.ts

@@ -1,3 +1,4 @@
+import { LatLng } from "../../utils/geo";
 import { RouteApiDetail } from "../base/api/types";
 import { RoutePoint, RouteSegment } from "../base/types";
 import { RouteState, RouteCategory, RouteProvider } from "../base/types";
@@ -69,15 +70,22 @@ export type RouteListData = {
 };
 export type RouteListStatusUpdateCallback = (data: RouteListData) => void;
 export type RouteStartSettings = {
+    type?: CardType;
     startPos?: number;
     endPos?: number;
     segment?: string;
     realityFactor?: number;
+    position?: LatLng;
+    options?: any;
 };
 export type RouteSettingsState = {
     route: RouteInfo;
     settings: RouteStartSettings;
 };
+export type FreeRideSettings = {
+    position?: LatLng;
+    options?: any;
+};
 export type Page = {
     id: string;
     state: RouteListData;
@@ -105,6 +113,9 @@ export interface InternalRouteListState {
     pages: Array<Page>;
     loading?: LoadingState;
     preloadDone: boolean;
+    selectedType?: CardType;
+    selectedPosition?: LatLng;
+    selectedOptions?: any;
 }
 export type RouteStartState = 'idle' | 'preparing' | 'selected' | 'started';
 export type Card<T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.1.24",
+    "incyclist-devices": "^2.1.26",
     "uuid": "^9.0.0"
   }
 }