incyclist-services 1.4.18 → 1.4.19

package/lib/activities/upload/velohero.d.ts

@@ -8,6 +8,8 @@ export declare class VeloHeroUpload extends IncyclistService implements IActivit
     constructor();
     init(): boolean;
     isConnected(): boolean;
+    isConnecting(): boolean;
+    disconnect(): void;
     upload(activity: ActivityDetails, format?: string): Promise<boolean>;
     getUrl(id: string): string;
     protected ensureInitialized(): any;

package/lib/activities/upload/velohero.js

@@ -77,6 +77,12 @@ let VeloHeroUpload = (() => {
         isConnected() {
             return this.getVeloHeroAppConnection().isConnected();
         }
+        isConnecting() {
+            return this.getVeloHeroAppConnection().isConnecting();
+        }
+        disconnect() {
+            return this.getVeloHeroAppConnection().disconnect();
+        }
         upload(activity_1) {
             return __awaiter(this, arguments, void 0, function* (activity, format = 'TCX') {
                 var _a;

package/lib/apps/service.d.ts

@@ -24,6 +24,7 @@ export declare class AppsService extends IncyclistService {
     getAppOperationSettings(app: string): any[];
     getConnectedServices(operation: AppsOperation): Array<AppDefinition>;
     getName(key: string): string;
+    getKey(name: string): string;
     protected getAppDisplayProps(key: string): {
         name: string;
         key: string;

package/lib/apps/service.js

@@ -156,6 +156,10 @@ let AppsService = (() => {
             const found = this.serviceMap.find(r => r.key === key);
             return found ? found.name : key;
         }
+        getKey(name) {
+            const found = this.serviceMap.find(r => r.name === name);
+            return found ? found.key : name;
+        }
         getAppDisplayProps(key) {
             const entry = this.serviceMap.find(e => e.key === key);
             const { name, iconUrl } = entry;

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

@@ -91,8 +91,6 @@ class EPMParser extends xml_1.XMLParser {
         json.min = reader.ReadUint32();
         json.max = reader.ReadUint32();
         json.cnt = reader.ReadUint32();
-        if (json.cnt !== num) {
-        }
         json.sampleRate = reader.ReadUint32();
         json.validFor = reader.ReadUint32();
         json.elevationStart = reader.ReadFloat();

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

@@ -143,6 +143,7 @@ export declare class RouteListService extends IncyclistService implements IRoute
     protected addImportCard(file: FileInfo): ActiveImportCard;
     protected getFilterContentTypes(): Array<string>;
     protected getFilterRouteTypes(): Array<string>;
+    protected getFilterRouteSources(): Array<string>;
     protected getFilterCountries(): Array<string>;
     protected addRoute(route: Route): void;
     protected verifyPoints(card: RouteCard, route: Route): Promise<void>;

package/lib/routes/list/service.js

@@ -103,7 +103,7 @@ let RouteListService = (() => {
             this.db = new db_1.RoutesDbLoader();
             this.createPreviewQueue = [];
             this.routes = [];
-            this.filters = {};
+            this.filters = this.getFilters();
             this.syncInfo = {};
             this.getRouteSyncFactory().setRouteList(this);
             this.handleConfigChanges();
@@ -182,13 +182,16 @@ let RouteListService = (() => {
         saveFilters(requestedFilters) {
             this.filters = requestedFilters;
             const settings = this.getUserSettings();
-            settings.set('preferencs.search.filter', requestedFilters !== null && requestedFilters !== void 0 ? requestedFilters : null);
+            settings.set('preferences.search.filter', requestedFilters !== null && requestedFilters !== void 0 ? requestedFilters : null);
         }
         getFilters() {
-            if (!this.filters) {
-                const settings = this.getUserSettings();
-                this.filters = settings.get('preferencs.search.filter', undefined);
+            try {
+                if (!this.filters) {
+                    const settings = this.getUserSettings();
+                    this.filters = settings.get('preferences.search.filter', undefined);
+                }
             }
+            catch (_a) { }
             return this.filters;
         }
         searchAgain() {
@@ -199,14 +202,17 @@ let RouteListService = (() => {
             if (!this.initialized)
                 this.preload();
             const filters = requestedFilters || this.filters;
-            this.prevFilters = filters;
-            return this.searchRepo(requestedFilters);
+            if (filters !== this.prevFilters) {
+                this.prevFilters = filters;
+                this.saveFilters(filters);
+            }
+            return this.searchRepo(filters);
         }
         searchRepo(requestedFilters) {
             if (!this.observer)
                 this.observer = new RouteListObserver_1.RouteListObserver(this);
             try {
-                const filters = requestedFilters || this.filters;
+                const filters = requestedFilters !== null && requestedFilters !== void 0 ? requestedFilters : this.filters;
                 let routes = Array.from(this.getAllSearchCards().map(c => c.getDisplayProperties()));
                 routes.sort((a, b) => a.title > b.title ? 1 : -1);
                 if (!filters) {
@@ -219,8 +225,7 @@ let RouteListService = (() => {
                 routes = this.applyCountryFilter(filters, routes);
                 routes = this.applyContentTypeFilter(filters, routes);
                 routes = this.applyRouteTypeFilter(filters, routes);
-                if (this.checkKomootFeatureEnabled())
-                    routes = this.applySourceFilter(filters, routes);
+                routes = this.applySourceFilter(filters, routes);
                 const cards = routes.map(r => this.getCard(r.id));
                 this.setListTop('list', 0);
                 this.setListTop('tiles', 0);
@@ -259,12 +264,16 @@ let RouteListService = (() => {
             return routes;
         }
         applySourceFilter(filters, routes) {
-            routes = routes.filter(r => r.source === undefined || this.getAppsService().isEnabled(r.source, 'RouteDownload'));
-            if (filters.source) {
-                const internal = filters.source === 'none';
-                const sources = filters.source.split('|');
-                routes = routes.filter(r => (r.source === undefined && internal) ||
-                    (r.source === undefined && sources.includes('incyclist')) ||
+            if (this.checkKomootFeatureEnabled())
+                routes = routes.filter(r => r.source === undefined || this.getAppsService().isEnabled(r.source, 'RouteDownload'));
+            else
+                routes = routes.filter(r => r.source === undefined);
+            if (filters.routeSource) {
+                const local = filters.routeSource === 'Local';
+                const internal = filters.routeSource === 'Incyclist';
+                const sources = filters.routeSource.split('|').map(s => this.getAppsService().getKey(s));
+                routes = routes.filter(r => (r.source === undefined && !r.isLocal && internal) ||
+                    (r.source === undefined && r.isLocal && local) ||
                     (r.source && !internal && sources.includes(r.source)));
             }
             return routes;
@@ -319,15 +328,17 @@ let RouteListService = (() => {
             let countries = [];
             let contentTypes = [];
             let routeTypes = [];
+            let routeSources = [];
             try {
                 countries = this.getFilterCountries();
                 contentTypes = this.getFilterContentTypes();
                 routeTypes = this.getFilterRouteTypes();
+                routeSources = this.getFilterRouteSources();
             }
             catch (err) {
                 this.logError(err, 'getFilterOption');
             }
-            return { countries, contentTypes, routeTypes };
+            return { countries, contentTypes, routeTypes, routeSources };
         }
         onResize() {
             try {
@@ -593,6 +604,21 @@ let RouteListService = (() => {
         getFilterRouteTypes() {
             return ['Loop', 'Point to Point'];
         }
+        getFilterRouteSources() {
+            const options = ['Local', 'Incyclist'];
+            if (this.checkKomootFeatureEnabled()) {
+                this.routes.forEach(r => {
+                    const source = r.description.source;
+                    if (!source)
+                        return;
+                    const option = this.getAppsService().getName(source);
+                    if (option && !options.includes(option)) {
+                        options.push(option);
+                    }
+                });
+            }
+            return options;
+        }
         getFilterCountries() {
             try {
                 const countries = [];
@@ -620,6 +646,8 @@ let RouteListService = (() => {
         }
         addRoute(route) {
             var _a;
+            if (!this.checkKomootFeatureEnabled() && route.description.source)
+                return;
             this.logEvent({ message: 'route added', route: route.description.title, source: route.description.source });
             if ((_a = route.description) === null || _a === void 0 ? void 0 : _a.isDeleted)
                 return;
@@ -843,7 +871,7 @@ let RouteListService = (() => {
                     this.db.save(route, false);
                 })
                     .catch(err => {
-                    console.log('# error', route.description.id, route.description.title, err);
+                    this.logError(err, 'verifyRouteCountry', { id: route.description.id, title: route.description.title });
                 });
             }
         }

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

@@ -37,13 +37,14 @@ export interface SearchFilter {
     country?: string;
     contentType?: string;
     routeType?: string;
-    source?: string;
+    routeSource?: string;
     includeDeleted?: boolean;
 }
 export interface SearchFilterOptions {
     countries: Array<string>;
     contentTypes: Array<string>;
     routeTypes: Array<string>;
+    routeSources: Array<string>;
 }
 export interface RoutesRepoUpdates {
     prev?: number;

package/lib/routes/sync/komoot/provider.js

@@ -171,7 +171,7 @@ let KomootSyncProvider = (() => {
             }
             checkTours(tours) {
                 var _b, _c, _d;
-                const routes = (_d = (_c = (_b = this.getRouteListService()) === null || _b === void 0 ? void 0 : _b.searchRepo({ source: 'komoot' })) === null || _c === void 0 ? void 0 : _c.routes) !== null && _d !== void 0 ? _d : [];
+                const routes = (_d = (_c = (_b = this.getRouteListService()) === null || _b === void 0 ? void 0 : _b.searchRepo({ routeSource: 'komoot' })) === null || _c === void 0 ? void 0 : _c.routes) !== null && _d !== void 0 ? _d : [];
                 const added = [];
                 const updated = [];
                 tours.forEach(tour => {

package/package.json

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