@igo2/core 1.14.1 → 1.15.0

package/fesm2020/igo2-core.mjs

@@ -2,8 +2,8 @@ import * as i0 from '@angular/core';
 import { Injectable, NgModule, InjectionToken, APP_INITIALIZER, Injector, Inject, Optional, SkipSelf, EventEmitter } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient, HttpErrorResponse, HttpClientModule, HttpResponse } from '@angular/common/http';
-import { finalize, catchError, map, debounceTime, first, tap, startWith } from 'rxjs/operators';
-import { BehaviorSubject, throwError, combineLatest, forkJoin, Observable, fromEvent } from 'rxjs';
+import { finalize, catchError, debounceTime, first, tap, startWith } from 'rxjs/operators';
+import { BehaviorSubject, throwError, forkJoin, map, combineLatest, Observable, fromEvent } from 'rxjs';
 import { uuid, ObjectUtils } from '@igo2/utils';
 import * as i1 from '@ngx-translate/core';
 import { TranslateLoader, TranslateModule, MissingTranslationHandler } from '@ngx-translate/core';
@@ -100,8 +100,8 @@ IgoActivityModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
     }], null, null); })();
 
 const version = {
-    lib: '1.14.1',
-    releaseDate: 1674653515709
+    lib: '1.15.0',
+    releaseDate: 1683149021750
 };
 
 class ConfigService {
@@ -205,7 +205,7 @@ class LanguageLoader {
             return igoLocale$;
         }
         const appLocale$ = this.prefix.map((prefix) => this.http.get(`${prefix}${lang}${this.suffix}`));
-        const locale$ = combineLatest([igoLocale$, ...appLocale$]);
+        const locale$ = forkJoin([igoLocale$, ...appLocale$]);
         return locale$.pipe(map((translations) => {
             return translations.reduce((acc, current) => ObjectUtils.mergeDeep(acc, current), {});
         }));
@@ -354,9 +354,9 @@ class LanguageService {
     }
     setLanguage(language) {
         this.language = language.match(/en|fr/) ? language : 'en';
-        this.language$.next(this.language);
-        this.translate.use(this.language);
-        this.translate.reloadLang(this.language);
+        combineLatest([this.translate.use(this.language), this.translate.reloadLang(this.language)]).subscribe(() => {
+            this.language$.next(this.language);
+        });
     }
 }
 LanguageService.ɵfac = function LanguageService_Factory(t) { return new (t || LanguageService)(i0.ɵɵinject(i1.TranslateService)); };
