incyclist-services 1.3.19 → 1.3.21

package/lib/activities/base/model/index.d.ts

@@ -60,6 +60,8 @@ export type ActivitySummary = {
     rideTime: number;
     distance: number;
     startPos: number;
+    endPos?: number;
+    segment?: string;
     realityFactor: number;
     uploadStatus: Array<UploadInfo>;
     isCompleted?: boolean;
@@ -133,6 +135,8 @@ export interface ActivityDetails {
     timePause: number;
     distance: number;
     startPos: number;
+    endPos?: number;
+    segment?: string;
     startpos?: number;
     endpos?: number;
     totalElevation: number;

package/lib/activities/base/repo/db.js

@@ -155,6 +155,9 @@ let ActivitiesRepository = (() => {
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.startPos) !== undefined) {
                 result = result.filter(ai => ai.summary.startPos === criteria.startPos);
             }
+            if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.endPos) !== undefined) {
+                result = result.filter(ai => ai.summary.endPos === criteria.endPos);
+            }
             if ((result === null || result === void 0 ? void 0 : result.length) > 0 && (criteria === null || criteria === void 0 ? void 0 : criteria.realityFactor) !== undefined) {
                 result = result.filter(ai => { var _a; return ((_a = ai.summary.realityFactor) !== null && _a !== void 0 ? _a : 100) === criteria.realityFactor; });
             }

package/lib/activities/base/repo/types.d.ts

@@ -3,6 +3,7 @@ export interface ActivitySearchCriteria {
     routeId?: string;
     routeHash?: string;
     startPos?: number;
+    endPos?: number;
     realityFactor?: number;
     uploadStatus?: UploadInfo | Array<UploadInfo>;
     isSaved?: boolean;

package/lib/activities/base/utils/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSummary = void 0;
 const buildSummary = (activity, proposedName) => {
     var _a;
-    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, realityFactor = 100, links, laps } = activity;
+    const { id, title, route, screenshots, startTime: startTimeUTC, time: rideTime, distance, startPos, endPos, segment, realityFactor = 100, links, laps } = activity;
     const name = proposedName !== null && proposedName !== void 0 ? proposedName : activity.name;
     const routeId = route === null || route === void 0 ? void 0 : route.id;
     const routeHash = route === null || route === void 0 ? void 0 : route.hash;
@@ -18,7 +18,7 @@ const buildSummary = (activity, proposedName) => {
         uploadStatus.push({ service: 'strava', status: 'success' });
     }
     return {
-        id, title, name, routeId, routeHash, previewImage, startTime, rideTime, distance, startPos, realityFactor, uploadStatus, laps
+        id, title, name, routeId, routeHash, previewImage, startTime, rideTime, distance, startPos, endPos, realityFactor, uploadStatus, laps
     };
 };
 exports.buildSummary = buildSummary;

package/lib/activities/ride/service.js

