incyclist-services 1.5.3 → 1.5.4

package/lib/ride/route/GpxDisplayService.js

@@ -164,9 +164,8 @@ let GpxDisplayService = (() => {
                 const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
                 if (rideView === 'sv') {
                     const updatePending = (Date.now() - ((_b = this.tsPrevSVUpdate) !== null && _b !== void 0 ? _b : 0)) > this.getDefaultUpdateFrequency();
-                    const stillBusy = (!this.tsPositionUpdateConfirmed && (Date.now() - ((_c = this.tsPrevSVUpdate) !== null && _c !== void 0 ? _c : 0)) < 500) || (Date.now() - this.tsLastSVEvent) < this.getMinimalPause();
+                    const stillBusy = (!this.tsPositionUpdateConfirmed && (Date.now() - ((_c = this.tsPrevSVUpdate) !== null && _c !== void 0 ? _c : 0)) < 500) || (Date.now() - ((_d = this.tsLastSVEvent) !== null && _d !== void 0 ? _d : 0)) < this.getMinimalPause();
                     const updatePossible = this.tsPositionUpdateConfirmed && (Date.now() - this.tsLastSVEvent) > this.getBestCaseUpdateFrequency();
-                    console.log('# service.onPositionUpdate', rideView, this.tsLastSVEvent - ((_d = this.tsPrevSVUpdate) !== null && _d !== void 0 ? _d : 0), Object.assign({ stillBusy, updatePossible, updatePending }, state));
                     if ((!stillBusy || !this.tsPrevSVUpdate) && (updatePending || updatePossible)) {
                         if (position) {
                             const freq = this.tsPrevSVUpdate ? Date.now() - this.tsPrevSVUpdate : undefined;
@@ -180,6 +179,17 @@ let GpxDisplayService = (() => {
                             delete this.tsLastSVEvent;
                         }
                     }
+                    else {
+                        const duration = this.tsPrevSVUpdate ? Date.now() - this.tsPrevSVUpdate : undefined;
+                        if (stillBusy) {
+                            this.logEvent({ message: 'street view position update skipped', reason: 'busy', duration });
+                            if (duration > 10000) {
+                                delete this.tsPrevSVUpdate;
+                                delete this.tsPositionUpdateConfirmed;
+                                delete this.tsLastSVEvent;
+                            }
+                        }
+                    }
                 }
                 else {
                     console.log('# position update', this.position);

package/lib/workouts/list/cards/WorkoutCard.d.ts

@@ -37,4 +37,5 @@ export declare class WorkoutCard extends BaseCard implements Card<Workout> {
     protected getRepo(): WorkoutsDbLoader;
     protected emitUpdate(): void;
     protected isSelected(): boolean;
+    protected getRouteList(): import("../../../routes").RouteListService;
 }

package/lib/workouts/list/cards/WorkoutCard.js

@@ -1,4 +1,38 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -18,200 +52,223 @@ const settings_1 = require("../../../settings");
 const service_1 = require("../service");
 const utils_1 = require("../../../utils");
 const valid_1 = require("../../../utils/valid");
-class WorkoutCard extends base_1.BaseCard {
-    constructor(workout, props) {
-        super();
-        this.cardObserver = new observer_1.Observer();
-        const { list } = props || {};
-        this.workout = workout;
-        this.list = list;
-        this.deleteable = true;
-        this.initialized = false;
-        this.logger = new gd_eventlog_1.EventLogger('WorkoutCard');
-    }
-    openSettings() {
-        var _a, _b;
-        let settings, canStart, duration, ftpRequired, categories = [], category, canStartWorkoutOnly;
-        try {
-            const service = (0, service_1.useWorkoutList)();
-            canStart = service.canDisplayStart();
-            canStartWorkoutOnly = !canStart;
-            duration = this.calculateDuration();
-            ftpRequired = (0, valid_1.valid)(this.workout.steps.find(s => {
-                var _a;
-                return (s.type == 'step' && ((_a = s.power) === null || _a === void 0 ? void 0 : _a.type) === 'pct of FTP') ||
-                    (s.type == 'segment' && (s === null || s === void 0 ? void 0 : s.steps.find(s => { var _a; return (s.type == 'step' && ((_a = s.power) === null || _a === void 0 ? void 0 : _a.type) === 'pct of FTP'); })));
-            }));
-            settings = (_a = service.getStartSettings()) !== null && _a !== void 0 ? _a : {};
-            categories = ((_b = service.getLists()) !== null && _b !== void 0 ? _b : []).map(l => l.getTitle());
-            category = this.list.getTitle();
-        }
-        catch (err) {
-            this.logError(err, 'openSettings');
-        }
-        return { settings, ftpRequired, canStart, canStartWorkoutOnly, duration, categories, category };
-    }
-    select(settings) {
-        const service = (0, service_1.getWorkoutList)();
-        service.selectCard(this);
-        if (settings)
-            service.setStartSettings(settings);
-        this.emitUpdate();
-    }
-    unselect() {
-        const service = (0, service_1.getWorkoutList)();
-        service.unselect();
-        this.emitUpdate();
-    }
-    move(targetListName) {
-        if (!(targetListName === null || targetListName === void 0 ? void 0 : targetListName.length))
-            return;
-        const service = (0, service_1.getWorkoutList)();
-        const newList = service.moveCard(this, this.list, targetListName);
-        if (newList) {
-            this.list = newList;
-        }
-        this.workout.category = { name: targetListName, index: newList === null || newList === void 0 ? void 0 : newList.length };
-        this.save(true);
-    }
-    save() {
-        return __awaiter(this, arguments, void 0, function* (enforce = false) {
-            try {
-                return yield this.getRepo().save(this.workout, enforce);
+const routes_1 = require("../../../routes");
+const decorators_1 = require("../../../base/decorators");
+let WorkoutCard = (() => {
+    var _a;
+    let _classSuper = base_1.BaseCard;
+    let _instanceExtraInitializers = [];
+    let _getRouteList_decorators;
+    return _a = class WorkoutCard extends _classSuper {
+            constructor(workout, props) {
+                super();
+                this.workout = __runInitializers(this, _instanceExtraInitializers);
+                this.cardObserver = new observer_1.Observer();
+                const { list } = props || {};
+                this.workout = workout;
+                this.list = list;
+                this.deleteable = true;
+                this.initialized = false;
+                this.logger = new gd_eventlog_1.EventLogger('WorkoutCard');
             }
-            catch (err) {
-                this.logError(err, 'save');
+            openSettings() {
+                var _b, _c;
+                let settings, canStart, duration, ftpRequired, categories = [], category, canStartWorkoutOnly;
+                try {
+                    const service = (0, service_1.useWorkoutList)();
+                    canStart = service.canDisplayStart();
+                    canStartWorkoutOnly = !canStart;
+                    duration = this.calculateDuration();
+                    ftpRequired = (0, valid_1.valid)(this.workout.steps.find(s => {
+                        var _b;
+                        return (s.type == 'step' && ((_b = s.power) === null || _b === void 0 ? void 0 : _b.type) === 'pct of FTP') ||
+                            (s.type == 'segment' && (s === null || s === void 0 ? void 0 : s.steps.find(s => { var _b; return (s.type == 'step' && ((_b = s.power) === null || _b === void 0 ? void 0 : _b.type) === 'pct of FTP'); })));
+                    }));
+                    settings = (_b = service.getStartSettings()) !== null && _b !== void 0 ? _b : {};
+                    categories = ((_c = service.getLists()) !== null && _c !== void 0 ? _c : []).map(l => l.getTitle());
+                    category = this.list.getTitle();
+                }
+                catch (err) {
+                    this.logError(err, 'openSettings');
+                }
+                return { settings, ftpRequired, canStart, canStartWorkoutOnly, duration, categories, category };
             }
-        });
-    }
-    delete() {
-        try {
-            const service = (0, service_1.getWorkoutList)();
-            service.unselectCard(this);
-            if (this.deleteObserver)
-                return this.deleteObserver;
-            this.deleteObserver = new observer_1.PromiseObserver(this._delete());
-            return this.deleteObserver;
-        }
-        catch (err) {
-            this.logError(err, 'delete');
-        }
-    }
-    getId() {
-        return this.workout.id;
-    }
-    getTitle() {
-        return this.workout.name;
-    }
-    update(workout) {
-        if (!(0, valid_1.valid)(workout))
-            return;
-        try {
-            this.workout = workout;
-            this.save();
-            this.emitUpdate();
-        }
-        catch (err) {
-            this.logError(err, 'update');
-        }
-    }
-    getData() {
-        return this.workout;
-    }
-    getCardType() {
-        return "Workout";
-    }
-    getDisplayProperties() {
-        const userSettings = (0, settings_1.useUserSettings)();
-        let user;
-        try {
-            user = userSettings.get('user', {});
-        }
-        catch (_a) {
-            user = {};
-        }
-        const duration = this.calculateDuration();
-        return { title: this.workout.name, workout: this.workout, ftp: user === null || user === void 0 ? void 0 : user.ftp, duration,
-            canDelete: this.deleteable, visible: this.visible, selected: this.isSelected(),
-            observer: this.cardObserver };
-    }
-    enableDelete(enabled = true) {
-        this.deleteable = enabled;
-    }
-    canDelete() {
-        return this.deleteable;
-    }
-    setVisible(visible) {
-        try {
-            const prev = this.visible;
-            this.visible = visible;
-            if (visible !== prev)
+            select(settings) {
+                const service = (0, service_1.getWorkoutList)();
+                service.selectCard(this);
+                if (settings)
+                    service.setStartSettings(settings);
+                if (settings.noRoute) {
+                    this.getRouteList().unselect();
+                }
                 this.emitUpdate();
-        }
-        catch (err) {
-            this.logError(err, 'setVisible');
-        }
-    }
-    _delete() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield (0, utils_1.waitNextTick)();
-            let deleted = false;
-            try {
-                this.deleteObserver.emit('started');
-                yield this.getRepo().delete(this.workout);
-                this.deleteFromUIList();
-                (0, service_1.getWorkoutList)().emitLists('updated');
-                deleted = true;
-            }
-            catch (_a) {
-                deleted = false;
-            }
-            finally {
-                this.deleteObserver.emit('done', deleted);
-                (0, utils_1.waitNextTick)().then(() => {
-                    delete this.deleteObserver;
+            }
+            unselect() {
+                const service = (0, service_1.getWorkoutList)();
+                service.unselect();
+                this.emitUpdate();
+            }
+            move(targetListName) {
+                if (!(targetListName === null || targetListName === void 0 ? void 0 : targetListName.length))
+                    return;
+                const service = (0, service_1.getWorkoutList)();
+                const newList = service.moveCard(this, this.list, targetListName);
+                if (newList) {
+                    this.list = newList;
+                }
+                this.workout.category = { name: targetListName, index: newList === null || newList === void 0 ? void 0 : newList.length };
+                this.save(true);
+            }
+            save() {
+                return __awaiter(this, arguments, void 0, function* (enforce = false) {
+                    try {
+                        return yield this.getRepo().save(this.workout, enforce);
+                    }
+                    catch (err) {
+                        this.logError(err, 'save');
+                    }
                 });
             }
-            return deleted;
-        });
-    }
-    calculateDuration() {
-        const { duration } = this.workout;
-        if (duration < 120)
-            return `${duration.toFixed(0)}s`;
-        if (duration % 60 === 0)
-            return `${duration / 60}min`;
-        const secVal = duration % 60;
-        const minVal = (duration - secVal) / 60 % 60;
-        const h = Math.floor((duration - secVal - minVal * 60) / 3600);
-        const sec = secVal < 10 ? `0${secVal}` : secVal;
-        const min = minVal < 10 ? `0${minVal}` : minVal;
-        if (h > 0)
-            return `${h}:${min}:${sec}`;
-        else
-            return `${min}:${sec}`;
-    }
-    deleteFromUIList() {
-        if (this.list) {
-            this.list.remove(this);
-        }
-    }
-    logError(err, fn) {
-        this.logger.logEvent({ message: 'error', error: err.message, fn, stack: err.stack });
-    }
-    getRepo() {
-        return new db_1.WorkoutsDbLoader();
-    }
-    emitUpdate() {
-        if (this.cardObserver)
-            this.cardObserver.emit('update', this.getDisplayProperties());
-    }
-    isSelected() {
-        const service = (0, service_1.getWorkoutList)();
-        const selectedWorkout = service.getSelected();
-        if ((selectedWorkout === null || selectedWorkout === void 0 ? void 0 : selectedWorkout.id) === this.workout.id)
-            return true;
-        return false;
-    }
-}
+            delete() {
+                try {
+                    const service = (0, service_1.getWorkoutList)();
+                    service.unselectCard(this);
+                    if (this.deleteObserver)
+                        return this.deleteObserver;
+                    this.deleteObserver = new observer_1.PromiseObserver(this._delete());
+                    return this.deleteObserver;
+                }
+                catch (err) {
+                    this.logError(err, 'delete');
+                }
+            }
+            getId() {
+                return this.workout.id;
+            }
+            getTitle() {
+                return this.workout.name;
+            }
+            update(workout) {
+                if (!(0, valid_1.valid)(workout))
+                    return;
+                try {
+                    this.workout = workout;
+                    this.save();
+                    this.emitUpdate();
+                }
+                catch (err) {
+                    this.logError(err, 'update');
+                }
+            }
+            getData() {
+                return this.workout;
+            }
+            getCardType() {
+                return "Workout";
+            }
+            getDisplayProperties() {
+                const userSettings = (0, settings_1.useUserSettings)();
+                let user;
+                try {
+                    user = userSettings.get('user', {});
+                }
+                catch (_b) {
+                    user = {};
+                }
+                const duration = this.calculateDuration();
+                return { title: this.workout.name, workout: this.workout, ftp: user === null || user === void 0 ? void 0 : user.ftp, duration,
+                    canDelete: this.deleteable, visible: this.visible, selected: this.isSelected(),
+                    observer: this.cardObserver };
+            }
+            enableDelete(enabled = true) {
+                this.deleteable = enabled;
+            }
+            canDelete() {
+                return this.deleteable;
+            }
+            setVisible(visible) {
+                try {
+                    const prev = this.visible;
+                    this.visible = visible;
+                    if (visible !== prev)
+                        this.emitUpdate();
+                }
+                catch (err) {
+                    this.logError(err, 'setVisible');
+                }
+            }
+            _delete() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    yield (0, utils_1.waitNextTick)();
+                    let deleted = false;
+                    try {
+                        this.deleteObserver.emit('started');
+                        yield this.getRepo().delete(this.workout);
+                        this.deleteFromUIList();
+                        (0, service_1.getWorkoutList)().emitLists('updated');
+                        deleted = true;
+                    }
+                    catch (_b) {
+                        deleted = false;
+                    }
+                    finally {
+                        this.deleteObserver.emit('done', deleted);
+                        (0, utils_1.waitNextTick)().then(() => {
+                            delete this.deleteObserver;
+                        });
+                    }
+                    return deleted;
+                });
+            }
+            calculateDuration() {
+                const { duration } = this.workout;
+                if (duration < 120)
+                    return `${duration.toFixed(0)}s`;
+                if (duration % 60 === 0)
+                    return `${duration / 60}min`;
+                const secVal = duration % 60;
+                const minVal = (duration - secVal) / 60 % 60;
+                const h = Math.floor((duration - secVal - minVal * 60) / 3600);
+                const sec = secVal < 10 ? `0${secVal}` : secVal;
+                const min = minVal < 10 ? `0${minVal}` : minVal;
+                if (h > 0)
+                    return `${h}:${min}:${sec}`;
+                else
+                    return `${min}:${sec}`;
+            }
+            deleteFromUIList() {
+                if (this.list) {
+                    this.list.remove(this);
+                }
+            }
+            logError(err, fn) {
+                this.logger.logEvent({ message: 'error', error: err.message, fn, stack: err.stack });
+            }
+            getRepo() {
+                return new db_1.WorkoutsDbLoader();
+            }
+            emitUpdate() {
+                if (this.cardObserver)
+                    this.cardObserver.emit('update', this.getDisplayProperties());
+            }
+            isSelected() {
+                const service = (0, service_1.getWorkoutList)();
+                const selectedWorkout = service.getSelected();
+                if ((selectedWorkout === null || selectedWorkout === void 0 ? void 0 : selectedWorkout.id) === this.workout.id)
+                    return true;
+                return false;
+            }
+            getRouteList() {
+                return (0, routes_1.useRouteList)();
+            }
+        },
+        (() => {
+            var _b;
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
+            _getRouteList_decorators = [decorators_1.Injectable];
+            __esDecorate(_a, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
 exports.WorkoutCard = WorkoutCard;

package/lib/workouts/list/cards/types.d.ts

@@ -27,6 +27,7 @@ export interface ActiveImportProps {
 export interface WorkoutSettings {
     ftp?: number;
     useErgMode?: boolean;
+    noRoute?: boolean;
 }
 export interface WorkoutSettingsDisplayProps {
     settings: WorkoutSettings;

package/package.json

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