@@ -387,14 +387,18 @@ class MessageService {
                     const translatedTitleInterpolateParams = { ...activeMessageTranslation.titleInterpolateParams };
                     if (activeMessageTranslation.textInterpolateParams) {
                         Object.keys(activeMessageTranslation.textInterpolateParams).map(k => {
-                            translatedTextInterpolateParams[k] =
-                                this.languageService.translate.instant(activeMessageTranslation.textInterpolateParams[k]);
+                            if (k) {
+                                translatedTextInterpolateParams[k] =
+                                    this.languageService.translate.instant(activeMessageTranslation.textInterpolateParams[k]);
+                            }
                         });
                     }
                     if (activeMessageTranslation.titleInterpolateParams) {
                         Object.keys(activeMessageTranslation.titleInterpolateParams).map(k => {
-                            translatedTitleInterpolateParams[k] =
-                                this.languageService.translate.instant(activeMessageTranslation.titleInterpolateParams[k]);
+                            if (k) {
+                                translatedTitleInterpolateParams[k] =
+                                    this.languageService.translate.instant(activeMessageTranslation.titleInterpolateParams[k]);
+                            }
                         });
                     }
                     forkJoin([
@@ -481,14 +485,18 @@ class MessageService {
         const translatedTitlenterpolateParams = { ...titleInterpolateParams };
         if (textInterpolateParams) {
             Object.keys(textInterpolateParams).map(k => {
-                translatedTextInterpolateParams[k] =
-                    this.languageService.translate.instant(textInterpolateParams[k]);
+                if (textInterpolateParams[k]) {
+                    translatedTextInterpolateParams[k] =
+                        this.languageService.translate.instant(textInterpolateParams[k]);
+                }
             });
         }
         if (titleInterpolateParams) {
             Object.keys(titleInterpolateParams).map(k => {
-                translatedTitlenterpolateParams[k] =
-                    this.languageService.translate.instant(titleInterpolateParams[k]);
+                if (k) {
+                    translatedTitlenterpolateParams[k] =
+                        this.languageService.translate.instant(titleInterpolateParams[k]);
+                }
             });
         }
         const message = this.languageService.translate.instant(text, translatedTextInterpolateParams);
@@ -650,13 +658,21 @@ IgoErrorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 
 const dbConfig = {
     name: 'igo2DB',
-    version: 1,
+    version: 2,
     objectStoresMeta: [{
             store: 'geoData',
             storeConfig: { keyPath: 'url', autoIncrement: false },
             storeSchema: [
                 { name: 'regionID', keypath: 'regionID', options: { unique: false } }
             ]
+        },
+        {
+            store: 'layerData',
+            storeConfig: { keyPath: 'layerId', autoIncrement: false },
+            storeSchema: [
+                { name: 'layerOptions', keypath: 'layerOptions', options: { unique: false } },
+                { name: 'sourceOptions', keypath: 'sourceOptions', options: { unique: false } }
+            ]
         }]
 };
 class IgoCoreModule {
@@ -766,7 +782,7 @@ class LoggingInterceptor {
         // Log when response observable either completes or errors
         finalize(() => {
             const elapsed = Date.now() - started;
-            const msg = `${req.method} "${req.urlWithParams}"
+            const msg = `${req.method} "${req.urlWithParams}"
              ${ok} in ${elapsed} ms.`;
             console.log(msg);
         }));
@@ -933,6 +949,13 @@ class AnalyticsService {
             this.paq.push(['trackEvent', category, action, name]);
         }
     }
+    /**
+     * Function that tracks layers added to the map
+     */
+    trackLayer(category, action, parameters) {
+        if (this.options.provider === 'matomo')
+            this.paq.push(['trackEvent', category, action, parameters]);
+    }
 }
 AnalyticsService.ɵfac = function AnalyticsService_Factory(t) { return new (t || AnalyticsService)(i0.ɵɵinject(ConfigService)); };
 AnalyticsService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AnalyticsService, factory: AnalyticsService.ɵfac, providedIn: 'root' });
@@ -1264,10 +1287,7 @@ class NetworkService {
             if (this.previousMessageId) {
                 this.messageService.remove(this.previousMessageId);
             }
-            const translate = this.injector.get(LanguageService).translate;
-            const message = translate.instant('igo.core.network.online.message');
-            const title = translate.instant('igo.core.network.online.title');
-            const messageObj = this.messageService.info(message, title);
+            const messageObj = this.messageService.info('igo.core.network.online.message', 'igo.core.network.online.title');
             this.previousMessageId = messageObj.toastId;
             this.state.connection = true;
             this.emitEvent();
@@ -1276,10 +1296,7 @@ class NetworkService {
             if (this.previousMessageId) {
                 this.messageService.remove(this.previousMessageId);
             }
-            const translate = this.injector.get(LanguageService).translate;
-            const message = translate.instant('igo.core.network.offline.message');
-            const title = translate.instant('igo.core.network.offline.title');
-            const messageObj = this.messageService.info(message, title);
+            const messageObj = this.messageService.info('igo.core.network.offline.message', 'igo.core.network.offline.title');
             this.previousMessageId = messageObj.toastId;
             this.state.connection = false;
             this.emitEvent();
@@ -1310,6 +1327,30 @@ NetworkService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: NetworkSe
             }]
     }], function () { return [{ type: MessageService }, { type: i0.Injector }]; }, null); })();
 
+class RegexService {
+    constructor(config) {
+        this.config = config;
+        this.options = this.config.getConfig('regex');
+    }
+    getAll() {
+        return this.options;
+    }
+    get(key) {
+        if (this.options) {
+            return this.options[key];
+        }
+        return;
+    }
+}
+RegexService.ɵfac = function RegexService_Factory(t) { return new (t || RegexService)(i0.ɵɵinject(ConfigService)); };
+RegexService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: RegexService, factory: RegexService.ɵfac, providedIn: 'root' });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(RegexService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], function () { return [{ type: ConfigService }]; }, null); })();
+
 /*
  * Public API Surface of core
  */
@@ -1318,5 +1359,5 @@ NetworkService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: NetworkSe
  * Generated bundle index. Do not edit.
  */
 
-export { ActivityInterceptor, ActivityService, AnalyticsService, CONFIG_OPTIONS, CompressionService, ConfigService, ErrorInterceptor, IgoActivityModule, IgoConfigModule, IgoCoreModule, IgoErrorModule, IgoGestureConfig, IgoGestureModule, IgoLanguageModule, IgoLoggingModule, IgoMessageModule, IgoMissingTranslationHandler, LanguageLoader, LanguageService, LoggingInterceptor, Media, MediaOrientation, MediaService, MessageService, MessageType, NetworkService, ROUTE_SERVICE_OPTIONS, RouteService, StorageScope, StorageService, StorageServiceEventEnum, configFactory, defaultLanguageLoader, provideConfigLoader, provideConfigOptions, provideDefaultLanguageLoader, provideLanguageLoader, provideRouteServiceOptions, version };
+export { ActivityInterceptor, ActivityService, AnalyticsService, CONFIG_OPTIONS, CompressionService, ConfigService, ErrorInterceptor, IgoActivityModule, IgoConfigModule, IgoCoreModule, IgoErrorModule, IgoGestureConfig, IgoGestureModule, IgoLanguageModule, IgoLoggingModule, IgoMessageModule, IgoMissingTranslationHandler, LanguageLoader, LanguageService, LoggingInterceptor, Media, MediaOrientation, MediaService, MessageService, MessageType, NetworkService, ROUTE_SERVICE_OPTIONS, RegexService, RouteService, StorageScope, StorageService, StorageServiceEventEnum, configFactory, defaultLanguageLoader, provideConfigLoader, provideConfigOptions, provideDefaultLanguageLoader, provideLanguageLoader, provideRouteServiceOptions, version };
 //# sourceMappingURL=igo2-core.mjs.map