@@ -430,7 +430,7 @@ let ActivityRideService = (() => {
                 }
                 const logs = ai.details.logs;
                 const totalDistance = ai.summary.distance;
-                if (current.distance > totalDistance)
+                if (!(current === null || current === void 0 ? void 0 : current.distance) || current.distance > totalDistance)
                     return null;
                 let prev = undefined;
                 let res = (0, clone_1.default)(logs.find((log, idx) => {
@@ -443,6 +443,9 @@ let ActivityRideService = (() => {
                 }));
                 if (!res) {
                     res = (0, clone_1.default)(logs[logs.length - 1]);
+                    if (!res) {
+                        return null;
+                    }
                 }
                 else {
                     if (Math.abs(res.time - current.time) > 0.1) {
@@ -471,6 +474,8 @@ let ActivityRideService = (() => {
                     }
                     return false;
                 }));
+                if (!res)
+                    return null;
                 const s = res.distance - current.distance;
                 const v = res.speed / 3.6;
                 const t = v === 0 ? Infinity : s / v;
@@ -701,6 +706,7 @@ let ActivityRideService = (() => {
             const startTime = new Date(this.tsStart).toUTCString();
             this.current = { deviceData: {}, dataState: {} };
             let startPos = 0;
+            let endPos, segment;
             let realityFactor;
             let routeName;
             let routeId;
@@ -723,6 +729,8 @@ let ActivityRideService = (() => {
                         (0, route_1.validateRoute)(selectedRoute);
                         const s = startSettings;
                         startPos = s.startPos;
+                        endPos = s.endPos;
+                        segment = s.segment;
                         this.current.endPos = s.endPos;
                         realityFactor = s.realityFactor;
                         routeId = selectedRoute.description.id;
@@ -759,7 +767,7 @@ let ActivityRideService = (() => {
                 distance: 0,
                 totalElevation: 0,
                 logs: [],
-                startPos, realityFactor,
+                startPos, endPos, segment, realityFactor,
                 fileName
             };
             return activity;

package/lib/maps/ways/MapArea.d.ts

@@ -0,0 +1,110 @@
+export default class MapAreaService {
+    static consts: {
+        DEFAULT_RADIUS: number;
+        DEFAULT_MIN_WAYS: number;
+        DEFAULT_MAX_WAYS: number;
+        MAX_DISTANCE_FROM_PATH: number;
+        GET_WAYS_IN_AREA: string;
+    };
+    static _instances: {};
+    static getInstance(id?: string): any;
+    constructor(props?: any);
+    init(props: any): void;
+    isInitialized(): boolean;
+    load(callback: any): Promise<void>;
+    setData(openmapData: any, callback: any): void;
+    _collectRoundabout(way: any): any[];
+    static _generateID(ways: any): any;
+    _replaceWayID(way: any, newId: any, replaceLookup?: boolean): any;
+    _checkRoundabouts(): void;
+    setLocation(location: any, reload: any, onLoaded: any): void;
+    _buildQuery(template: any): any;
+    getNearestPath(point: any): {
+        path: any;
+        distance: any;
+        way: any;
+    };
+    static _getNearestPath(point: any, ways: any): {
+        path: any;
+        distance: any;
+        way: any;
+    };
+    static _isWithinRange(distance: any): boolean;
+    static _isOnPath(point: any, way: any): boolean;
+    static _isBetween(point: any, p1: any, p2: any): {
+        between: boolean;
+        offset: any;
+    };
+    static _distanceToPath(point: any, way: any): any;
+    static addNode(node: any, nodesLookup: any, id: any, path: any): void;
+    static addWay(w: any, ways: any, waysLookup: any): void;
+    static updateTypeStats(types: any, type: any): void;
+    static _parse(str: any, filter: any): {
+        ways: any[];
+        nodesLookup: any[];
+        waysLookup: any[];
+        typeStats: any[];
+    };
+    splitAtFirstBranch(way: any): {
+        way: {
+            id: any;
+            path: any[];
+        };
+        branches: any[];
+    };
+    getWay(props: any): any;
+    getNode(props: any): any;
+    copyWay(wayFrom: any, id: any): {
+        w: any;
+        roundabout: boolean;
+    };
+    checkOptionsOnCurrentWay(location: any, way: any, options: any): void;
+    splitWayAtPoint(w: any, location: any): {
+        id: any;
+        path: any[];
+    }[];
+    checkOptionsOnDifferentWay(location: any, w: any, options: any): any;
+    removeDuplicates(options: any): any;
+    _getNextOptions(loc: any, way: any, way1: any, status: any): any[];
+    getNextOptions(way: any, way1: any, reload: boolean, props: any): Promise<unknown>;
+    static _isCrossing(way1: any, way2: any, exact?: boolean): any[];
+    static _crossing(A: any, B: any, C: any, D: any, exact?: boolean): any;
+    static _getBoundary(location: any, radius: any): {
+        northeast: {};
+        southwest: {};
+    };
+    isWithinBoundary(location: any): boolean;
+    static _generateQuery(location: any, radius: any): string;
+    static _boundaryToString(boundary: any): string;
+}
+export declare function splitAtPointInfo(way: any, pointInfo: any): any[][];
+export declare function getUntilFirstBranch(w: any, props: any): any;
+export declare function isRoundabout(w: any, strictCheck?: boolean): boolean;
+export declare function splitAtIndex(way: any, idxSplit: any): any[][];
+export declare function splitAtPoint(way: any, point: any): {
+    id: any;
+    path: any[];
+}[];
+export declare function pointEquals(p1: any, p2: any): boolean;
+export declare function isWay(p: any): boolean;
+export declare function isNode(p: any): boolean;
+export declare function isAllowed(way: any, from: any, to: any): boolean;
+export declare function isOneWay(way: any): boolean;
+export declare function getFirstBranch(way: any, ignore: any): any;
+export declare function findAdditional(a1: any, a2: any, id3: any, fn: any): any[];
+export declare function _getPointOnLine(point: any, p1: any, p2: any): any;
+export declare function getPointCrossingPath(point: any, path: any, closest?: boolean): any;
+export declare function getCrossingInfo(way1: any, way2: any): any;
+export declare function getVector(p1: any, p2: any): any;
+export declare function getBounds(lat: any, lng: any, offset: any): {
+    northeast: {};
+    southwest: {};
+};
+export declare function isWithinBoundary(location: any, boundary: any): boolean;
+export declare function initialBearingTo(p1: any, p2: any): any;
+export declare function alongTrackDistanceTo(point: any, pathStart: any, pathEnd: any, radius?: number): number;
+export declare function destinationPoint(start: any, distance: any, bearing: any, radius?: number): {
+    lat: any;
+    lng: any;
+};
+export declare const useMapArea: (id: any) => any;