incyclist-services 1.3.40 → 1.3.42

package/lib/avatars/service.js

@@ -74,10 +74,14 @@ let AvatarService = (() => {
         }
         deleteAll() {
             const currentAvatar = this.registered.current;
-            this.options.forEach(o => { o.usageCnt = 0; });
+            this.options.forEach(o => {
+                if (o)
+                    o.usageCnt = 0;
+            });
             this.currentBucket = 0;
             const currentOption = this.find(currentAvatar);
-            currentOption.usageCnt = 1;
+            if (currentOption)
+                currentOption.usageCnt = 1;
             this.registered = { current: currentAvatar };
         }
         buildOptions() {
@@ -93,17 +97,20 @@ let AvatarService = (() => {
             });
         }
         getNextAvailable() {
-            let available = this.options.find(a => a.usageCnt === this.currentBucket);
+            let available = this.options.find(a => (a === null || a === void 0 ? void 0 : a.usageCnt) === this.currentBucket);
             if (!available) {
                 this.currentBucket++;
                 const currentOption = this.find('current');
-                currentOption.usageCnt++;
-                available = this.options.find(a => a.usageCnt === this.currentBucket);
+                if (currentOption)
+                    currentOption.usageCnt++;
+                available = this.options.find(a => (a === null || a === void 0 ? void 0 : a.usageCnt) === this.currentBucket);
             }
-            available.usageCnt++;
+            if (available)
+                available.usageCnt++;
             return available === null || available === void 0 ? void 0 : available.avatar;
         }
         cleanup(id, isCurrent = false) {
+            var _a;
             if (this.registered[id]) {
                 const prev = this.find(this.registered[id]);
                 if (prev) {
@@ -115,8 +122,8 @@ let AvatarService = (() => {
                 delete this.registered[id];
             }
             const currentAvatar = this.registered.current;
-            const inUse = this.options.filter(a => !currentAvatar || (a.avatar.helmet !== currentAvatar.helmet && a.avatar.shirt !== currentAvatar.shirt)).sort((a, b) => b.usageCnt - a.usageCnt);
-            this.currentBucket = inUse[0].usageCnt;
+            const inUse = this.options.filter(a => !currentAvatar || (a.avatar.helmet !== currentAvatar.helmet && a.avatar.shirt !== currentAvatar.shirt)).sort((a, b) => (b === null || b === void 0 ? void 0 : b.usageCnt) - (a === null || a === void 0 ? void 0 : a.usageCnt));
+            this.currentBucket = (_a = inUse[0]) === null || _a === void 0 ? void 0 : _a.usageCnt;
         }
         find(avatar) {
             return this.options.find(a => a.avatar.helmet === avatar.helmet && a.avatar.shirt === avatar.shirt);

package/lib/routes/base/utils/route.d.ts

@@ -3,7 +3,8 @@ import { RouteApiDetail } from "../api/types";
 import { Route } from "../model/route";
 import { RoutePoint, RouteSegment } from "../types";
 export declare const checkIsLoop: (_route: Route | Array<RoutePoint>) => boolean;
-export declare const updateSlopes: (points: Array<RoutePoint>) => void;
+export declare const validateSlopes: (points: Array<RoutePoint>) => void;
+export declare const updateSlopes: (points: Array<RoutePoint>, validateOnly?: boolean) => void;
 export declare const getSegments: (route: Route) => Array<RouteSegment>;
 export declare const addDetails: (route: Route, details: RouteApiDetail) => void;
 export declare const validateRoute: (route: Route | RouteApiDetail) => void;
@@ -33,5 +34,5 @@ export declare const getPosition: (route: Route, props: GetPositionProps) => Rou
 interface LegacyRouteApiDetail extends RouteApiDetail {
     decoded?: Array<RoutePoint>;
 }
-export declare const createFromJson: (data: LegacyRouteApiDetail) => Route;
+export declare const createFromJson: (r: LegacyRouteApiDetail) => Route;
 export {};

package/lib/routes/base/utils/route.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFromJson = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.checkIsLoop = void 0;
+exports.createFromJson = exports.getPosition = exports.getNextPosition = exports.getRouteHash = exports.getTotalDistance = exports.updateElevationGain = exports.getElevationGainAt = exports.getTotalElevation = exports.validateDistance = exports.validateRoute = exports.addDetails = exports.getSegments = exports.updateSlopes = exports.validateSlopes = exports.checkIsLoop = void 0;
 const utils_1 = require("../../../utils");
+const clone_1 = __importDefault(require("../../../utils/clone"));
 const geo_1 = require("../../../utils/geo");
 const valid_1 = require("../../../utils/valid");
 const route_1 = require("../model/route");
@@ -41,10 +42,37 @@ const checkIsLoop = (_route) => {
     return (dist <= maxDistance);
 };
 exports.checkIsLoop = checkIsLoop;
-const updateSlopes = (points) => {
+const validateSlopes = (points) => {
+    (0, exports.updateSlopes)(points, true);
+};
+exports.validateSlopes = validateSlopes;
+const updateSlopes = (points, validateOnly = false) => {
     let prevPoint = null;
+    if (!validateOnly) {
+        const lapMode = (0, exports.checkIsLoop)(points);
+        if (lapMode) {
+            const distance = utils_1.geo.distanceBetween(points[0], points[points.length - 1]);
+            let elevationShift;
+            if (distance === 0) {
+                elevationShift = points[0].elevation - points[points.length - 1].elevation;
+            }
+            else {
+                const distanceLast = utils_1.geo.distanceBetween(points[points.length - 2], points[points.length - 1]);
+                const slopeLast = (points[points.length - 1].elevation - points[points.length - 2].elevation) / distanceLast * 100;
+                const elevationLast = points[0].elevation - slopeLast * distance / 100;
+                elevationShift = points[0].elevation - elevationLast;
+            }
+            (0, exports.validateDistance)(points);
+            const totalDistance = points[points.length - 1].routeDistance;
+            points.forEach((point) => {
+                point.elevation += elevationShift * (point.routeDistance / totalDistance);
+            });
+        }
+    }
     points.forEach((point) => {
         const i = point.cnt;
+        if (validateOnly && point.slope !== undefined)
+            return;
         if (i > 0) {
             updateSlopePrevPoint(point, prevPoint, points);
         }
@@ -156,7 +184,7 @@ const validateRoute = (route) => {
     if (!((_a = route === null || route === void 0 ? void 0 : route.points) === null || _a === void 0 ? void 0 : _a.length))
         return;
     (0, exports.validateDistance)(route.points);
-    (0, exports.updateSlopes)(route.points);
+    (0, exports.validateSlopes)(route.points);
     (0, exports.updateElevationGain)(route.points);
     route.distance = route.points[route.points.length - 1].routeDistance;
 };
@@ -453,7 +481,8 @@ const buildRouteInfo = (descr) => {
     }
     return data;
 };
-const createFromJson = (data) => {
+const createFromJson = (r) => {
+    const data = (0, clone_1.default)(r);
     if (data.decoded) {
         data.points = data.decoded;
         delete data.decoded;

package/lib/routes/list/cards/RouteCard.js

@@ -213,6 +213,7 @@ class RouteCard extends base_1.BaseCard {
         const markers = [];
         try {
             const startSettings = settings || this.getSettings();
+            this.adjustStartPosAvi(startSettings);
             const startDistance = startSettings.startPos || 0;
             const startPos = (0, route_1.getPosition)(this.route, { distance: startDistance, nearest: true });
             markers.push(startPos);

package/lib/routes/list/loaders/db.js

@@ -263,7 +263,7 @@ let RoutesDbLoader = (() => {
                 details.localizedTitle = { en: details.localizedTitle };
             }
             (0, route_1.validateDistance)(details.points);
-            (0, route_1.updateSlopes)(details.points);
+            (0, route_1.validateSlopes)(details.points);
         }
         validateDescription(description, details) {
             if (!description.elevation) {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.40",
+  "version": "1.3.42",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.13.0",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.15.0",
     "dotenv": "^16.4.5",
-    "eslint": "^9.14.0",
+    "eslint": "^9.15.0",
     "formdata-node": "^6.0.3",
     "jest": "^29.7.0",
     "jsdoc": "^4.0.4",