incyclist-services 1.5.67 → 1.5.69

package/lib/activities/ride/service.js

@@ -341,47 +341,39 @@ let ActivityRideService = (() => {
             }
         }
         canShowDonate() {
-            var _a, _b, _c, _d;
-            if (!((_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.uuid))
-                return false;
-            if (this.isDonateShown || !((_d = (_c = this.activity) === null || _c === void 0 ? void 0 : _c.user) === null || _d === void 0 ? void 0 : _d.uuid))
-                return true;
-            let trialGroup;
-            if (this.activity.user.uuid.startsWith('1') || this.activity.user.uuid.startsWith('a')) {
-                trialGroup = 'A';
-            }
-            else if (this.activity.user.uuid.startsWith('2') || this.activity.user.uuid.startsWith('b')) {
-                trialGroup = 'B';
-            }
-            if (!trialGroup) {
-                if (this.saveObserver)
-                    this.logEvent({ message: 'donate check ', showDonate: false, reason: 'user not in trial' });
-                return false;
-            }
-            if (this.saveObserver || this.isSaveDone || trialGroup === 'B') {
-                const lastClicked = this.getUserSettings().getValue('state.donateClicked', 0);
-                if (Date.now() - lastClicked < 1000 * 60 * 60 * 24 * 365) {
-                    if (this.saveObserver)
-                        this.logEvent({ message: 'donate check ', showDonate: false, lastClicked: new Date(lastClicked).toISOString() });
-                    return false;
+            try {
+                if (this.isDonateShown) {
+                    return true;
                 }
-                const lastShown = this.getUserSettings().getValue('state.donateShown', 0);
-                if (Date.now() - lastShown < 1000 * 60 * 60 * 24 * 14) {
+                let trialGroup = 'A';
+                if (this.saveObserver || this.isSaveDone || trialGroup === 'B') {
+                    const lastClicked = this.getUserSettings().getValue('state.donateClicked', 0);
+                    if (Date.now() - lastClicked < 1000 * 60 * 60 * 24 * 365) {
+                        if (this.saveObserver)
+                            this.logEvent({ message: 'donate check ', showDonate: false, lastClicked: new Date(lastClicked).toISOString() });
+                        return false;
+                    }
+                    const lastShown = this.getUserSettings().getValue('state.donateShown', 0);
+                    if (Date.now() - lastShown < 1000 * 60 * 60 * 24 * 14) {
+                        if (this.saveObserver)
+                            this.logEvent({ message: 'donate check ', showDonate: false, lastClicked: new Date(lastShown).toISOString() });
+                        return false;
+                    }
+                    const activities = this.getRepo().getAll();
+                    const lastYear = new Date();
+                    lastYear.setFullYear(lastYear.getFullYear() - 1);
+                    const activitiesLastYear = activities.filter(a => { var _a, _b; return ((_a = a.summary) === null || _a === void 0 ? void 0 : _a.startTime) > lastYear.getTime() && ((_b = a.summary) === null || _b === void 0 ? void 0 : _b.distance) > 2000; });
                     if (this.saveObserver)
-                        this.logEvent({ message: 'donate check ', showDonate: false, lastClicked: new Date(lastShown).toISOString() });
-                    return false;
+                        this.logEvent({ message: 'donate check ', trialGroup, showDonate: (activitiesLastYear === null || activitiesLastYear === void 0 ? void 0 : activitiesLastYear.length) >= 10, activities: activitiesLastYear === null || activitiesLastYear === void 0 ? void 0 : activitiesLastYear.length });
+                    if (activitiesLastYear.length < 10)
+                        return false;
+                    this.getUserSettings().set('state.donateShown', Date.now());
+                    this.isDonateShown = true;
+                    return true;
                 }
-                const activities = this.getRepo().getAll();
-                const lastYear = new Date();
-                lastYear.setFullYear(lastYear.getFullYear() - 1);
-                const activitiesLastYear = activities.filter(a => { var _a, _b; return ((_a = a.summary) === null || _a === void 0 ? void 0 : _a.startTime) > lastYear.getTime() && ((_b = a.summary) === null || _b === void 0 ? void 0 : _b.distance) > 2000; });
-                if (this.saveObserver)
-                    this.logEvent({ message: 'donate check ', trialGroup, showDonate: (activitiesLastYear === null || activitiesLastYear === void 0 ? void 0 : activitiesLastYear.length) >= 10, activities: activitiesLastYear === null || activitiesLastYear === void 0 ? void 0 : activitiesLastYear.length });
-                if (activitiesLastYear.length < 10)
-                    return false;
-                this.getUserSettings().set('state.donateShown', Date.now());
-                this.isDonateShown = true;
-                return true;
+            }
+            catch (err) {
+                this.logError(err, 'canShowDonate');
             }
             return false;
         }

package/lib/apps/googleMaps/service.d.ts

@@ -8,6 +8,7 @@ export declare class GoogleMapsService extends IncyclistService {
     hasPersonalApiKey(): boolean;
     onPersonalApiKeySet(): void;
     getMapsDownloadUrl(): string;
+    reload(): void;
     protected getSecret(key: string): string;
     protected getSecretBindings(): import("../../api/bindings/secret").ISecretBinding;
     protected getUserSettings(): import("../../settings").UserSettingsService;

package/lib/apps/googleMaps/service.js

@@ -96,6 +96,10 @@ let GoogleMapsService = (() => {
         getMapsDownloadUrl() {
             return MAPS_API_URL;
         }
+        reload() {
+            delete this.api;
+            this.emit('reload');
+        }
         getSecret(key) {
             var _a;
             return (_a = this.getSecretBindings()) === null || _a === void 0 ? void 0 : _a.getSecret(key);

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

@@ -23,6 +23,7 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected readonly onChangeState: any;
     protected startDeviceHandlers: any;
     protected isResuming: boolean;
+    protected stateUpdateHandler: any;
     constructor();
     init(): Promise<Observer>;
     start(simulate?: boolean): void;
@@ -89,6 +90,7 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected initWorkout(): void;
     protected onStartCompleted(): void;
     protected startRide(retry?: boolean): void;
+    protected onStateUpdate(): void;
     protected startDevices(retry?: boolean): void;
     protected stopDevices(exit?: boolean): void;
     protected initDeviceHandlers(): void;

package/lib/ride/display/service.js

@@ -86,6 +86,7 @@ let RideDisplayService = (() => {
             this.state = 'Idle';
             this.hideAll = false;
             this.onChangeState = this.setState.bind(this);
+            this.stateUpdateHandler = this.onStateUpdate.bind(this);
             this.getStartOverlayProps = () => {
                 var _a, _b;
                 const mode = this.getRideType();
@@ -778,6 +779,7 @@ let RideDisplayService = (() => {
             this.logEvent({ message: 'overlay closed', overlay: 'start overlay' });
             this.logEvent(Object.assign({ message: 'Start success' }, logProps));
             this.state = 'Started';
+            this.displayService.off('state-update', this.stateUpdateHandler);
             this.disableScreensaver();
             this.createActivity();
             this.initWorkout();
@@ -789,12 +791,14 @@ let RideDisplayService = (() => {
         }
         startRide(retry) {
             this.displayService.start(retry);
-            this.displayService.on('state-update', () => {
-                this.checkStartStatus();
-                this.updateStartOverlay();
-            })
+            this.displayService.on('state-update', this.stateUpdateHandler)
                 .on('route-updated', this.onRouteUpdated.bind(this));
         }
+        onStateUpdate() {
+            console.log('# state update', this.state);
+            this.checkStartStatus();
+            this.updateStartOverlay();
+        }
         startDevices(retry) {
             var _a;
             const devices = this.getDeviceRide();

package/lib/ride/route/FollowRouteDisplayService.js

@@ -13,10 +13,13 @@ class FollowRouteDisplayService extends GpxDisplayService_1.GpxDisplayService {
         return props;
     }
     savePosition(startPos) {
+        var _a, _b, _c;
         try {
-            const { lapDistance } = this.position;
-            const routeId = this.route.description.id;
-            this.getUserSettings().set(`routeSelection.followRoute.prevSetting.${routeId}.startPos`, startPos !== null && startPos !== void 0 ? startPos : lapDistance);
+            const { lapDistance } = (_a = this.position) !== null && _a !== void 0 ? _a : {};
+            const routeId = (_c = (_b = this.route) === null || _b === void 0 ? void 0 : _b.description) === null || _c === void 0 ? void 0 : _c.id;
+            if (routeId && lapDistance !== undefined) {
+                this.getUserSettings().set(`routeSelection.followRoute.prevSetting.${routeId}.startPos`, startPos !== null && startPos !== void 0 ? startPos : lapDistance);
+            }
         }
         catch (err) {
             this.logEvent({ message: 'error', fn: 'savePosition()', position: this.position, error: err.message, stack: err.stack });

package/lib/ride/route/FreeRideDisplayService.js

@@ -286,6 +286,9 @@ let FreeRideDisplayService = (() => {
                 }
             }
             getOptionsId() {
+                var _b;
+                if (!((_b = this.currentOptions) === null || _b === void 0 ? void 0 : _b.length))
+                    return 'none';
                 return 'options:' + this.currentOptions.map(o => o.id).join('|');
             }
             getMapProps() {

package/lib/ride/route/GpxDisplayService.d.ts

@@ -1,3 +1,4 @@
+import { GoogleMapsService } from "../../apps";
 import { Observer } from "../../base/types";
 import { UserSettingsService } from "../../settings";
 import { CurrentRideDisplayProps, GpxDisplayProps } from "../base";
@@ -51,4 +52,5 @@ export declare class GpxDisplayService extends RouteDisplayService {
     protected getBestCaseUpdateFrequency(): number;
     protected getNumSetting(key: string): number;
     protected getUserSettings(): UserSettingsService;
+    protected getGoogleMaps(): GoogleMapsService;
 }

package/lib/ride/route/GpxDisplayService.js

@@ -35,6 +35,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GpxDisplayService = void 0;
+const apps_1 = require("../../apps");
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
 const routes_1 = require("../../routes");
@@ -48,6 +49,7 @@ let GpxDisplayService = (() => {
     let _classSuper = RouteDisplayService_1.RouteDisplayService;
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
+    let _getGoogleMaps_decorators;
     return _a = class GpxDisplayService extends _classSuper {
             constructor() {
                 super();
@@ -63,6 +65,10 @@ let GpxDisplayService = (() => {
                         const bestFreq = this.getBestCaseUpdateFrequency();
                         this.logEvent({ message: 'init streetview', updateFreq, minimalPause, bestFreq });
                     }
+                    if (!this.getGoogleMaps().getApi()) {
+                        this.logEvent({ message: 'reload maps api' });
+                        this.getGoogleMaps().reload();
+                    }
                 }
                 catch (err) {
                     this.logError(err, 'initView');
@@ -128,6 +134,7 @@ let GpxDisplayService = (() => {
                     this.mapLoaded = true;
                 }
                 else if (state === 'Error') {
+                    this.logEvent({ message: 'sat view error', error: this.mapError });
                     this.mapError = error;
                 }
                 this.emit('state-update');
@@ -260,12 +267,17 @@ let GpxDisplayService = (() => {
             getUserSettings() {
                 return (0, settings_1.useUserSettings)();
             }
+            getGoogleMaps() {
+                return (0, apps_1.useGoogleMaps)();
+            }
         },
         (() => {
             var _b;
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
             _getUserSettings_decorators = [decorators_1.Injectable];
+            _getGoogleMaps_decorators = [decorators_1.Injectable];
             __esDecorate(_a, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/lib/ride/route/RouteDisplayService.js

@@ -254,24 +254,33 @@ let RouteDisplayService = (() => {
                 }
             }
             setInitialPosition() {
-                var _b;
-                const lapPoint = (0, routes_1.getNextPosition)(this.getCurrentRoute(), { routeDistance: (_b = this.startSettings.startPos) !== null && _b !== void 0 ? _b : 0 });
-                return this.fromLapPoint(lapPoint);
+                var _b, _c, _d, _e, _f, _g;
+                try {
+                    const lapPoint = (0, routes_1.getNextPosition)(this.getCurrentRoute(), { routeDistance: (_c = (_b = this.startSettings) === null || _b === void 0 ? void 0 : _b.startPos) !== null && _c !== void 0 ? _c : 0 });
+                    return this.fromLapPoint(lapPoint);
+                }
+                catch (err) {
+                    this.logError(err, 'setInitialPosition', { cntPoints: (_e = (_d = this.getCurrentRoute()) === null || _d === void 0 ? void 0 : _d.points) === null || _e === void 0 ? void 0 : _e.length, routeDistance: (_g = (_f = this.startSettings) === null || _f === void 0 ? void 0 : _f.startPos) !== null && _g !== void 0 ? _g : 0 });
+                }
             }
             updatePosition(activityPos) {
                 var _b, _c, _d;
+                let currentRouteDistance;
+                let newRouteDistance;
+                let props;
                 try {
-                    const currentRouteDistance = (_c = (_b = this.position) === null || _b === void 0 ? void 0 : _b.routeDistance) !== null && _c !== void 0 ? _c : 0;
-                    const newRouteDistance = (_d = activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance) !== null && _d !== void 0 ? _d : 0;
+                    currentRouteDistance = (_c = (_b = this.position) === null || _b === void 0 ? void 0 : _b.routeDistance) !== null && _c !== void 0 ? _c : 0;
+                    newRouteDistance = (_d = activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance) !== null && _d !== void 0 ? _d : 0;
                     if (newRouteDistance !== currentRouteDistance) {
                         const current = this.toLapPoint(this.position);
-                        const next = (0, routes_1.getNextPosition)(this.getCurrentRoute(), { routeDistance: activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance, prev: current });
+                        props = { routeDistance: activityPos === null || activityPos === void 0 ? void 0 : activityPos.routeDistance, prev: current };
+                        const next = (0, routes_1.getNextPosition)(this.getCurrentRoute(), props);
                         return this.fromLapPoint(next);
                     }
                     return this.position;
                 }
                 catch (err) {
-                    this.logError(err, 'updatePosition');
+                    this.logError(err, 'updatePosition', { currentRouteDistance, newRouteDistance, getNextPositionProps: props });
                 }
             }
             toLapPoint(position) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.5.67",
+  "version": "1.5.69",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.8.2",
-    "incyclist-devices": "^2.4.5",
+    "incyclist-devices": "^2.4.6-beta.3",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",