incyclist-services 1.3.21 → 1.3.22

package/lib/routes/base/api/index.js

@@ -28,7 +28,7 @@ class IncyclistRoutesApi {
     }
     getApi() {
         if (!this.api) {
-            this.api = api_1.RestApiClient.getClient();
+            this.api = api_1.IncyclistRestApiClient.getClient();
             return this.api;
         }
         return this.api;

package/lib/routes/base/api/types.d.ts

@@ -23,6 +23,8 @@ export interface RouteApiDescription extends RouteBase {
     type?: RouteType;
     localizedTitle?: LocalizedText;
     previewUrl?: string;
+    downloadUrl?: string;
+    requiresDownload?: boolean;
     isDeleted?: boolean;
     selectableSegments?: Array<RouteSegment>;
 }
@@ -55,6 +57,7 @@ export type RouteApiDetail = {
     distance?: number;
     elevation?: number;
     points?: Array<RoutePoint>;
+    requiresDownload?: boolean;
     downloadUrl?: string;
     downloadType?: string;
     gpxDisabled?: boolean;

package/lib/routes/base/parsers/incyclist.d.ts

@@ -1,5 +1,6 @@
 import { JSONObject } from '../../../utils';
 import { RouteApiDetail } from '../api/types';
+import { RoutePoint } from '../types';
 import { XMLParser, XmlParserContext } from './xml';
 export declare class IncyclistXMLParser extends XMLParser {
     static SCHEME: string;
@@ -7,4 +8,5 @@ export declare class IncyclistXMLParser extends XMLParser {
     protected loadPoints(context: XmlParserContext): Promise<void>;
     protected processCuts(data: JSONObject, route: RouteApiDetail): void;
     protected parseVideo(context: XmlParserContext): Promise<void>;
+    protected processElevationShift(elevationShift: number, points: RoutePoint[]): void;
 }

package/lib/routes/base/parsers/incyclist.js

@@ -120,6 +120,37 @@ class IncyclistXMLParser extends xml_1.XMLParser {
             if (data['cuts']) {
                 this.processCuts(data, route);
             }
+            if (data['elevation-shift'])
+                this.processElevationShift(Number(data['elevation-shift']), route.points);
+        });
+    }
+    processElevationShift(elevationShift, points) {
+        if (!elevationShift || !points || points.length < 2 || points.length < elevationShift)
+            return;
+        const cuts = points.filter(p => p.isCut) || [];
+        const lastPoints = [];
+        cuts.forEach(cut => {
+            lastPoints.push(points[cut.cnt - 1]);
+        });
+        lastPoints.push(points[points.length - 1]);
+        let idx = 0;
+        let prev = undefined;
+        lastPoints.forEach(lp => {
+            const lastIdx = lp.cnt;
+            const lastSlope = lp.slope;
+            let lastElevation = lp.elevation;
+            while (idx + elevationShift <= lastIdx) {
+                points[idx].elevation = points[idx + elevationShift].elevation;
+                points[idx].slope = points[idx + elevationShift].slope;
+                points[idx].elevationGain = points[idx + elevationShift].elevationGain;
+                idx++;
+            }
+            while (idx <= lastIdx) {
+                points[idx].elevation = lastElevation + lastSlope * points[idx].distance / 100;
+                points[idx].elevationGain += (points[idx].elevation - lastElevation);
+                lastElevation = points[idx].elevation;
+                idx++;
+            }
         });
     }
 }

package/lib/routes/base/types/index.d.ts

@@ -1,7 +1,7 @@
 import { FileInfo } from "../../../api";
 import { LatLng } from "../../../utils/geo";
 export type RouteType = 'gpx' | 'video';
