incyclist-services 1.5.68 → 1.5.70

package/lib/activities/ride/service.js

@@ -175,7 +175,6 @@ let ActivityRideService = (() => {
                 this.tsPauseStart = undefined;
                 delete this.tsStart;
                 yield (0, utils_1.waitNextTick)();
-                this.cleanup();
                 delete this.observer;
             });
         }

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/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/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/package.json

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