incyclist-services 1.7.37 → 1.7.39

package/lib/cjs/ride/page/service.js

@@ -160,6 +160,7 @@ let RidePageService = (() => {
                 const rideType = this.getRideDisplay().getRideType();
                 switch (rideType) {
                     case 'Video': return this.getVideoRideDisplayProps();
+                    case 'GPX': return this.getGPXRideDisplayProps();
                     default:
                         return null;
                 }
@@ -267,6 +268,22 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
+        getGPXRideDisplayProps() {
+            const props = this.rideDisplayProps;
+            const state = this.getRideDisplay().getState();
+            const rideType = this.getRideDisplay().getRideType();
+            const isStarting = state === 'Idle' || state === 'Starting' || state === 'Error';
+            const displayProps = {
+                rideState: state,
+                rideType,
+                startGateProps: this.startGateProps,
+                startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
+                menuProps: this.menuProps,
+                rideView: props.rideView,
+                route: props.route
+            };
+            return displayProps;
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding().getSecretsStatus?.();

package/lib/cjs/ride/route/FollowRouteDisplayService.js

@@ -6,7 +6,7 @@ class FollowRouteDisplayService extends GpxDisplayService_1.GpxDisplayService {
     getLogProps() {
         const route = this.route;
         const settings = this.startSettings;
-        const rideView = this.getUserSettings().get('preferences.rideView', undefined) ?? 'sv(default)';
+        const rideView = this.getRideView();
         const bikeProps = this.getBikeLogProps();
         const props = {
             mode: 'follow route',

package/lib/cjs/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 api_1 = require("../../api");
 const apps_1 = require("../../apps");
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
@@ -49,13 +50,16 @@ let GpxDisplayService = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
     let _getGoogleMaps_decorators;
+    let _getBindings_decorators;
     return class GpxDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getGoogleMaps_decorators = [decorators_1.Injectable];
+            _getBindings_decorators = [decorators_1.Injectable];
             __esDecorate(this, 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(this, 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);
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         mapLoaded = (__runInitializers(this, _instanceExtraInitializers), false);
@@ -74,7 +78,7 @@ let GpxDisplayService = (() => {
         }
         initView() {
             try {
-                const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+                const rideView = this.getRideView();
                 if (rideView === 'sv') {
                     const updateFreq = this.getDefaultUpdateFrequency();
                     const minimalPause = this.getMinimalPause();
@@ -115,22 +119,30 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'map') {
-                return {};
+                return {
+                    mapType: this.getRideViewName(),
+                    mapState: 'Loaded'
+                };
             }
             return {
-                mapType: rideView === 'sv' ? 'StreetView' : 'SatelliteView',
+                mapType: this.getRideViewName(),
                 mapState: this.mapLoaded ? 'Loaded' : 'Loading',
                 mapStateError: this.mapError
             };
         }
         isStartRideCompleted() {
+            const rideView = this.getRideView();
+            if (rideView === 'map') {
+                this.mapLoaded = true;
+                return true;
+            }
             return this.mapLoaded;
         }
         getDisplayProperties(props) {
             let routeProps = super.getDisplayProperties(props);
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'sv') {
                 routeProps = { ...routeProps, ...this.getStreetViewProps(props) };
             }
@@ -145,6 +157,21 @@ let GpxDisplayService = (() => {
                 ...routeProps
             };
         }
+        getRideView() {
+            if (this.isMobile())
+                return 'map';
+            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            return rideView;
+        }
+        getRideViewName() {
+            const rideView = this.getRideView();
+            const map = {
+                map: 'Map',
+                sv: 'Street View',
+                sat: 'Satellite View'
+            };
+            return map?.[rideView] ?? rideView;
+        }
         onSatelliteViewEvent(state, error) {
             if (state === 'Loaded') {
                 this.mapLoaded = true;
@@ -232,7 +259,7 @@ let GpxDisplayService = (() => {
         }
         onPositionUpdate(state) {
             const { route, position } = state ?? {};
-            const rideView = this.getUserSettings().getValue('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'sv') {
                 const sincePrev = Date.now() - (this.tsPrevSVUpdate ?? 0);
                 if (sincePrev > this.getStreetViewUpdateDelay() - 25) {
@@ -275,12 +302,18 @@ let GpxDisplayService = (() => {
             }
             catch { }
         }
+        isMobile() {
+            return this.getBindings().appInfo?.getChannel() === 'mobile';
+        }
         getUserSettings() {
             return (0, settings_1.useUserSettings)();
         }
         getGoogleMaps() {
             return (0, apps_1.useGoogleMaps)();
         }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
     };
 })();
 exports.GpxDisplayService = GpxDisplayService;

package/lib/esm/ride/page/service.js

@@ -157,6 +157,7 @@ let RidePageService = (() => {
                 const rideType = this.getRideDisplay().getRideType();
                 switch (rideType) {
                     case 'Video': return this.getVideoRideDisplayProps();
+                    case 'GPX': return this.getGPXRideDisplayProps();
                     default:
                         return null;
                 }
@@ -264,6 +265,22 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
+        getGPXRideDisplayProps() {
+            const props = this.rideDisplayProps;
+            const state = this.getRideDisplay().getState();
+            const rideType = this.getRideDisplay().getRideType();
+            const isStarting = state === 'Idle' || state === 'Starting' || state === 'Error';
+            const displayProps = {
+                rideState: state,
+                rideType,
+                startGateProps: this.startGateProps,
+                startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
+                menuProps: this.menuProps,
+                rideView: props.rideView,
+                route: props.route
+            };
+            return displayProps;
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding().getSecretsStatus?.();

package/lib/esm/ride/route/FollowRouteDisplayService.js

@@ -3,7 +3,7 @@ export class FollowRouteDisplayService extends GpxDisplayService {
     getLogProps() {
         const route = this.route;
         const settings = this.startSettings;
-        const rideView = this.getUserSettings().get('preferences.rideView', undefined) ?? 'sv(default)';
+        const rideView = this.getRideView();
         const bikeProps = this.getBikeLogProps();
         const props = {
             mode: 'follow route',

package/lib/esm/ride/route/GpxDisplayService.js

@@ -32,6 +32,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+import { getBindings } from "../../api";
 import { useGoogleMaps } from "../../apps";
 import { Injectable } from "../../base/decorators";
 import { Observer } from "../../base/types";
@@ -46,13 +47,16 @@ let GpxDisplayService = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
     let _getGoogleMaps_decorators;
+    let _getBindings_decorators;
     return class GpxDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUserSettings_decorators = [Injectable];
             _getGoogleMaps_decorators = [Injectable];
+            _getBindings_decorators = [Injectable];
             __esDecorate(this, 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(this, 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);
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         mapLoaded = (__runInitializers(this, _instanceExtraInitializers), false);
@@ -71,7 +75,7 @@ let GpxDisplayService = (() => {
         }
         initView() {
             try {
-                const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+                const rideView = this.getRideView();
                 if (rideView === 'sv') {
                     const updateFreq = this.getDefaultUpdateFrequency();
                     const minimalPause = this.getMinimalPause();
@@ -112,22 +116,30 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'map') {
-                return {};
+                return {
+                    mapType: this.getRideViewName(),
+                    mapState: 'Loaded'
+                };
             }
             return {
-                mapType: rideView === 'sv' ? 'StreetView' : 'SatelliteView',
+                mapType: this.getRideViewName(),
                 mapState: this.mapLoaded ? 'Loaded' : 'Loading',
                 mapStateError: this.mapError
             };
         }
         isStartRideCompleted() {
+            const rideView = this.getRideView();
+            if (rideView === 'map') {
+                this.mapLoaded = true;
+                return true;
+            }
             return this.mapLoaded;
         }
         getDisplayProperties(props) {
             let routeProps = super.getDisplayProperties(props);
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'sv') {
                 routeProps = { ...routeProps, ...this.getStreetViewProps(props) };
             }
@@ -142,6 +154,21 @@ let GpxDisplayService = (() => {
                 ...routeProps
             };
         }
+        getRideView() {
+            if (this.isMobile())
+                return 'map';
+            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            return rideView;
+        }
+        getRideViewName() {
+            const rideView = this.getRideView();
+            const map = {
+                map: 'Map',
+                sv: 'Street View',
+                sat: 'Satellite View'
+            };
+            return map?.[rideView] ?? rideView;
+        }
         onSatelliteViewEvent(state, error) {
             if (state === 'Loaded') {
                 this.mapLoaded = true;
@@ -229,7 +256,7 @@ let GpxDisplayService = (() => {
         }
         onPositionUpdate(state) {
             const { route, position } = state ?? {};
-            const rideView = this.getUserSettings().getValue('preferences.rideView', 'sv');
+            const rideView = this.getRideView();
             if (rideView === 'sv') {
                 const sincePrev = Date.now() - (this.tsPrevSVUpdate ?? 0);
                 if (sincePrev > this.getStreetViewUpdateDelay() - 25) {
@@ -272,12 +299,18 @@ let GpxDisplayService = (() => {
             }
             catch { }
         }
+        isMobile() {
+            return this.getBindings().appInfo?.getChannel() === 'mobile';
+        }
         getUserSettings() {
             return useUserSettings();
         }
         getGoogleMaps() {
             return useGoogleMaps();
         }
+        getBindings() {
+            return getBindings();
+        }
     };
 })();
 export { GpxDisplayService };

package/lib/types/ride/base/types.d.ts

@@ -99,8 +99,9 @@ export interface MapOverlayDisplayProps extends OverlayDisplayProps {
     bounds?: Number[][];
     onViewportChange?: (viewport: MapViewPort) => void;
 }
+export type RideViewType = 'sv' | 'map' | 'sat';
 export interface GpxDisplayProps extends RouteDisplayProps {
-    rideView: 'sv' | 'map' | 'sat';
+    rideView: RideViewType;
 }
 export interface RouteOptionDisplayProps {
     optionsDelay?: number;

package/lib/types/ride/page/service.d.ts

@@ -1,6 +1,6 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, IRidePageService, RideMenuProps, StartGateProps, VideoRidePageDisplayProps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, RideMenuProps, StartGateProps, VideoRidePageDisplayProps } from "./types";
 import { ISecretBinding } from "../../api/secret";
 export declare class RidePageService extends IncyclistPageService implements IRidePageService {
     protected eventHandler: Record<string, Function>;
@@ -28,6 +28,7 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     onIgnoreStart(): void;
     onCancelStart(): Promise<void>;
     protected getVideoRideDisplayProps(): VideoRidePageDisplayProps;
+    protected getGPXRideDisplayProps(): GPXRidePageDisplayProps;
     protected checkSecretValidity(): Promise<void>;
     protected showStartGate(): void;
     protected hideStartgate(): void;

package/lib/types/ride/page/types.d.ts

@@ -1,7 +1,7 @@
 import { IPageService } from "../../base/pages";
 import { Route } from "../../routes/base/model/route";
 import { IObserver } from "../../types";
-import { CurrentRideState, GpxDisplayProps, GPXStartOverlayProps, RideType, StartOverlayProps, VideoDisplayProps, VideoStartOverlayProps } from "../types";
+import { CurrentRideState, GPXStartOverlayProps, RideType, RideViewType, StartOverlayProps, VideoDisplayProps, VideoStartOverlayProps } from "../types";
 export interface StartGateProps {
     title: string;
     body: string;
@@ -19,7 +19,7 @@ export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
     videos?: VideoDisplayProps[];
 }
 export interface GPXRidePageDisplayProps extends RidePageDisplayProps {
-    gpx?: GpxDisplayProps;
+    rideView?: RideViewType;
 }
 export type AnyRidePageDisplayProps = VideoRidePageDisplayProps | RidePageDisplayProps;
 export interface RideMenuProps {

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

@@ -33,8 +33,8 @@ export declare class GpxDisplayService extends RouteDisplayService {
         displayPosition: import("../base").CurrentPosition;
     };
     getStartOverlayProps(): {
-        mapType?: undefined;
-        mapState?: undefined;
+        mapType: string;
+        mapState: string;
         mapStateError?: undefined;
     } | {
         mapType: string;
@@ -43,6 +43,8 @@ export declare class GpxDisplayService extends RouteDisplayService {
     };
     isStartRideCompleted(): boolean;
     getDisplayProperties(props: CurrentRideDisplayProps): GpxDisplayProps;
+    protected getRideView(): string;
+    protected getRideViewName(): string;
     protected onSatelliteViewEvent(state: SatelliteViewEvent, error?: string): void;
     protected onMapViewEvent(state: SatelliteViewEvent, error?: string): void;
     protected onStreetViewEvent(event: StreetViewEvent, data: any): void;
@@ -53,6 +55,8 @@ export declare class GpxDisplayService extends RouteDisplayService {
     protected getMinimalPause(): number;
     protected getBestCaseUpdateFrequency(): number;
     protected getNumSetting(key: string): number;
+    protected isMobile(): boolean;
     protected getUserSettings(): UserSettingsService;
     protected getGoogleMaps(): GoogleMapsService;
+    protected getBindings(): import("../../api").IncyclistBindings;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.37",
+  "version": "1.7.39",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },