incyclist-services 1.7.56 → 1.7.58

package/lib/cjs/i18n/countries/index.js

@@ -1,122 +1,17 @@
 "use strict";
-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] = _;
-        }
+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]; } };
     }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+    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 });
-exports.getCountries = exports.Countries = void 0;
-const service_1 = require("../../base/service");
-const types_1 = require("../../base/types");
-const countries_json_1 = __importDefault(require("./countries.json"));
-const services_1 = require("../../services");
-let Countries = (() => {
-    let _classDecorators = [types_1.Singleton];
-    let _classDescriptor;
-    let _classExtraInitializers = [];
-    let _classThis;
-    let _classSuper = service_1.IncyclistService;
-    var Countries = class extends _classSuper {
-        static { _classThis = this; }
-        static {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            Countries = _classThis = _classDescriptor.value;
-            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
-        language;
-        countryLists;
-        constructor() {
-            super('Countries');
-            this.language = countries_json_1.default.locale;
-            this.countryLists = {};
-            this.countryLists[this.language] = countries_json_1.default;
-        }
-        getList(locale = this.language) {
-            return this.countryLists[locale] || this.countryLists.en;
-        }
-        getCountryFromIso(iso, locale) {
-            const list = this.getList(locale);
-            const info = list.countries[iso.toUpperCase()];
-            return Array.isArray(info) ? info[0] : info;
-        }
-        getCountiesFromIsos(iso, locale) {
-            return iso.map(i => this.getCountryFromIso(i, locale));
-        }
-        getIsoFromCountry(country, locale) {
-            const list = this.getList(locale);
-            const isos = Object.keys(list.countries);
-            const iso = isos.find(i => {
-                const c = list.countries[i];
-                if (Array.isArray(c))
-                    return c.includes(country);
-                return c === country;
-            });
-            return iso;
-        }
-        getIsosFromCountries(countries, locale) {
-            return countries.map(c => this.getIsoFromCountry(c, locale));
-        }
-        async getIsoFromLatLng(point) {
-            const { lat, lng } = point;
-            const query = `[out:json][timeout:25];way['addr:country'](around:20000,${lat},${lng});out tags;`;
-            try {
-                const result = await (0, services_1.useOverpassApi)().query(query);
-                if (!result?.elements)
-                    return;
-                const isos = [];
-                result.elements?.forEach(el => {
-                    const iso = el.tags['addr:country'];
-                    if (!iso)
-                        return;
-                    if (!isos.includes(iso.toUpperCase())) {
-                        isos.push(iso.toUpperCase());
-                    }
-                });
-                if (isos.length < 2)
-                    return isos[0];
-                return isos.find(iso => this.getList().countries[iso] !== undefined);
-            }
-            catch {
-                return undefined;
-            }
-        }
-    };
-    return Countries = _classThis;
-})();
-exports.Countries = Countries;
-const getCountries = () => new Countries();
-exports.getCountries = getCountries;
+__exportStar(require("./service"), exports);

package/lib/cjs/i18n/countries/service.js

@@ -0,0 +1,125 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCountries = exports.Countries = void 0;
+const service_1 = require("../../base/service");
+const types_1 = require("../../base/types");
+const countries_json_1 = __importDefault(require("./countries.json"));
+const services_1 = require("../../services");
+const decorators_1 = require("../../base/decorators");
+let Countries = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getOverpassApi_decorators;
+    var Countries = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getOverpassApi_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getOverpassApi_decorators, { kind: "method", name: "getOverpassApi", static: false, private: false, access: { has: obj => "getOverpassApi" in obj, get: obj => obj.getOverpassApi }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            Countries = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        language = __runInitializers(this, _instanceExtraInitializers);
+        countryLists;
+        constructor() {
+            super('Countries');
+            this.language = countries_json_1.default.locale;
+            this.countryLists = {};
+            this.countryLists[this.language] = countries_json_1.default;
+        }
+        getList(locale = this.language) {
+            return this.countryLists[locale] || this.countryLists.en;
+        }
+        getCountryFromIso(iso, locale) {
+            const list = this.getList(locale);
+            const info = list.countries[iso.toUpperCase()];
+            return Array.isArray(info) ? info[0] : info;
+        }
+        getCountiesFromIsos(iso, locale) {
+            return iso.map(i => this.getCountryFromIso(i, locale));
+        }
+        getIsoFromCountry(country, locale) {
+            const list = this.getList(locale);
+            const isos = Object.keys(list.countries);
+            const iso = isos.find(i => {
+                const c = list.countries[i];
+                if (Array.isArray(c))
+                    return c.includes(country);
+                return c === country;
+            });
+            return iso;
+        }
+        getIsosFromCountries(countries, locale) {
+            return countries.map(c => this.getIsoFromCountry(c, locale));
+        }
+        async getIsoFromLatLng(point) {
+            const { lat, lng } = point;
+            const query = `[out:json][timeout:10];is_in(${lat},${lng})->.a;rel(pivot.a)['admin_level'='2']['boundary'='administrative'];out tags;`;
+            try {
+                const result = await this.getOverpassApi().query(query);
+                if (!result?.elements)
+                    return undefined;
+                const isos = result.elements
+                    .map(el => el.tags['ISO3166-1:alpha2'])
+                    .filter((iso) => !!iso)
+                    .map(iso => iso.toUpperCase());
+                if (isos.length < 2)
+                    return isos[0];
+                return isos.find(iso => this.getList().countries[iso] !== undefined);
+            }
+            catch {
+                return undefined;
+            }
+        }
+        getOverpassApi() {
+            return (0, services_1.useOverpassApi)();
+        }
+    };
+    return Countries = _classThis;
+})();
+exports.Countries = Countries;
+const getCountries = () => new Countries();
+exports.getCountries = getCountries;

package/lib/cjs/maps/MapArea/options.js

@@ -30,12 +30,12 @@ class OptionManager {
                 const path = segment.path;
                 const opts = await this.getNextOptions(segment);
                 if (opts?.length === 1) {
-                    if (opts[0].id !== segment.id) {
+                    if (opts[0].id === segment.id) {
                         (0, utils_1.concatPaths)(path, opts[0].path, 'after', opts[0].id);
                     }
                     else {
                         let foundSameSegment = false;
-                        options[0].path.forEach((point, j) => {
+                        opts[0].path.forEach((point, j) => {
                             if (j === 0)
                                 return;
                             foundSameSegment = points.some(pAll => pAll.id === point.id);
@@ -386,7 +386,7 @@ class OptionManager {
                 const w = this.getWay(way);
                 if (!w)
                     return [];
-                if (w.roundabout) {
+                if ((0, utils_1.isRoundabout)(w) && w.path[0].id !== w.path.at(-1).id) {
                     const branches = (0, utils_1.splitAtPoint)(w, location);
                     branches.forEach(b => {
                         if (b.path.length > 1 && b.path[1].id !== prev.id) {

package/lib/cjs/maps/MapArea/utils.js

@@ -166,7 +166,7 @@ function splitAtPointInfo(way, split) {
 function isRoundabout(w, strictCheck = false) {
     if (!w)
         return;
-    let roundabout = (w.tags !== undefined && (w.tags.roundabout === true || w.tags.junction === 'roundabout'));
+    let roundabout = (w.tags !== undefined && (w.tags.roundabout === true || w.tags.junction === 'roundabout' || w.tags.junction === 'circular'));
     if (roundabout)
         return true;
     if (strictCheck)

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

@@ -42,7 +42,7 @@ const display_1 = require("../display");
 const sleep_1 = require("../../utils/sleep");
 const api_1 = require("../../api");
 const monitoring_1 = require("../../monitoring");
-const BACKGROUND_PAUSE_TIMEOUT_MS = 60000;
+const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 let RidePageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;

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

@@ -35,6 +35,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RLVDisplayService = void 0;
+const api_1 = require("../../api");
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
 const coaches_1 = require("../../coaches");
@@ -47,15 +48,18 @@ const RouteDisplayService_1 = require("./RouteDisplayService");
 let RLVDisplayService = (() => {
     let _classSuper = RouteDisplayService_1.RouteDisplayService;
     let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     let _getRouteList_decorators;
     let _getLocalization_decorators;
     let _getCoaches_decorators;
     return class RLVDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [decorators_1.Injectable];
             _getRouteList_decorators = [decorators_1.Injectable];
             _getLocalization_decorators = [decorators_1.Injectable];
             _getCoaches_decorators = [decorators_1.Injectable];
+            __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);
             __esDecorate(this, 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);
             __esDecorate(this, null, _getLocalization_decorators, { kind: "method", name: "getLocalization", static: false, private: false, access: { has: obj => "getLocalization" in obj, get: obj => obj.getLocalization }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getCoaches_decorators, { kind: "method", name: "getCoaches", static: false, private: false, access: { has: obj => "getCoaches" in obj, get: obj => obj.getCoaches }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -129,8 +133,8 @@ let RLVDisplayService = (() => {
                 const nextId = (0, routes_1.getNextVideoId)(videoRoute);
                 this.logEvent({ message: 'video added', id: videoRoute.description.id, title: videoRoute.description.title, segmentDistance: videoRoute.description.distance, next: nextId });
             }
-            catch (error) {
-                this.logError(error, 'addVideo');
+            catch (err) {
+                this.logError(err, 'addVideo');
             }
         }
         pause() {
@@ -515,7 +519,7 @@ let RLVDisplayService = (() => {
                 fileName = fileName.replace('incyclist:', 'file:');
             if (fileName.startsWith('video:') && !lc.endsWith('.avi'))
                 return fileName.replace('video:', 'file:');
-            if (fileName.startsWith('file:') && !lc.endsWith('.avi'))
+            if (fileName.startsWith('file:') && !lc.endsWith('.avi') && !this.isMobile())
                 return fileName.replace('file:', 'video:');
             if (fileName.startsWith('video:') && lc.endsWith('.avi'))
                 return fileName;
@@ -567,6 +571,12 @@ let RLVDisplayService = (() => {
             this.addVideo(nextRoute, false, current);
             return true;
         }
+        isMobile() {
+            return this.getBindings()?.appInfo?.getChannel() === 'mobile';
+        }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
         getRouteList() {
             return (0, routes_1.useRouteList)();
         }

package/lib/cjs/routes/base/parsers/bikelab.js

@@ -47,7 +47,7 @@ class BikeLabParser extends xml_1.XMLParser {
             localizedTitle: value('Description') ?? value('Name'),
             country: value('CountryCode'),
             id: value('id'),
-            previewUrl: value('previewURL'),
+            previewUrl: value('previewURL') ?? undefined,
             distance: 0,
             elevation: 0,
             points: [],

package/lib/cjs/routes/base/parsers/epm.js

@@ -52,36 +52,32 @@ class EPMParser extends xml_1.XMLParser {
     }
     async loadEpp(context) {
         const { fileInfo } = context;
+        (0, utils_1.fixIncorrectFileInfo)(fileInfo);
         const file = { ...fileInfo, ext: 'epp', encoding: 'binary' };
-        let fullName = fileInfo.base ?? fileInfo.name;
-        if (!fullName.includes('.epm')) {
-            fullName = fullName + '.epm';
-        }
-        const fileName = fullName.replace('epm', 'epp');
-        if (fileName.startsWith('http') || fileName.startsWith('file') || fileName.startsWith('/') || fileName.startsWith('\\') || fileName.startsWith('.')) {
-            file.type = 'file';
-            file.filename = fileName;
-        }
-        else if (fileInfo.type === 'url') {
-            file.url = file.url.replace(fileInfo.name, fileName);
-        }
-        else {
-            file.filename = file.filename.replace(fullName, fileName);
+        let base = fileInfo.base;
+        if (!base.includes('.epm')) {
+            base = base + '.epm';
         }
+        file.base = base.replace('.epm', '.epp');
+        if (file.filename)
+            file.filename = fileInfo.filename.replace(base, file.base);
+        if (file.url)
+            file.url = fileInfo.url.replace(base, file.base);
         const onError = () => {
-            const nameInfo = this.getChannel() === 'mobile' ? fileName : (0, utils_2.getFileName)(file);
+            const nameInfo = this.getChannel() === 'mobile' ? base : (0, utils_2.getFileName)(file);
             throw new Error('Could not open EPP file: ' + nameInfo);
         };
         const loader = (0, api_1.getBindings)().loader;
         try {
             const res = await loader.open(file);
             if (res.error) {
+                this.logger.logEvent({ message: 'could not load EPP file', file, reason: res.error });
                 onError();
             }
             return res.data;
         }
         catch (err) {
-            this.logger.logEvent({ message: 'could not load EPP file', reason: err.message });
+            this.logger.logEvent({ message: 'could not load EPP file', file, reason: err.message });
             onError();
         }
     }

package/lib/cjs/routes/base/parsers/geometry.js

@@ -54,7 +54,7 @@ let GeometryParser = (() => {
             return await this.parse(file, geometry);
         }
         getPrimaryExtension() {
-            return 'xml';
+            return 'json';
         }
         getCompanionExtensions() {
             return [];

package/lib/cjs/routes/base/parsers/index.js

@@ -25,7 +25,6 @@ const bikelab_1 = require("./bikelab");
 const epm_1 = require("./epm");
 const TacxParser_1 = require("./tacx/TacxParser");
 const utils_1 = require("./utils");
-const gd_eventlog_1 = require("gd-eventlog");
 const useParsers = () => {
     const parsers = factory_1.ParserFactory.getInstance();
     if (!parsers.isInitialized()) {
@@ -40,7 +39,6 @@ const useParsers = () => {
 exports.useParsers = useParsers;
 class RouteParser {
     static async parse(info) {
-        const logger = new gd_eventlog_1.EventLogger('RouteParser');
         (0, utils_1.fixIncorrectFileInfo)(info);
         const parsers = (0, exports.useParsers)();
         const formatParsers = parsers.suppertsExtension(info.ext);
@@ -56,9 +54,7 @@ class RouteParser {
         const res = await Promise.allSettled(promises);
         const matching = res.map(promise => promise.status === 'fulfilled' ? promise.value : undefined).find(p => p !== undefined);
         if (matching) {
-            logger.logEvent({ message: 'before import' });
             const res = await matching.parser.import(info, matching.data);
-            logger.logEvent({ message: 'after import' });
             return res;
         }
         if (formatParsers.length === 0)