incyclist-services 1.7.75 → 1.7.77

package/lib/cjs/activities/list/service.js

@@ -404,7 +404,7 @@ let ActivityListService = (() => {
                 startPos,
                 segment: activity?.segment,
                 started: activity ? new Date(activity.startTime) : undefined,
-                showMap: true,
+                showMap: activity?.routeType !== 'None',
                 points,
                 activity,
                 exports: this.exports,

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

@@ -425,10 +425,11 @@ let ActivityRideService = (() => {
                 const route = this.getRouteList().getSelected();
                 const startSettings = this.getRouteList().getStartSettings();
                 const isFreeRide = startSettings?.type === 'Free-Ride';
+                const isWorkout = this.activity?.routeType === 'None';
                 const showSave = this.activity !== undefined && !this.isSaveDone;
                 const showContinue = this.state !== 'completed';
                 const hasGPX = this.activity?.logs?.some((log) => !!log.lat && !!log.lng);
-                const showMap = hasGPX || isFreeRide || (route?.description?.hasGpx);
+                const showMap = hasGPX || isFreeRide || isWorkout || (route?.description?.hasGpx);
                 const preview = showMap ? undefined : route?.description?.previewUrl;
                 if (!this.isSummaryShown) {
                     this.logEvent({ message: 'activity summary shown', showSave, showContinue, showMap, fileLink: this.activity?.fitFileName });

package/lib/cjs/services/overpass/overpass.js

@@ -46,10 +46,10 @@ const gd_eventlog_1 = require("gd-eventlog");
 const decorators_1 = require("../../base/decorators");
 const api_1 = require("../../api");
 const settings_1 = require("../../settings");
+const OVERPASS_URL_PRIMARY = 'https://overpass-api.de/api/interpreter';
 const OVERPASS_URL_ALT1 = 'https://overpass.kumi.systems/api/interpreter';
-const OVERPASS_URL_ALT2 = 'https://lz4.overpass-api.de/api/interpreter';
-const OVERPASS_URL_ALT3 = 'https://z.overpass-api.de/api/interpreter';
-exports.OVERPASS_URL_DEFAULT = OVERPASS_URL_ALT1;
+const OVERPASS_URL_ALT2 = 'https://overpass.openstreetmap.fr/api/interpreter';
+exports.OVERPASS_URL_DEFAULT = OVERPASS_URL_PRIMARY;
 let OverpassApi = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -77,7 +77,7 @@ let OverpassApi = (() => {
         logger;
         constructor(props) {
             super();
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = props?.url ?? this.mirrors[0];
             this.logger = new gd_eventlog_1.EventLogger('Overpass');
             if (props?.url) {
@@ -110,11 +110,7 @@ let OverpassApi = (() => {
         async post(url, data, conf) {
             const fetchBinding = this.getBindings()?.fetch;
             if (fetchBinding) {
-                try {
-                    return await this.postViaFetchBinding(fetchBinding, url, data);
-                }
-                catch {
-                }
+                return await this.postViaFetchBinding(fetchBinding, url, data);
             }
             try {
                 const https = require('https');
@@ -132,19 +128,25 @@ let OverpassApi = (() => {
         async postViaFetchBinding(fetchBinding, url, data) {
             const headers = this.getOverpassHeaders();
             const body = typeof data === 'string' ? data : JSON.stringify(data);
-            const res = await fetchBinding.fetch(url, {
-                method: 'POST',
-                headers,
-                body,
-                referrerPolicy: 'unsafe-url'
-            });
-            return {
-                data: res.data,
-                status: res.status,
-                statusText: res.statusText,
-                headers: res.headers,
-                config: {}
-            };
+            try {
+                const res = await fetchBinding.fetch(url, {
+                    method: 'POST',
+                    headers,
+                    body,
+                    referrerPolicy: 'unsafe-url'
+                });
+                return {
+                    data: res.data,
+                    status: res.status,
+                    statusText: res.statusText,
+                    headers: res.headers,
+                    config: {}
+                };
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'fetch error', url, data, error: err.message });
+                throw err;
+            }
         }
         async postViaNodeHttps(https, url, data) {
             return new Promise((resolve, reject) => {
@@ -287,7 +289,7 @@ let OverpassApi = (() => {
             throw lastError;
         }
         reset() {
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = this.mirrors[0];
         }
         getAppVersion() {

package/lib/cjs/workouts/base/graph/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./series"), exports);
+__exportStar(require("./types"), exports);

package/lib/cjs/workouts/base/graph/series.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WORKOUT_ZONE_COLORS = void 0;
+exports.getStepDuration = getStepDuration;
+exports.getStepPower = getStepPower;
+exports.getWorkoutGraphSeries = getWorkoutGraphSeries;
+const model_1 = require("../model");
+exports.WORKOUT_ZONE_COLORS = [
+    'white',
+    '#7f7f7f',
+    '#338cff',
+    '#59bf59',
+    '#ffcc3f',
+    '#ff6639',
+    '#ff330c',
+    '#ea39ff'
+];
+function getMinPower(step, ftp) {
+    if (step?.power === undefined)
+        return undefined;
+    const p = step.power;
+    if (p.max !== undefined && p.min !== undefined && p.max === p.min)
+        return 0;
+    if (p.min === undefined)
+        return undefined;
+    let res = Math.round(p.min);
+    if (p.type === 'watt' && ftp !== undefined)
+        res = Math.round(p.min / ftp * 100);
+    return res;
+}
+function getMaxPower(step, ftp) {
+    if (step?.power === undefined)
+        return 0;
+    const p = step.power;
+    if (p.max === undefined)
+        return undefined;
+    let res = Math.round(p.max);
+    if (p.type === 'watt' && ftp !== undefined)
+        res = Math.round(p.max / ftp * 100);
+    return res;
+}
+function getZone(power, ftp) {
+    if (power === undefined)
+        return undefined;
+    if (ftp === undefined)
+        return 0;
+    if (power <= 55)
+        return 1;
+    if (power <= 75)
+        return 2;
+    if (power <= 90)
+        return 3;
+    if (power <= 105)
+        return 4;
+    if (power <= 120)
+        return 5;
+    if (power <= 150)
+        return 6;
+    return 7;
+}
+function getStepDuration(step) {
+    if (step.duration <= 60)
+        return `${step.duration}s`;
+    if (step.duration <= 3600)
+        return `${step.duration / 60}min`;
+    return `${step.duration / 3600}h`;
+}
+function formatPowerText(low, high, unit, rangePrefix) {
+    if (low !== undefined && high !== undefined && low !== high)
+        return `${rangePrefix}${Math.round(low)}-${Math.round(high)}${unit}`;
+    if (high !== undefined)
+        return `${Math.round(high)}${unit}`;
+    return '';
+}
+function appendConvertedSuffix(text, low, high, unit, ftp) {
+    if (text === '' || ftp === undefined)
+        return text;
+    const isPct = unit === '%';
+    const convert = (v) => isPct ? Math.round(v / 100 * ftp) : Math.round(v * 100 / ftp);
+    const suffixUnit = isPct ? 'W' : '%';
+    const range = (low !== undefined && high !== undefined && low !== high)
+        ? `${convert(low)}-${convert(high)}`
+        : `${convert(high)}`;
+    return `${text} (${range}${suffixUnit})`;
+}
+function getStepPower(step, ftp) {
+    if (step.power === undefined)
+        return '';
+    const { min, max, type } = step.power;
+    const unit = type === 'watt' ? 'W' : '%';
+    const ascending = step.steady || step.cooldown === false;
+    const low = ascending ? min : max;
+    const high = ascending ? max : min;
+    const rangePrefix = step.steady ? '' : 'Ramp ';
+    const stepText = formatPowerText(low, high, unit, rangePrefix);
+    return appendConvertedSuffix(stepText, low, high, unit, ftp);
+}
+function coerceToWorkout(workout) {
+    if (workout instanceof model_1.Workout)
+        return workout;
+    try {
+        return new model_1.Workout(workout);
+    }
+    catch {
+        return undefined;
+    }
+}
+function buildSteadyBar(step, stepStart, ftp, absValues) {
+    const x0 = stepStart;
+    const x = stepStart + step.getDuration();
+    let y = getMaxPower(step, ftp);
+    let y0 = getMinPower(step, ftp);
+    const zone = getZone(y, ftp);
+    if (absValues && ftp) {
+        y = ftp * y / 100;
+        y0 = ftp * y0 / 100;
+    }
+    if (y === undefined || Number.isNaN(y))
+        return undefined;
+    if (y0 !== undefined && !Number.isNaN(y0))
+        return { x, x0, y, y0, zone };
+    if (y0 === undefined)
+        return { x, x0, y, y0: 0, zone };
+    return undefined;
+}
+function buildRampBars(wo, step, stepStart, ftp, absValues) {
+    const bars = [];
+    const stepSize = step.getDuration() / 10;
+    for (let i = 0; i < 10; i++) {
+        const x0 = stepStart + i * stepSize;
+        const x = x0 + stepSize;
+        const limit = wo.getLimits(x0 + 0.01);
+        let y = getMaxPower(limit, ftp);
+        const zone = getZone(y, ftp);
+        if (absValues && ftp)
+            y = ftp * y / 100;
+        if (y !== undefined && !Number.isNaN(y))
+            bars.push({ x, x0, y, y0: 0, zone });
+    }
+    return bars;
+}
+function getWorkoutGraphSeries(workout, opts) {
+    const { ftp, absValues = false } = opts ?? {};
+    const wo = coerceToWorkout(workout);
+    if (!wo)
+        return [];
+    const bars = [];
+    let stepStart = 0;
+    for (let limits = wo.getLimits(0, true); limits !== undefined; limits = wo.getLimits(stepStart + 0.01, true)) {
+        const step = limits.step;
+        if (step.steady) {
+            const bar = buildSteadyBar(step, stepStart, ftp, absValues);
+            if (bar)
+                bars.push(bar);
+        }
+        else {
+            bars.push(...buildRampBars(wo, step, stepStart, ftp, absValues));
+        }
+        stepStart += step.getDuration();
+    }
+    return bars;
+}

package/lib/cjs/workouts/base/graph/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/workouts/base/model/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Workout"), exports);
 __exportStar(require("./Segment"), exports);
 __exportStar(require("./Step"), exports);
-__exportStar(require("./types"), exports);

package/lib/cjs/workouts/calendar/service.js

@@ -136,6 +136,20 @@ let WorkoutCalendarService = (() => {
             }
             return [];
         }
+        getScheduledToday() {
+            try {
+                if (!this.workouts)
+                    return undefined;
+                const now = new Date();
+                const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+                const entry = this.workouts.find(w => w.day?.toLocaleDateString() === today.toLocaleDateString());
+                return entry ? this.getScheduledWorkout(entry) : undefined;
+            }
+            catch (err) {
+                this.logError(err, 'getScheduledToday');
+                return undefined;
+            }
+        }
         setActive(active) {
             try {
                 this.listActive = active;

package/lib/cjs/workouts/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./list"), exports);
 __exportStar(require("./ride"), exports);
 __exportStar(require("./base/model"), exports);
+__exportStar(require("./base/graph"), exports);
+__exportStar(require("./page"), exports);

package/lib/cjs/workouts/list/cards/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./WorkoutCreateCard"), exports);
 __exportStar(require("./WorkoutImportCard"), exports);
 __exportStar(require("./WorkoutCard"), exports);
-__exportStar(require("./types"), exports);

package/lib/cjs/workouts/list/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
 __exportStar(require("./cards"), exports);
-__exportStar(require("./pageService"), exports);