-export type RouteCategory = 'Imported' | 'Free' | 'Demo' | 'personal';
+export type RouteCategory = 'Imported' | 'Free' | 'Demo' | 'personal' | 'alternatives' | 'selected';
 export type RouteState = 'prepared' | 'loading' | 'loaded' | 'error';
 export type RouteProvider = {
     name: string;
@@ -102,6 +102,7 @@ export interface RouteInfo extends RouteBase {
     segments?: Array<RouteSegment>;
     tsImported?: number;
     tsLastStart?: number;
+    tsReleased?: number;
     next?: string;
     legacyId?: string;
     isDownloaded?: boolean;

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

@@ -104,8 +104,10 @@ const addDetails = (route, details) => {
     route.description.points = details.points;
     route.description.distance = (_a = details.distance) !== null && _a !== void 0 ? _a : points[points.length - 1].routeDistance;
     if (route.description.hasVideo) {
-        route.description.requiresDownload = (0, valid_1.valid)(details.downloadUrl);
-        route.description.downloadUrl = details.downloadUrl;
+        if (!(0, valid_1.valid)(route.description.requiresDownload))
+            route.description.requiresDownload = details.requiresDownload === undefined ? (0, valid_1.valid)(details.downloadUrl) : details.requiresDownload;
+        if (!(0, valid_1.valid)(route.description.downloadUrl))
+            route.description.downloadUrl = details.downloadUrl;
         if (!(0, valid_1.valid)(route.description.videoUrl)) {
             route.description.videoUrl = details.video.url;
         }

package/lib/routes/list/cards/RouteCard.d.ts

@@ -19,6 +19,7 @@ export interface SummaryCardDisplayProps extends RouteInfo {
     observer: Observer;
     initialized: boolean;
     loading?: boolean;
+    isNew?: boolean;
 }
 export interface DetailCardDisplayProps {
 }

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

@@ -24,6 +24,7 @@ const localization_1 = require("../../base/utils/localization");
 const gd_eventlog_1 = require("gd-eventlog");
 const route_1 = require("../../base/utils/route");
 const workouts_1 = require("../../../workouts");
+const utils_2 = require("../utils");
 class ConvertObserver extends observer_1.Observer {
     constructor() {
         super();
@@ -161,8 +162,9 @@ class RouteCard extends base_1.BaseCard {
             if (points && !Array.isArray(points)) {
                 points = undefined;
             }
+            let isNew = (0, utils_2.checkIsNew)(descr);
             const loading = this.deleteObserver !== undefined;
-            return Object.assign(Object.assign({}, descr), { initialized: this.initialized, loaded: true, ready: true, state: 'loaded', visible: this.visible, canDelete: this.canDelete(), points, loading, title: this.getTitle(), observer: this.cardObserver });
+            return Object.assign(Object.assign({}, descr), { initialized: this.initialized, loaded: true, ready: true, state: 'loaded', visible: this.visible, isNew, canDelete: this.canDelete(), points, loading, title: this.getTitle(), observer: this.cardObserver });
         }
         catch (err) {
             this.logError(err, 'getDisplayProperties');

package/lib/routes/list/lists/alternatives.js

@@ -2,13 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlternativeRoutes = void 0;
 const cardlist_1 = require("../../../base/cardlist");
+const utils_1 = require("../utils");
 const score = (r) => {
     let val = 0;
     const tsAction = (Date.now() - Math.max(r.tsImported || 0, r.tsLastStart || 0)) / 1000 / 3600 / 24;
-    if (r.hasVideo || (1 - tsAction) > 0)
+    const isNew = (0, utils_1.checkIsNew)(r);
+    if (r.hasVideo)
         val += 1;
-    if (!r.isDemo)
+    if ((1 - tsAction) > 0)
         val += 1;
+    if (!r.isDemo)
+        val += 0.1;
+    if (isNew)
+        val++;
     return val;
 };
 const sortFn = (a, b) => {

package/lib/routes/list/lists/selected.js

@@ -2,12 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectedRoutes = void 0;
 const cardlist_1 = require("../../../base/cardlist");
+const utils_1 = require("../utils");
 const score = (r, idx) => {
     let val = 0;
-    const tsAction = (Date.now() - Math.max(r.tsImported || 0, r.tsLastStart || 0)) / 1000 / 3600 / 24;
+    const isNew = (0, utils_1.checkIsNew)(r);
+    const tsUserImport = (r.isLocal) ? r.tsImported || 0 : 0;
+    const tsAction = (Date.now() - Math.max(tsUserImport, r.tsLastStart || 0)) / 1000 / 3600 / 24;
     val += (1 - idx / 1000);
-    if (r.hasVideo || (1 - tsAction) > 0)
-        val += 1;
+    if (r.hasVideo)
+        val++;
+    if ((1 - tsAction) > 0)
+        val += 2.1;
+    if (isNew)
+        val++;
     return val;
 };
 const sortFn = (a, b) => {

package/lib/routes/list/loaders/DBLoader.d.ts

@@ -15,6 +15,7 @@ export declare abstract class DBLoader<T> extends Loader<T> {
     load(): Observer;
     stopLoad(): void;
     protected _load(): Promise<void>;
+    protected abstract verifyImportDate(routes: Array<T>): any;
     protected getVideosRepo(): JsonRepository;
     protected getRoutesRepo(): JsonRepository;
     protected abstract loadDetails(route: Route, allreadyAdded?: boolean): Promise<void>;

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

@@ -34,6 +34,7 @@ class DBLoader extends types_1.Loader {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             this.routeDescriptions = yield this.loadDescriptions();
+            this.verifyImportDate(this.routeDescriptions);
             const promises = [];
             (_a = this.routeDescriptions) === null || _a === void 0 ? void 0 : _a.forEach(descr => {
                 const route = new route_1.Route(this.buildRouteInfo(descr));

package/lib/routes/list/loaders/LegacyDB.d.ts

@@ -14,4 +14,5 @@ export declare class RoutesLegacyDbLoader extends DBLoader<RouteDBApiDescription
     protected checkLegacy(descr: RouteDBApiDescription): RouteDBApiDescription;
     protected loadDescriptions(): Promise<Array<RouteDBApiDescription>>;
     protected loadDetails(): Promise<void>;
+    protected verifyImportDate(routes: RouteDBApiDescription[]): void;
 }

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

@@ -143,6 +143,8 @@ let RoutesLegacyDbLoader = (() => {
                 throw new Error('not implemented');
             });
         }
+        verifyImportDate(routes) {
+        }
     };
     __setFunctionName(_classThis, "RoutesLegacyDbLoader");
     (() => {

package/lib/routes/list/loaders/api.d.ts

@@ -1,3 +1,4 @@
+import { EventLogger } from "gd-eventlog";
 import { Observer, PromiseObserver } from "../../../base/types/observer";
 import IncyclistRoutesApi from "../../base/api";
 import { RouteApiDescription, RouteApiDetail } from "../../base/api/types";
@@ -9,6 +10,7 @@ export declare class RoutesApiLoader extends Loader<RouteApiDescription> {
     protected api: IncyclistRoutesApi;
     protected loadObserver: Observer;
     protected saveObserver: PromiseObserver<void>;
+    protected logger: EventLogger;
     constructor();
     load(): Observer;
     stopLoad(): void;

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutesApiLoader = void 0;
+const gd_eventlog_1 = require("gd-eventlog");
 const observer_1 = require("../../../base/types/observer");
 const api_1 = __importDefault(require("../../base/api"));
 const route_1 = require("../../base/model/route");
@@ -24,6 +25,7 @@ class RoutesApiLoader extends types_1.Loader {
     constructor() {
         super();
         this.api = api_1.default.getInstance();
+        this.logger = new gd_eventlog_1.EventLogger('RoutesApi');
     }
     load() {
         if (this.loadObserver)
@@ -42,6 +44,7 @@ class RoutesApiLoader extends types_1.Loader {
                     for (let j = 0; j < p.value.length; j++) {
                         const descr = p.value[j];
                         let description;
+                        let isUpdated = false;
                         const existing = this.getDescriptionFromDB(descr.routeId || descr.id);
                         const { isDeleted = false } = descr;
                         if (existing
@@ -55,6 +58,15 @@ class RoutesApiLoader extends types_1.Loader {
                         }
                         else {
                             description = this.buildRouteInfo(descr);
+                            if (!existing) {
+                                this.logger.logEvent({ message: 'route added', id: description.id, title: description.title, ts: description.tsImported });
+                                description.tsImported = Date.now();
+                            }
+                            else {
+                                description.tsImported = existing.tsImported;
+                                this.logger.logEvent({ message: 'route updated', id: description.id, title: description.title, from: existing.version, to: description.version, ts: Date.now(), tsImported: description.tsImported });
+                                isUpdated = true;
+                            }
                         }
                         if (!description) {
                             continue;
@@ -70,6 +82,9 @@ class RoutesApiLoader extends types_1.Loader {
                         }
                         else {
                             this.save(route, true);
+                            if (isUpdated) {
+                                this.loadObserver.emit('route.updated', route);
+                            }
                         }
                     }
                 }
@@ -154,8 +169,8 @@ class RoutesApiLoader extends types_1.Loader {
         });
     }
     buildRouteInfo(descr, isLocal) {
-        const { id, routeId, title, localizedTitle, country, distance, elevation, category, provider, video, points, previewUrl, routeHash, version, isDeleted } = descr;
-        const data = { title, localizedTitle, country, distance, elevation, provider, category, previewUrl, routeHash, version, isDeleted };
+        const { id, routeId, title, localizedTitle, country, distance, elevation, category, provider, video, requiresDownload, points, previewUrl, downloadUrl, routeHash, version, isDeleted } = descr;
+        const data = { title, localizedTitle, country, distance, elevation, provider, category, previewUrl, requiresDownload, downloadUrl, routeHash, version, isDeleted };
         data.hasVideo = false;
         data.hasGpx = false;
         data.isLocal = isLocal || false;

package/lib/routes/list/loaders/db.d.ts

@@ -30,6 +30,7 @@ export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
     protected loadFromLegacy(): Promise<Array<RouteInfoDBEntry>>;
     protected loadDescriptions(): Promise<Array<RouteInfoDBEntry>>;
     protected removeDuplicates(routes: Array<RouteInfoDBEntry>): any[];
+    protected verifyImportDate(routes: Array<RouteInfoDBEntry>): void;
     protected loadDetailRecord(target: Route | RouteInfo): Promise<RouteApiDetail>;
     protected loadDetails(route: Route, alreadyAdded?: boolean): Promise<void>;
     protected getVideoRepo(): JsonRepository;

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

@@ -192,6 +192,19 @@ let RoutesDbLoader = (() => {
             });
             return cleaned;
         }
+        verifyImportDate(routes) {
+            let changed = false;
+            routes.forEach(r => {
+                if (!r.tsImported) {
+                    r.tsImported = Date.now();
+                    changed = true;
+                }
+            });
+            if (changed) {
+                this.isDirty = true;
+                this.write();
+            }
+        }
         loadDetailRecord(target) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a;

package/lib/routes/list/service.d.ts

@@ -80,6 +80,7 @@ export declare class RouteListService extends IncyclistService {
     protected addFromApi(route: Route): Promise<void>;
     protected update(route: Route): Promise<void>;
     protected loadRoutes(): Promise<void>;
+    protected checkUIUpdateWithNoRepoStats(): Promise<void>;
     protected loadRoutesFromRepo(): Promise<void>;
     protected loadRoutesFromApi(): Promise<void>;
     protected selectList(route: Route): CardList<Route>;

package/lib/routes/list/service.js

@@ -70,6 +70,8 @@ const api_3 = __importDefault(require("../base/api"));
 const ActiveImportCard_1 = require("./cards/ActiveImportCard");
 const selected_1 = require("./lists/selected");
 const alternatives_1 = require("./lists/alternatives");
+const utils_1 = require("./utils");
+const utils_2 = require("incyclist-devices/lib/utils/utils");
 let RouteListService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -270,6 +272,7 @@ let RouteListService = (() => {
                         };
                         this.logEvent({ message: 'preload route list completed', cards });
                         this.initialized = true;
+                        (0, utils_1.updateRepoStats)();
                         this.emitLists('loaded');
                         process.nextTick(() => { delete this.preloadObserver; });
                     })
@@ -497,9 +500,24 @@ let RouteListService = (() => {
         loadRoutes() {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.loadRoutesFromRepo();
+                yield this.checkUIUpdateWithNoRepoStats();
                 yield this.loadRoutesFromApi();
             });
         }
+        checkUIUpdateWithNoRepoStats() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const repoUpdate = (0, utils_1.getRepoUpdates)();
+                if (this.routes.length > 0 && repoUpdate.initial === undefined) {
+                    const ts = Date.now() - 60000;
+                    this.routes.forEach(r => {
+                        r.description.tsImported = ts;
+                        this.update(r);
+                    });
+                    (0, utils_1.updateRepoStats)(ts);
+                    yield (0, utils_2.sleep)(5);
+                }
+            });
+        }
         loadRoutesFromRepo() {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise(done => {
@@ -528,12 +546,18 @@ let RouteListService = (() => {
             if (!description.hasVideo) {
                 if (category === 'personal' || description.isLocal)
                     return this.myRoutes;
+                if (description.category == 'alternatives')
+                    return this.alternatives;
+                if (description.category == 'selected')
+                    return this.selectedRoutes;
                 return description.category ? this.alternatives : this.selectedRoutes;
             }
             else {
                 if (description.isLocal || description.isDownloaded)
                     return this.myRoutes;
-                if (description.isDemo || (description.requiresDownload && !description.isDownloaded))
+                if (description.category == 'selected')
+                    return this.selectedRoutes;
+                if (description.category == 'alternatives' || description.isDemo || (description.requiresDownload && !description.isDownloaded))
                     return this.alternatives;
                 if (category === undefined || category === 'personal' || category === 'imported')
                     return this.myRoutes;

package/lib/routes/list/types.d.ts

@@ -41,3 +41,8 @@ export interface SearchFilterOptions {
     contentTypes: Array<string>;
     routeTypes: Array<string>;
 }
+export interface RoutesRepoUpdates {
+    prev?: number;
+    current?: number;
+    initial?: number;
+}

package/lib/routes/list/utils.d.ts

@@ -0,0 +1,5 @@
+import { RouteInfo } from "../base/types";
+import { RoutesRepoUpdates } from "./types";
+export declare const updateRepoStats: (ts?: number) => void;
+export declare const getRepoUpdates: () => RoutesRepoUpdates;
+export declare const checkIsNew: (descr: RouteInfo) => boolean;

package/lib/routes/list/utils.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIsNew = exports.getRepoUpdates = exports.updateRepoStats = void 0;
+const settings_1 = require("../../settings");
+const DURATION_2_WEEKS = 1000 * 60 * 60 * 24 * 14;
+const DURATION_30_SECONDS = 1000 * 30;
+const updateRepoStats = (ts) => {
+    const settings = (0, settings_1.useUserSettings)();
+    const updates = settings.get('repo.routesUpdates', {});
+    if (updates.current)
+        updates.prev = updates.current;
+    else
+        updates.initial = ts ? ts : Date.now();
+    if (ts)
+        updates.initial = ts;
+    updates.current = Date.now();
+    settings.set('repo.routesUpdates', updates);
+};
+exports.updateRepoStats = updateRepoStats;
+const getRepoUpdates = () => {
+    const settings = (0, settings_1.useUserSettings)();
+    const updates = settings.get('repo.routesUpdates', {});
+    return updates;
+};
+exports.getRepoUpdates = getRepoUpdates;
+const checkIsNew = (descr) => {
+    let isNew = false;
+    const repoUpdates = (0, exports.getRepoUpdates)();
+    if (descr.tsImported === repoUpdates.initial)
+        return false;
+    if (repoUpdates.prev) {
+        if (!descr.isLocal && !descr.tsLastStart && (descr.tsImported - repoUpdates.initial) > DURATION_30_SECONDS && Date.now() - descr.tsImported < DURATION_2_WEEKS) {
+            isNew = true;
+        }
+    }
+    return isNew;
+};
+exports.checkIsNew = checkIsNew;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },