incyclist-services 1.0.57 → 1.0.58

package/lib/devices/pairing/service.js

@@ -733,7 +733,7 @@ class DevicePairingService extends service_2.IncyclistService {
     run(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             this.emit('run');
-            if (this.isPairing() || this.isScanning() || !this.state.waiting) {
+            if ((this.isPairing() || this.isScanning()) && !this.state.waiting) {
                 yield this._stop();
             }
             if (this.state.stopRequested || this.state.stopped) {
@@ -848,6 +848,10 @@ class DevicePairingService extends service_2.IncyclistService {
             this.state.tsPrevStart = Date.now();
             if (this.isScanning() && this.state.scan.preparing !== preparing)
                 return;
+            this.logEvent({ message: 'Stopping Adapters', interfaces: interfaces.join(','), props });
+            const stopPromises = [];
+            interfaces.forEach(i => stopPromises.push(this.stopAdaptersOnInterface(i)));
+            yield Promise.allSettled(stopPromises);
             this.logEvent({ message: 'Start Scanning', interfaces: interfaces.join(','), props });
             this.initScanningCallbacks();
             const timeout = props.enforcedScan ? 1000 * 60 * 60 : undefined;
@@ -1017,6 +1021,8 @@ class DevicePairingService extends service_2.IncyclistService {
     stopAdaptersWithCapability(capability, udid) {
         return __awaiter(this, void 0, void 0, function* () {
             const c = this.getCapability(capability);
+            if (!c)
+                return;
             const { adapters = [], capabilities } = this.state;
             const maxRetries = 3;
             let target = udid ?

package/lib/devices/ride/service.d.ts

@@ -32,6 +32,10 @@ export declare class DeviceRideService extends EventEmitter {
     startCheck(filter: RideServiceCheckFilter): Promise<void>;
     getAdapters(filter: RideServiceCheckFilter): AdapterRideInfo[];
     setSerialPortInUse(adapter: IncyclistDeviceAdapter): void;
+    protected checkAntSameDeviceID(adapters: AdapterRideInfo[]): Array<{
+        udid: string;
+        info: AdapterInfo;
+    }>;
     startAdapters(adapters: AdapterRideInfo[], startType: 'start' | 'check' | 'pair', props?: RideServiceDeviceProperties): Promise<boolean>;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
     startRetry(props: RideServiceDeviceProperties): Promise<boolean>;

package/lib/devices/ride/service.js

@@ -336,11 +336,39 @@ class DeviceRideService extends events_1.default {
             serial.setInUse(device.getPort());
         }
     }
+    checkAntSameDeviceID(adapters) {
+        const antDevices = adapters.map((ai, idx) => (Object.assign(Object.assign({}, ai), { idx })))
+            .filter(ai => ai.adapter.getInterface() === 'ant')
+            .map(ai => ({ idx: ai.idx, deviceID: ai.adapter.getID(), capabilities: ai.capabilities, udid: ai.udid }));
+        const antDeviceIds = antDevices.map(di => di.deviceID);
+        const duplicateIds = antDeviceIds.filter((item, index) => antDeviceIds.indexOf(item) !== index);
+        const score = (capabilities) => {
+            let value = 0;
+            if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))
+                value += 100;
+            if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))
+                value += 50;
+            value += capabilities.length;
+            return value;
+        };
+        const duplicateDevices = antDevices.filter(di => duplicateIds.includes(di.deviceID)).sort((a, b) => score(b.capabilities) - score(a.capabilities));
+        const leading = duplicateDevices[0];
+        const duplicateAdapters = [];
+        duplicateDevices.forEach((di, i) => {
+            if (i == 0)
+                return;
+            duplicateAdapters.push({ udid: leading.udid, info: adapters[di.idx] });
+        });
+        return duplicateAdapters;
+    }
     startAdapters(adapters, startType, props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { forceErgMode, startPos, realityFactor, rideMode, route } = props || {};
+            const duplicates = this.checkAntSameDeviceID(adapters);
             this.startPromises = adapters === null || adapters === void 0 ? void 0 : adapters.map((ai) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
+                if (duplicates.find(dai => dai.info.udid === ai.udid))
+                    return;
                 const startProps = (0, clone_1.default)(props || {});
                 if (startType === 'check' || startType === 'pair') {
                     startProps.timeout = 10000;
@@ -389,6 +417,9 @@ class DeviceRideService extends events_1.default {
                     .then((success) => __awaiter(this, void 0, void 0, function* () {
                     if (success) {
                         this.emit(`${startType}-success`, this.getAdapterStateInfo(ai));
+                        if (duplicates.find(dai => dai.udid === ai.udid)) {
+                            duplicates.forEach(dai => { this.emit(`${startType}-success`, this.getAdapterStateInfo(dai.info)); });
+                        }
                         this.logEvent(Object.assign({ message: `${startType} ${sType} request finished` }, logProps));
                         if (startType === 'check')
                             yield ai.adapter.pause().catch(console.log);
@@ -400,6 +431,9 @@ class DeviceRideService extends events_1.default {
                     }
                     else {
                         this.emit(`${startType}-error`, this.getAdapterStateInfo(ai));
+                        if (duplicates.find(dai => dai.udid === ai.udid)) {
+                            duplicates.forEach(dai => { this.emit(`${startType}-error`, this.getAdapterStateInfo(dai.info)); });
+                        }
                         this.logEvent(Object.assign({ message: `${startType} ${sType} request failed` }, logProps));
                         if (startType === 'check' || startType === 'pair')
                             yield ai.adapter.stop().catch(console.log);
@@ -411,6 +445,9 @@ class DeviceRideService extends events_1.default {
                     ai.isStarted = false;
                     this.logEvent(Object.assign(Object.assign({ message: `${startType} ${sType} request failed` }, logProps), { reason: err.message }));
                     this.emit(`${startType}-error`, this.getAdapterStateInfo(ai), err);
+                    if (duplicates.find(dai => dai.udid === ai.udid)) {
+                        duplicates.forEach(dai => { this.emit(`${startType}-error`, this.getAdapterStateInfo(dai.info)); });
+                    }
                     if (startType === 'check' || startType === 'pair') {
                         yield ai.adapter.stop().catch(console.log);
                     }
@@ -529,10 +566,29 @@ class DeviceRideService extends events_1.default {
         this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Speed);
         this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Cadence);
         this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Power);
-        const enabledCapabilities = this.enforceSimulator ?
-            [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate, incyclist_devices_1.IncyclistCapability.Cadence]
-            :
-                selectedDevices.filter(sd => sd.selected === adapterInfo.udid).map(c => c.capability);
+        const duplicates = this.checkAntSameDeviceID(adapters);
+        const toBeReplaced = duplicates.filter(dai => dai.udid === adapterInfo.udid).map(dai => dai.info.udid);
+        let enabledCapabilities = [];
+        if (this.simulatorEnforced) {
+            enabledCapabilities = [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate, incyclist_devices_1.IncyclistCapability.Cadence];
+        }
+        else if (duplicates.length > 0 && duplicates.find(d => d.udid === adapterInfo.udid)) {
+            const selected = (0, clone_1.default)(selectedDevices);
+            selected.forEach(cd => {
+                if (toBeReplaced.includes(cd.selected))
+                    cd.selected = adapterInfo.udid;
+            });
+            selected.forEach;
+            selected.forEach(sd => {
+                const duplicate = duplicates.find(dai => dai.info.udid === sd.selected);
+                if (duplicate)
+                    sd.selected = duplicate.udid;
+            });
+            enabledCapabilities = selected.map(c => c.capability);
+        }
+        else {
+            enabledCapabilities = selectedDevices.filter(sd => sd.selected === adapterInfo.udid).map(c => c.capability);
+        }
         this.logEvent({ message: 'Data Update', device: adapterInfo.adapter.getName(), data, enabledCapabilities });
         enabledCapabilities.forEach(capability => {
             switch (capability) {
@@ -559,6 +615,11 @@ class DeviceRideService extends events_1.default {
             }
         });
         this.emit('data', this.data, adapterInfo.udid);
+        if (toBeReplaced) {
+            toBeReplaced.forEach(udid => {
+                this.emit('data', this.data, udid);
+            });
+        }
     }
     sendUpdate(request) {
         const adapters = this.getAdapterList();

package/lib/routes/base/types/index.d.ts

@@ -35,7 +35,7 @@ export type RoutePoint = {
     lng: number;
     routeDistance: number;
     elevation: number;
-    slope: number;
+    slope?: number;
 };
 export type RouteSegment = {
     start: number;

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

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

package/lib/routes/list/FreeRideCard.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FreeRideCard = void 0;
+class FreeRideCard {
+    constructor(state, title) {
+        this.type = 'free-ride';
+        this.state = state;
+        this.title = title || 'Free Ride';
+    }
+}
+exports.FreeRideCard = FreeRideCard;

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

@@ -1,4 +1,4 @@
-import { Page, InternalRouteListState, List, RouteInfo, Route, RouteListEntry, RouteListStartProps, RouteListData, RouteStartSettings, onRouteStatusUpdateCallback, onCarouselStateChangedCallback } from "./types";
+import { Page, InternalRouteListState, List, RouteInfo, Route, RouteListEntry, RouteListStartProps, RouteListData, RouteStartSettings, onRouteStatusUpdateCallback, onCarouselStateChangedCallback, RoutesDB } from "./types";
 import IncyclistRoutesApi from "../base/api";
 import { RouteApiDescription, RouteApiDetail } from "../base/api/types";
 import { IncyclistService } from "../../base/service";
@@ -9,17 +9,16 @@ export declare class RouteListService extends IncyclistService {
     static getInstance(binding?: IJsonRepositoryBinding): RouteListService;
     protected baseDir: string;
     protected state: InternalRouteListState;
-    protected routes: Array<RouteListEntry>;
+    protected lists: Array<RouteListEntry>;
     protected videosRepo: JsonRepository;
     protected routesRepo: JsonRepository;
     protected api: IncyclistRoutesApi;
+    protected routeDescriptions: RoutesDB;
     constructor(binding?: IJsonRepositoryBinding);
     setBinding(binding: IJsonRepositoryBinding): void;
     protected getVideosRepo(): JsonRepository;
     protected getRoutesRepo(): JsonRepository;
     preload(carouselSize?: number): Promise<void>;
-    protected _preload(carouselSize?: number, detailsOnly?: boolean): Promise<void>;
-    protected preloadList(list: List, carouselSize?: number, detailsOnly?: boolean): Promise<void>;
     load(props: {
         list?: List;
         loadFrom?: number;
@@ -28,6 +27,7 @@ export declare class RouteListService extends IncyclistService {
     }): Promise<void>;
     openRouteSelection(pageId: string, props: RouteListStartProps): RouteListData;
     closeRouteSelection(pageId: string): void;
+    onResize(pageId: string): void;
     openStartSettings(r: RouteInfo | string): RouteStartSettings;
     cancelStartSettings(r: RouteInfo | string): {};
     setCardUpdateHandler(pageId: string, r: RouteInfo | string, list: List, idx: number, onRouteStateChanged: onRouteStatusUpdateCallback, onCarouselStateChanged: onCarouselStateChangedCallback): void;
@@ -40,6 +40,8 @@ export declare class RouteListService extends IncyclistService {
     stopRide(r?: RouteInfo | string): {};
     startDownload(routeId: any, onStatusUpdate: any): void;
     cancelDownload(routeId: any): void;
+    protected _preload(carouselSize?: number, detailsOnly?: boolean): Promise<void>;
+    protected preloadList(list: List, carouselSize?: number): Promise<void>;
     protected loadStartSettingsFromUserSettings(route: Route): {
         startPos: number;
         realityFactor: number;
@@ -71,7 +73,9 @@ export declare class RouteListService extends IncyclistService {
         title: string;
     }>;
     protected getRoute(criteria: string | filterFn): Route;
+    protected getAllRoutes(): Array<Route>;
     protected stopAllRides(): void;
+    protected addDescriptionsFromDB(descriptions: RoutesDB): void;
     protected addDescriptionsFromRepo(descriptions: Array<RouteApiDescription>, repo?: JsonRepository): void;
     protected addDescriptionsFromServer(descriptions: Array<RouteApiDescription>): void;
     protected updateRouteTitle(data: RouteInfo, route: {
@@ -83,12 +87,17 @@ export declare class RouteListService extends IncyclistService {
     protected getCountryPrefix(title?: string): string | undefined;
     protected removeCountryPrefix(title?: string): string;
     protected loadRouteDescriptionsFromRepo(): Promise<void>;
+    protected saveRouteDescriptions(): Promise<void>;
     protected loadRouteDescriptionsFromServer(): Promise<void>;
     protected loadRouteDescriptions(): Promise<void>;
-    protected loadRouteDetais(route: Route): Promise<void>;
+    protected loadRouteDetais(route: Route): Promise<RouteInfo>;
+    saveRouteDetails(route: any): Promise<void>;
     protected emitRouteUpdated(route: Route): void;
     protected getListState(page: Page, list: List): import("./types").RouteListDateEntry;
     private getRouteFromStartProps;
+    private isDescriptionsLoaded;
+    private decodePoints;
+    private encodePoints;
 }
 export declare const useRouteList: () => RouteListService;
 export {};

package/lib/routes/list/service.js

@@ -20,6 +20,7 @@ const route_1 = require("../base/utils/route");
 const settings_1 = require("../../settings");
 const api_2 = require("../../api");
 const clone_1 = __importDefault(require("../../utils/clone"));
+const FreeRideCard_1 = require("./FreeRideCard");
 class RouteListService extends service_1.IncyclistService {
     static getInstance(binding) {
         if (!RouteListService._instance)
@@ -30,12 +31,14 @@ class RouteListService extends service_1.IncyclistService {
         super('RouteList');
         this.state = {
             initialized: false,
-            pages: []
+            pages: [],
+            preloadDone: false
         };
         if (binding)
             api_2.JsonRepository.setBinding(binding);
         this.api = api_1.default.getInstance();
         this.initRouteLists();
+        this.routeDescriptions = {};
     }
     setBinding(binding) {
         if (!binding)
@@ -57,56 +60,15 @@ class RouteListService extends service_1.IncyclistService {
     }
     preload(carouselSize = 5) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.state.loading)
+            if (this.state.loading || this.state.preloadDone)
                 return;
             const promise = this._preload(carouselSize);
             this.state.loading = { promise };
             yield promise;
+            this.state.preloadDone = true;
             this.state.loading = null;
         });
     }
-    _preload(carouselSize = 5, detailsOnly = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!detailsOnly) {
-                yield this.loadRouteDescriptions();
-            }
-            this.emitPageUpdate();
-            const promises = [];
-            const promisesApi = [];
-            const lists = this.getRouteLists().map(li => li.list);
-            lists.forEach((list) => {
-                this.preloadList(list, carouselSize, detailsOnly);
-            });
-            this.logEvent({ message: 'preloading routes finished' });
-        });
-    }
-    preloadList(list, carouselSize = 5, detailsOnly = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const promises = [];
-            const promisesApi = [];
-            this.emitPageUpdate();
-            this.routes.forEach(rle => {
-                var _a;
-                if (((_a = rle.routes) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                    this.sort(rle.routes);
-                    let cntApi = 0;
-                    rle.routes.forEach((r) => {
-                        if (!r.data.isLocal) {
-                            cntApi++;
-                            return;
-                        }
-                        if (cntApi <= Math.min(carouselSize, rle.routes.length)) {
-                            const loader = this.loadRouteDetais(r);
-                            promises.push(loader);
-                        }
-                    });
-                }
-            });
-            yield Promise.allSettled(promises);
-            this.emitPageUpdate();
-            this.logEvent({ message: 'preloading routes finished' });
-        });
-    }
     load(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { routeId, list, loadFrom, loadTo } = props;
@@ -119,7 +81,7 @@ class RouteListService extends service_1.IncyclistService {
             if (list)
                 lists.push(list);
             else
-                lists = this.routes.map(rle => rle.list);
+                lists = this.lists.map(rle => rle.list);
             lists.forEach(l => {
                 const routes = this.getRouteList(l);
                 for (let i = loadFrom; i < loadTo; i++) {
@@ -137,12 +99,10 @@ class RouteListService extends service_1.IncyclistService {
         }
         this.stopAllRides();
         const page = this.registerPage(pageId, props);
-        if (props.visibleCards) {
-            this.preload(props.visibleCards);
-        }
-        else {
-            this.preload(5);
-        }
+        if (!this.state.preloadDone)
+            this.preload(props.visibleCards || 5);
+        else
+            this.onResize(pageId);
         return page.state;
     }
     closeRouteSelection(pageId) {
@@ -151,6 +111,20 @@ class RouteListService extends service_1.IncyclistService {
             this.state.pages.splice(idx, 1);
         }
     }
+    onResize(pageId) {
+        const page = this.getPage(pageId);
+        const routeIds = Object.keys(page.onCarouselStateChanged);
+        routeIds.forEach(id => {
+            var _a;
+            const route = this.getRoute(id);
+            const stateChange = (_a = page.onCarouselStateChanged[id]) === null || _a === void 0 ? void 0 : _a.onCarouselStateChanged;
+            if (stateChange)
+                stateChange({ initialized: true, visible: false });
+            const update = page.onRouteUpdate[id].onRouteStateChanged;
+            if (update)
+                update(route.data);
+        });
+    }
     openStartSettings(r) {
         var _a;
         const route = this.getRouteFromStartProps(r);
@@ -184,6 +158,8 @@ class RouteListService extends service_1.IncyclistService {
     }
     setCardUpdateHandler(pageId, r, list, idx, onRouteStateChanged, onCarouselStateChanged) {
         const route = this.getRouteFromStartProps(r);
+        if (!route)
+            return;
         const page = this.getPage(pageId);
         if (!page)
             return;
@@ -192,7 +168,6 @@ class RouteListService extends service_1.IncyclistService {
     }
     onCarouselInitialized(pageId, list, startIdx, visibleSize) {
         const page = this.getPage(pageId);
-        console.log('~~~ DEBUG:onCarouselInitialied', pageId, list, this.getListState(page, list), startIdx, visibleSize);
         if (!page)
             return;
         const listState = this.getListState(page, list);
@@ -204,8 +179,6 @@ class RouteListService extends service_1.IncyclistService {
         routes.forEach((route) => {
             const { idx, onCarouselStateChanged } = page.onCarouselStateChanged[route.id] || {};
             const visible = listState !== undefined ? idx >= listState.startIdx && idx <= listState.endIdx : undefined;
-            if (route.data.title === 'Malaga City Tour')
-                console.log('~~~ DEBUG:Initialized -checked detail', visible, idx, listState.startIdx, listState.endIdx, route.data);
             if (onCarouselStateChanged)
                 onCarouselStateChanged({ initialized: true, visible });
             if (visible && (route.data.state === 'prepared' || route.data.state === 'error')) {
@@ -215,7 +188,6 @@ class RouteListService extends service_1.IncyclistService {
     }
     onCarouselUpdated(pageId, list, startIdx, visibleSize) {
         const page = this.getPage(pageId);
-        console.log('~~~ DEBUG:onCarouselUpdated', pageId, list, this.getListState(page, list), startIdx, visibleSize);
         if (!page)
             return;
         const listState = this.getListState(page, list);
@@ -227,8 +199,6 @@ class RouteListService extends service_1.IncyclistService {
         routes.forEach((route) => {
             const { idx, onCarouselStateChanged } = page.onCarouselStateChanged[route.id] || {};
             const visible = listState !== undefined ? idx >= listState.startIdx && idx <= listState.endIdx : undefined;
-            if (route.data.title === 'Malaga City Tour')
-                console.log('~~~ DEBUG:Initialized -checked detail', visible, idx, listState.startIdx, listState.endIdx, route.data);
             if (onCarouselStateChanged)
                 onCarouselStateChanged({ initialized: true, visible });
             if (visible && route.data.state === 'prepared' || route.data.state === 'error') {
@@ -282,6 +252,44 @@ class RouteListService extends service_1.IncyclistService {
     }
     cancelDownload(routeId) {
     }
+    _preload(carouselSize = 5, detailsOnly = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!detailsOnly) {
+                yield this.loadRouteDescriptions();
+            }
+            this.emitPageUpdate();
+            const lists = this.getRouteLists().map(li => li.list);
+            lists.forEach((list) => {
+                this.preloadList(list, carouselSize);
+            });
+            this.logEvent({ message: 'preloading routes finished' });
+        });
+    }
+    preloadList(list, carouselSize = 5) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.emitPageUpdate();
+            const promises = [];
+            const rle = this.lists.find(l => l.list === list);
+            if (((_a = rle.routes) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                this.sort(rle.routes);
+                let cntApi = 0;
+                rle.routes.forEach((r) => {
+                    if (!r.data.isLocal) {
+                        cntApi++;
+                    }
+                    if (r.data.isLocal || cntApi <= Math.min(carouselSize, rle.routes.length)) {
+                        promises.push(this.loadRouteDetais(r));
+                    }
+                });
+            }
+            console.log('~~~ DEBUG: during preload', promises.length);
+            Promise.allSettled(promises).then((res) => {
+                console.log('~~~ DEBUG: after preload', (0, clone_1.default)(this.state), (0, clone_1.default)(this.routeDescriptions), res);
+                this.saveRouteDescriptions();
+            });
+        });
+    }
     loadStartSettingsFromUserSettings(route) {
         let startPos = 0, realityFactor = 100, segment;
         const { data } = route;
@@ -301,6 +309,10 @@ class RouteListService extends service_1.IncyclistService {
         if (prevRoutePosition !== null) {
             startPos = prevRoutePosition;
         }
+        if (data.videoFormat === 'avi') {
+            startPos = 0;
+            segment = undefined;
+        }
         return { startPos, realityFactor, segment };
     }
     writeStartSettingsToUserSettings(route, startSettings) {
@@ -335,10 +347,10 @@ class RouteListService extends service_1.IncyclistService {
         });
     }
     initRouteLists() {
-        this.routes = [];
-        this.routes.push({ list: "myRoutes", routes: [] });
-        this.routes.push({ list: "selected", routes: [] });
-        this.routes.push({ list: "alternatives", routes: [] });
+        this.lists = [];
+        this.lists.push({ list: "myRoutes", routes: [] });
+        this.lists.push({ list: "selected", routes: [] });
+        this.lists.push({ list: "alternatives", routes: [] });
     }
     getPageState(pageId, lang) {
         var _a;
@@ -347,6 +359,11 @@ class RouteListService extends service_1.IncyclistService {
         const language = lang || ((_a = this.getPage(pageId)) === null || _a === void 0 ? void 0 : _a.language) || 'en';
         const add = (list, listHeader) => {
             const data = this.getRouteList(list);
+            if (list === 'myRoutes' && !data.find(r => r.data.type === 'free-ride')) {
+                const card = new FreeRideCard_1.FreeRideCard('loaded');
+                const route = { data: card, id: 'free-ride', };
+                data.unshift(route);
+            }
             if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
                 lists.push(this.getRouteListDataEntry(list, data, language, listHeader));
             }
@@ -354,6 +371,7 @@ class RouteListService extends service_1.IncyclistService {
         add('myRoutes', 'My Routes');
         add('selected', 'Selected For Me');
         add('alternatives', 'Alternatives');
+        console.log('~~~ DEBUG:getPageState', state);
         return state;
     }
     registerPage(pageId, props) {
@@ -407,7 +425,9 @@ class RouteListService extends service_1.IncyclistService {
         local.distance = local.distance || details.distance;
         local.elevation = local.elevation || details.elevation;
         local.localizedTitle = local.localizedTitle || details.localizedTitle;
-        local.points = details.points;
+        if (!local.points) {
+            local.points = details.points;
+        }
         if (!local.hasGpx && details.points) {
             local.hasGpx = true;
         }
@@ -434,7 +454,7 @@ class RouteListService extends service_1.IncyclistService {
     }
     convertDescription(descr, isLocal) {
         const { id, title, localizedTitle, country, distance, elevation, category, provider, video, points } = descr;
-        const data = { state: 'prepared', id, title, localizedTitle, country, distance, elevation, provider, category };
+        const data = { type: 'route', state: 'prepared', id, title, localizedTitle, country, distance, elevation, provider, category };
         data.hasVideo = false;
         data.hasGpx = false;
         data.isLocal = isLocal || false;
@@ -460,7 +480,6 @@ class RouteListService extends service_1.IncyclistService {
             if (description.category === 'personal')
                 return 'myRoutes';
             list = description.category ? 'alternatives' : 'selected';
-            console.log('~~~ DEBUG', description.title, description.private, list);
             return list;
         }
         if (description.type === 'video') {
@@ -478,7 +497,7 @@ class RouteListService extends service_1.IncyclistService {
     }
     getRouteList(list) {
         var _a;
-        return (_a = this.routes.find(rle => rle.list === list)) === null || _a === void 0 ? void 0 : _a.routes;
+        return (_a = this.lists.find(rle => rle.list === list)) === null || _a === void 0 ? void 0 : _a.routes;
     }
     getRouteLists() {
         const lists = [
@@ -492,19 +511,36 @@ class RouteListService extends service_1.IncyclistService {
         let compareFn = criteria;
         if (typeof criteria === 'string')
             compareFn = v => v.id === criteria;
-        const lists = this.routes;
+        const lists = this.lists;
         let route = null;
         for (let i = 0; i < lists.length && !route; i++) {
             route = lists[i].routes.find(compareFn);
         }
         return route;
     }
+    getAllRoutes() {
+        const lists = this.lists;
+        const routes = [];
+        for (let i = 0; i < lists.length; i++) {
+            routes.push(...lists[i].routes);
+        }
+        return routes;
+    }
     stopAllRides() {
-        const lists = this.routes;
+        const lists = this.lists;
         for (let i = 0; i < lists.length; i++) {
             lists[i].routes.forEach(r => r.startState = 'idle');
         }
     }
+    addDescriptionsFromDB(descriptions) {
+        const ids = Object.keys(descriptions);
+        const routes = ids.map(id => descriptions[id]);
+        this.routeDescriptions = descriptions;
+        routes.forEach((data) => {
+            data.state = "prepared";
+            this.addRouteToList(data.list, { data, id: data.id });
+        });
+    }
     addDescriptionsFromRepo(descriptions, repo) {
         const routes = descriptions;
         if (repo) {
@@ -526,13 +562,13 @@ class RouteListService extends service_1.IncyclistService {
                 data.isLocal = true;
                 const item = { id: data.id, data };
                 this.addRouteToList(list, item);
+                this.routeDescriptions[data.id] = Object.assign(Object.assign({}, data), { list });
             }
         });
     }
     addDescriptionsFromServer(descriptions) {
         const converted = descriptions.map(this.convertDescription.bind(this));
         converted.forEach((data, idx) => {
-            console.log('~~~ DEBUG:add route from Server', data.title);
             const existing = this.getRoute(data.id);
             if (existing) {
                 return;
@@ -551,6 +587,7 @@ class RouteListService extends service_1.IncyclistService {
                 data.isLocal = false;
                 const item = { id: data.id, data };
                 this.addRouteToList(list, item);
+                this.routeDescriptions[data.id] = Object.assign(Object.assign({}, data), { list });
                 this.emitPageUpdate();
             }
         });
@@ -594,30 +631,53 @@ class RouteListService extends service_1.IncyclistService {
     }
     loadRouteDescriptionsFromRepo() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ DEBUG:loadRouteDescriptionsFromRepo');
-            const enrichRepo = (v, type) => {
-                const data = v;
-                return Object.assign({ type }, data);
-            };
-            const videos = ((yield this.getVideosRepo().read('routes')) || []);
-            console.log('~~~ DEBUG,videos:', videos);
-            this.addDescriptionsFromRepo(videos, this.getVideosRepo());
-            const routes = ((yield this.getRoutesRepo().read('routes')) || []);
-            console.log('~~~ DEBUG,routes:', routes);
-            this.addDescriptionsFromRepo(routes, this.getVideosRepo());
+            if (Object.keys(this.routeDescriptions).length > 0) {
+                this.emitPageUpdate();
+                return;
+            }
+            const all = yield this.getRoutesRepo().read('settings');
+            if (!all) {
+                const videos = ((yield this.getVideosRepo().read('routes')) || []);
+                this.addDescriptionsFromRepo(videos, this.getVideosRepo());
+                const routes = ((yield this.getRoutesRepo().read('routes')) || []);
+                this.addDescriptionsFromRepo(routes, this.getRoutesRepo());
+            }
+            else {
+                const ids = Object.keys(all);
+                ids.forEach(id => {
+                    const r = all[id];
+                    if (typeof r.points === 'string') {
+                        this.decodePoints(r);
+                    }
+                    if (!Array.isArray(r.points))
+                        delete r.points;
+                });
+                console.log('~~~ DEBUG:', all);
+                this.addDescriptionsFromDB(all);
+            }
+            this.saveRouteDescriptions();
+        });
+    }
+    saveRouteDescriptions() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ids = Object.keys(this.routeDescriptions);
+            const data = ids.map(id => {
+                const r = this.routeDescriptions[id];
+                if (r.points)
+                    this.encodePoints(r);
+                return Object.assign({}, r);
+            });
+            yield this.getRoutesRepo().write('settings', data);
         });
     }
     loadRouteDescriptionsFromServer() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ DEBUG:loadRouteDescriptionsFromServer');
             const enrichApi = (v, type) => (Object.assign({ type }, v));
             const api = [
                 this.api.getRouteDescriptions({ type: 'gpx' }).then(v => v.map(e => enrichApi(e, 'gpx'))),
                 this.api.getRouteDescriptions({ type: 'video' }).then(v => v.map(e => enrichApi(e, 'video')))
             ];
             const res = yield Promise.allSettled(api);
-            console.log('~~~ DEBUG:loadRouteDescriptionsFromServer done', (new Date()).toISOString(), res);
-            this.emitPageUpdate();
             res.forEach(p => {
                 if (p.status === 'fulfilled') {
                     this.addDescriptionsFromServer(p.value);
@@ -627,34 +687,45 @@ class RouteListService extends service_1.IncyclistService {
     }
     loadRouteDescriptions() {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('~~~ DEBUG:loadRouteDescriptions', Object.keys(this.routeDescriptions));
             yield this.loadRouteDescriptionsFromRepo();
-            console.log('~~~ DEBUG, routes after Repo', this.routes);
             this.emitPageUpdate();
-            this.loadRouteDescriptionsFromServer().then(() => {
-                console.log('~~~ DEBUG, routes after API', this.routes);
-            });
+            if (this.isDescriptionsLoaded()) {
+                yield this.loadRouteDescriptionsFromServer();
+                this.emitPageUpdate();
+                this.saveRouteDescriptions();
+            }
+            else {
+                this.loadRouteDescriptionsFromServer().then(() => {
+                    this.emitPageUpdate();
+                });
+            }
         });
     }
     loadRouteDetais(route) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ DEBUG:loadDetails()', (0, clone_1.default)(route.data));
-            if (route.data.state === 'loaded')
+            if (route.data.state === 'loaded' || route.data.state === 'loading')
                 return;
             try {
                 route.data.state = 'loading';
                 this.emitRouteUpdated(route);
-                if (route.data.isLocal) {
+                try {
                     route.details = route.data.hasVideo ?
-                        yield this.videosRepo.read(route.id)
+                        yield this.getVideosRepo().read(route.id)
                         :
-                            yield this.routesRepo.read(route.id);
+                            yield this.getRoutesRepo().read(route.id);
                     api_1.default.verify(route.details);
                 }
-                else {
+                catch (err) {
+                    console.log('~~~ DEBUG:error', route.data.title, route.data.isLocal, err);
+                    if (route.data.isLocal)
+                        throw err;
+                }
+                if (!route.details) {
                     route.details = yield this.api.getRouteDetails(route.id);
+                    api_1.default.verify(route.details);
+                    this.saveRouteDetails(route);
                 }
-                if (route.data.title === 'Arnbach')
-                    console.log('~~~ DEBUG: loaded details', route.details);
                 if (route.details.id !== route.data.id) {
                     route.data.state = 'error';
                     delete route.details;
@@ -663,14 +734,30 @@ class RouteListService extends service_1.IncyclistService {
                 this.mergeWithDetails(route);
                 route.data.state = 'loaded';
                 this.emitRouteUpdated(route);
+                const { list } = this.routeDescriptions[route.id];
+                this.routeDescriptions[route.id] = Object.assign(Object.assign({}, route.data), { list });
+                return route.data;
             }
             catch (e) {
-                console.log('~~~ DEBUG:Error', e);
                 route.data.state = 'error';
                 this.emitRouteUpdated(route);
             }
         });
     }
+    saveRouteDetails(route) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                route.details = route.data.hasVideo ?
+                    yield this.videosRepo.write(route.id, route.details)
+                    :
+                        yield this.routesRepo.write(route.id, route.details);
+            }
+            catch (err) {
+                if (route.data.isLocal)
+                    throw err;
+            }
+        });
+    }
     emitRouteUpdated(route) {
         this.emit('route-update', route.id, route.data);
         this.state.pages.forEach(page => {
@@ -688,7 +775,6 @@ class RouteListService extends service_1.IncyclistService {
         });
     }
     getListState(page, list) {
-        console.log('~~~ DEBUG.getListState', list, page === null || page === void 0 ? void 0 : page.state, this.state);
         return page === null || page === void 0 ? void 0 : page.state.lists.find(pl => pl.list === list);
     }
     getRouteFromStartProps(r) {
@@ -707,6 +793,15 @@ class RouteListService extends service_1.IncyclistService {
             return;
         }
     }
+    isDescriptionsLoaded() {
+        return Object.keys(this.routeDescriptions).length === 0;
+    }
+    decodePoints(r) {
+        return;
+    }
+    encodePoints(r) {
+        return;
+    }
 }
 exports.RouteListService = RouteListService;
 const useRouteList = () => RouteListService.getInstance();

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

@@ -12,10 +12,14 @@ export type RouteListStartProps = {
 export type LocalizedText = {
     [index: string]: string;
 };
-export type RouteInfo = {
+export type CardType = 'route' | 'free-ride' | 'import';
+export interface CardInfo {
+    type: CardType;
     state: RouteState;
-    id?: string;
     title?: string;
+}
+export interface RouteInfo extends CardInfo {
+    id?: string;
     localizedTitle?: LocalizedText;
     country?: string;
     isLoop?: boolean;
@@ -31,8 +35,21 @@ export type RouteInfo = {
     videoFormat?: string;
     videoUrl?: string;
     previewUrl?: string;
-    points?: Array<RoutePoint>;
+    points?: Array<RoutePoint> | string;
     segments?: Array<RouteSegment>;
+}
+export interface RouteDBEntry extends RouteInfo {
+    list: List;
+    settings?: {
+        position?: number;
+        segment?: string;
+        realityFactor?: number;
+    };
+    cntStarts?: number;
+    lastStart?: number;
+}
+export type RoutesDB = {
+    [index: string]: RouteDBEntry;
 };
 export type RouteListDateEntry = {
     list: List;
@@ -87,17 +104,20 @@ export interface InternalRouteListState {
     initialized: boolean;
     pages: Array<Page>;
     loading?: LoadingState;
+    preloadDone: boolean;
 }
 export type RouteStartState = 'idle' | 'preparing' | 'selected' | 'started';
-export type Route = {
+export type Card<T> = {
     id: string;
-    data: RouteInfo;
+    data: T;
     details?: RouteApiDetail;
     startSettings?: RouteStartSettings;
     startState?: RouteStartState;
 };
-export type RouteListEntry = {
+export type CardListEntry<T> = {
     list: List;
-    routes: Array<Route>;
+    routes: Array<Card<T>>;
 };
+export type Route = Card<RouteInfo>;
+export type RouteListEntry = CardListEntry<RouteInfo>;
 export type List = 'myRoutes' | 'alternatives' | 'selected';

package/lib/utils/geo.js

@@ -47,9 +47,11 @@ const getPointAfter = (p1, p2, offset) => {
 };
 exports.getPointAfter = getPointAfter;
 const getLatLng = (position) => {
-    if (Array.isArray(position))
+    if (Array.isArray(position)) {
         return { lat: position[0], lng: position[1] };
-    if (position.lat !== undefined && position.lng !== undefined)
+    }
+    if (position.lat !== undefined && position.lng !== undefined) {
         return position;
+    }
 };
 exports.getLatLng = getLatLng;

package/package.json

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