@igo2/core 1.9.0 → 1.10.0

package/fesm2015/igo2-core.js

@@ -1,6 +1,5 @@
 import * as i0 from '@angular/core';
-import { Injectable, NgModule, InjectionToken, APP_INITIALIZER, Component, Input, Optional, SkipSelf, Inject, EventEmitter } from '@angular/core';
-import * as i2 from '@angular/common';
+import { Injectable, NgModule, InjectionToken, APP_INITIALIZER, Optional, SkipSelf, Inject, EventEmitter } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient, HttpErrorResponse, HttpClientModule, HttpResponse } from '@angular/common/http';
 import { finalize, catchError, map, tap, debounceTime, startWith } from 'rxjs/operators';
@@ -8,13 +7,13 @@ import { BehaviorSubject, throwError, of, combineLatest, fromEvent } from 'rxjs'
 import { uuid, ObjectUtils } from '@igo2/utils';
 import * as i1 from '@ngx-translate/core';
 import { TranslateLoader, TranslateModule, MissingTranslationHandler } from '@ngx-translate/core';
-import * as i1$1 from '@igo2/angular2-notifications';
-import { SimpleNotificationsModule } from '@igo2/angular2-notifications';
-import * as i1$2 from '@angular/material/icon';
+import * as i2 from 'ngx-toastr';
+import { ToastrModule } from 'ngx-toastr';
+import * as i1$1 from '@angular/material/icon';
 import * as i2$1 from '@angular/platform-browser';
 import { HammerGestureConfig, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
-import * as i1$3 from '@angular/router';
-import * as i1$4 from '@angular/cdk/layout';
+import * as i1$2 from '@angular/router';
+import * as i1$3 from '@angular/cdk/layout';
 import { Breakpoints } from '@angular/cdk/layout';
 
 class ActivityService {
@@ -99,8 +98,8 @@ IgoActivityModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[]] })
     }], null, null); })();
 
 const version = {
-    lib: '1.9.0',
-    releaseDate: 1632149524409
+    lib: '1.10.0',
+    releaseDate: 1639407270981
 };
 
 class ConfigService {
@@ -233,7 +232,7 @@ function provideDefaultLanguageLoader(loader) {
 class IgoMissingTranslationHandler {
     handle(params) {
         if (!params.translateService.langs.length) {
-            const error = 'Translations are not yet loaded. \
+            const error = 'Translations are not yet loaded. \
          Check that the LanguageService is injected.';
             throw new Error(error);
         }
@@ -281,45 +280,6 @@ IgoLanguageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoLanguageModule, { imports: [i1.TranslateModule], exports: [TranslateModule] }); })();
 
-const _c0 = function (a0) { return { closeIcon: a0 }; };
-class MessageCenterComponent {
-    constructor() {
-        this._options = {};
-    }
-    get options() {
-        return Object.assign({}, MessageCenterComponent.defaultOptions, this._options);
-    }
-    set options(value) {
-        this._options = value;
-    }
-}
-MessageCenterComponent.defaultOptions = {
-    timeOut: 5000,
-    hasCloseIcon: false,
-    showProgressBar: true,
-    pauseOnHover: true,
-    clickToClose: true,
-    maxLength: 100,
-    maxStack: 3,
-    preventDuplicates: true
-};
-MessageCenterComponent.ɵfac = function MessageCenterComponent_Factory(t) { return new (t || MessageCenterComponent)(); };
-MessageCenterComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: MessageCenterComponent, selectors: [["igo-message-center"]], inputs: { options: "options" }, decls: 1, vars: 4, consts: [[1, "mat-typography", 3, "ngClass", "options"]], template: function MessageCenterComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵelement(0, "simple-notifications", 0);
-    } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(2, _c0, ctx.options.hasCloseIcon))("options", ctx.options);
-    } }, directives: [i1$1.SimpleNotificationsComponent, i2.NgClass], styles: ["[_nghost-%COMP%]     div.simple-notification-wrapper{bottom:0;right:calc(50% - 150px)}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     div.simple-notification-wrapper{right:0;left:0;width:100%}}[_nghost-%COMP%]     .closeIcon   .sn-title:after{content:\"close\";font-family:\"Material Icons\";font-feature-settings:\"liga\" 1;font-size:24px;font-weight:normal;right:5px;top:5px;position:absolute}[_nghost-%COMP%]     .simple-notification .icon{top:0;left:0;width:45px;height:45px;height:100%;padding:7px}[_nghost-%COMP%]     .simple-notification .icon mat-icon{display:flex;align-items:center;height:100%;font-size:32px}[_nghost-%COMP%]     div.simple-notification{min-height:50px;margin-bottom:5px;padding-left:45px;padding-right:25px}[_nghost-%COMP%]     div.simple-notification.noIcon{padding-left:25px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     div.simple-notification{margin-bottom:0}}[_nghost-%COMP%]     div.simple-notification .sn-title{line-height:23px;font-size:15px;font-weight:bold}[_nghost-%COMP%]     div.simple-notification .sn-content{line-height:18px;font-size:15px}"] });
-(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MessageCenterComponent, [{
-        type: Component,
-        args: [{
-                selector: 'igo-message-center',
-                templateUrl: './message-center.component.html',
-                styleUrls: ['./message-center.component.scss']
-            }]
-    }], function () { return []; }, { options: [{
-            type: Input
-        }] }); })();
-
 class IgoMessageModule {
     static forRoot() {
         return {
@@ -330,16 +290,46 @@ class IgoMessageModule {
 }
 IgoMessageModule.ɵfac = function IgoMessageModule_Factory(t) { return new (t || IgoMessageModule)(); };
 IgoMessageModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: IgoMessageModule });
-IgoMessageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[CommonModule, SimpleNotificationsModule.forRoot()]] });
+IgoMessageModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[CommonModule,
+            ToastrModule.forRoot({
+                positionClass: 'toast-bottom-right',
+                timeOut: 10000,
+                extendedTimeOut: 10000,
+                messageClass: 'toast-message mat-typography',
+                closeButton: true,
+                progressBar: true,
+                enableHtml: true,
+                tapToDismiss: true,
+                maxOpened: 4,
+                preventDuplicates: true,
+                resetTimeoutOnDuplicate: true,
+                countDuplicates: true,
+                includeTitleDuplicates: true
+            })]] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(IgoMessageModule, [{
         type: NgModule,
         args: [{
-                imports: [CommonModule, SimpleNotificationsModule.forRoot()],
-                declarations: [MessageCenterComponent],
-                exports: [MessageCenterComponent]
+                imports: [CommonModule,
+                    ToastrModule.forRoot({
+                        positionClass: 'toast-bottom-right',
+                        timeOut: 10000,
+                        extendedTimeOut: 10000,
+                        messageClass: 'toast-message mat-typography',
+                        closeButton: true,
+                        progressBar: true,
+                        enableHtml: true,
+                        tapToDismiss: true,
+                        maxOpened: 4,
+                        preventDuplicates: true,
+                        resetTimeoutOnDuplicate: true,
+                        countDuplicates: true,
+                        includeTitleDuplicates: true
+                    })],
+                declarations: [],
+                exports: []
             }]
     }], null, null); })();
-(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoMessageModule, { declarations: [MessageCenterComponent], imports: [CommonModule, i1$1.SimpleNotificationsModule], exports: [MessageCenterComponent] }); })();
+(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoMessageModule, { imports: [CommonModule, i2.ToastrModule] }); })();
 
 class LanguageService {
     constructor(translate) {
@@ -369,15 +359,17 @@ LanguageService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: Language
 var MessageType;
 (function (MessageType) {
     MessageType["ERROR"] = "error";
-    MessageType["ALERT"] = "alert";
+    MessageType["ALERT"] = "warning";
+    MessageType["WARNING"] = "warning";
     MessageType["INFO"] = "info";
     MessageType["SUCCESS"] = "success";
 })(MessageType || (MessageType = {}));
 
 class MessageService {
-    constructor(notificationService, configService) {
-        this.notificationService = notificationService;
+    constructor(configService, toastr, languageService) {
         this.configService = configService;
+        this.toastr = toastr;
+        this.languageService = languageService;
         this.messages$ = new BehaviorSubject([]);
         this.options = this.configService.getConfig('message') || {};
     }
@@ -399,83 +391,60 @@ class MessageService {
         }
         if (currentDate > message.options.from && currentDate < message.options.to) {
             message = this.handleTemplate(message);
-            let notification;
             if (message.text) {
-                notification = this.notificationService.create(message.title, message.text, message.type, message.options);
-            }
-            else if (message.html) {
-                if (!message.icon) {
-                    message.options.theClass = message.options.theClass
-                        ? message.options.theClass + ' noIcon'
-                        : 'noIcon';
+                let messageShown;
+                switch (message.type) {
+                    case MessageType.SUCCESS:
+                        messageShown = this.success(message.text, message.title, message.options);
+                        break;
+                    case MessageType.ERROR:
+                        messageShown = this.error(message.text, message.title, message.options);
+                        break;
+                    case MessageType.INFO:
+                        messageShown = this.info(message.text, message.title, message.options);
+                        break;
+                    case MessageType.ALERT:
+                    case MessageType.WARNING:
+                        messageShown = this.alert(message.text, message.title, message.options);
+                        break;
+                    default:
+                        messageShown = this.info(message.text, message.title, message.options);
+                        break;
                 }
-                notification = this.notificationService.html(message.html, message.type, message.options);
+                message.options.id = messageShown.toastId;
             }
-            else {
-                return;
-            }
-            if (message.icon !== undefined) {
-                this.addIcon(notification, message.icon);
-            }
-            message.options.id = notification.id;
-            return notification;
         }
-        return;
-    }
-    success(text, title, options = {}) {
-        return this.message({
-            text,
-            title,
-            icon: options.icon || 'check',
-            options,
-            type: MessageType.SUCCESS
-        });
     }
-    error(text, title, options = {}) {
-        return this.message({
-            text,
-            title,
-            icon: options.icon || 'error_outline',
-            options,
-            type: MessageType.ERROR
-        });
+    success(text, title = 'igo.core.message.success', options = {}) {
+        const message = this.languageService.translate.instant(text);
+        const translatedTitle = this.languageService.translate.instant(title);
+        return this.toastr.success(message, translatedTitle, options);
     }
-    info(text, title, options = {}) {
-        return this.message({
-            text,
-            title,
-            icon: options.icon || 'info_outline',
-            options,
-            type: MessageType.INFO
-        });
+    error(text, title = 'igo.core.message.error', options = {}) {
+        const message = this.languageService.translate.instant(text);
+        const translatedTitle = this.languageService.translate.instant(title);
+        return this.toastr.error(message, translatedTitle, options);
     }
-    alert(text, title, options = {}) {
-        return this.message({
-            text,
-            title,
-            icon: options.icon || 'access_alarm',
-            options,
-            type: MessageType.ALERT
-        });
+    info(text, title = 'igo.core.message.info', options = {}) {
+        const message = this.languageService.translate.instant(text);
+        const translatedTitle = this.languageService.translate.instant(title);
+        return this.toastr.info(message, translatedTitle, options);
+    }
+    alert(text, title = 'igo.core.message.alert', options = {}) {
+        const message = this.languageService.translate.instant(text);
+        const translatedTitle = this.languageService.translate.instant(title);
+        return this.toastr.warning(message, translatedTitle, options);
     }
     remove(id) {
-        this.notificationService.remove(id);
+        this.toastr.remove(id);
     }
     removeAllAreNotError() {
         for (const mess of this.messages$.value) {
-            if (mess.type !== 'error') {
+            if (mess.type !== MessageType.ERROR) {
                 this.remove(mess.options.id);
             }
         }
     }
-    addIcon(notification, icon) {
-        // There is no way to add an icon to a notification when reating
-        // it so we simply set it on the notification directly.
-        // See https://github.com/flauc/angular2-notifications/issues/165
-        notification.icon = `
-      <mat-icon class="material-icons mat-icon mat-list-avatar" svgIcon="${icon}">
-      </mat-icon>`;
-    }
     handleTemplate(message) {
         if (!this.options.template || message.html) {
             return message;
@@ -483,22 +452,20 @@ class MessageService {
         let html = this.options.template;
         html = html.replace('${text}', message.text);
         html = html.replace('${title}', message.title);
-        html = html.replace('${icon}', message.icon);
-        message.html = html;
-        message.text = undefined;
+        message.html = undefined;
+        message.text = html;
         message.title = undefined;
-        message.icon = undefined;
         return message;
     }
 }
-MessageService.ɵfac = function MessageService_Factory(t) { return new (t || MessageService)(i0.ɵɵinject(i1$1.NotificationsService), i0.ɵɵinject(ConfigService)); };
+MessageService.ɵfac = function MessageService_Factory(t) { return new (t || MessageService)(i0.ɵɵinject(ConfigService), i0.ɵɵinject(i2.ToastrService), i0.ɵɵinject(LanguageService)); };
 MessageService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MessageService, factory: MessageService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MessageService, [{
         type: Injectable,
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i1$1.NotificationsService }, { type: ConfigService }]; }, null); })();
+    }], function () { return [{ type: ConfigService }, { type: i2.ToastrService }, { type: LanguageService }]; }, null); })();
 
 class ErrorInterceptor {
     constructor(messageService, injector) {
@@ -601,7 +568,7 @@ class IgoCoreModule {
         };
     }
 }
-IgoCoreModule.ɵfac = function IgoCoreModule_Factory(t) { return new (t || IgoCoreModule)(i0.ɵɵinject(i1$2.MatIconRegistry), i0.ɵɵinject(i2$1.DomSanitizer)); };
+IgoCoreModule.ɵfac = function IgoCoreModule_Factory(t) { return new (t || IgoCoreModule)(i0.ɵɵinject(i1$1.MatIconRegistry), i0.ɵɵinject(i2$1.DomSanitizer)); };
 IgoCoreModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: IgoCoreModule });
 IgoCoreModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
             CommonModule,
@@ -637,7 +604,7 @@ IgoCoreModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
                     IgoMessageModule
                 ]
             }]
-    }], function () { return [{ type: i1$2.MatIconRegistry }, { type: i2$1.DomSanitizer }]; }, null); })();
+    }], function () { return [{ type: i1$1.MatIconRegistry }, { type: i2$1.DomSanitizer }]; }, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoCoreModule, { imports: [CommonModule,
         HttpClientModule, IgoActivityModule, IgoConfigModule, IgoErrorModule, IgoLanguageModule, IgoMessageModule], exports: [IgoActivityModule,
         IgoConfigModule,
@@ -697,7 +664,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);
         }));
@@ -743,7 +710,8 @@ function provideRouteServiceOptions(options) {
     };
 }
 class RouteService {
-    constructor(route, options) {
+    constructor(router, route, options) {
+        this.router = router;
         this.route = route;
         const defaultOptions = {
             centerKey: 'center',
@@ -754,6 +722,7 @@ class RouteService {
             visibleOnLayersKey: 'visiblelayers',
             visibleOffLayersKey: 'invisiblelayers',
             directionsCoordKey: 'routing',
+            directionsOptionsKey: 'routingOptions',
             toolKey: 'tool',
             wmsUrlKey: 'wmsUrl',
             wmsLayersKey: 'wmsLayers',
@@ -770,17 +739,31 @@ class RouteService {
         this.options = Object.assign({}, defaultOptions, options);
     }
     get queryParams() {
+        let url = decodeURIComponent(location.search);
+        if (url.includes('¢er=')) {
+            url = url.replace('¢er', '&center');
+            const queryParams = url
+                .slice(1)
+                .split('&')
+                .map(p => p.split('='))
+                .reduce((obj, pair) => {
+                const [key, value] = pair.map(decodeURIComponent);
+                obj[key] = value;
+                return obj;
+            }, {});
+            this.router.navigate([], { queryParams });
+        }
         return this.route.queryParams;
     }
 }
-RouteService.ɵfac = function RouteService_Factory(t) { return new (t || RouteService)(i0.ɵɵinject(i1$3.ActivatedRoute), i0.ɵɵinject(ROUTE_SERVICE_OPTIONS, 8)); };
+RouteService.ɵfac = function RouteService_Factory(t) { return new (t || RouteService)(i0.ɵɵinject(i1$2.Router), i0.ɵɵinject(i1$2.ActivatedRoute), i0.ɵɵinject(ROUTE_SERVICE_OPTIONS, 8)); };
 RouteService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: RouteService, factory: RouteService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(RouteService, [{
         type: Injectable,
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i1$3.ActivatedRoute }, { type: undefined, decorators: [{
+    }], function () { return [{ type: i1$2.Router }, { type: i1$2.ActivatedRoute }, { type: undefined, decorators: [{
                 type: Inject,
                 args: [ROUTE_SERVICE_OPTIONS]
             }, {
@@ -931,14 +914,14 @@ class MediaService {
         return media === 'desktop';
     }
 }
-MediaService.ɵfac = function MediaService_Factory(t) { return new (t || MediaService)(i0.ɵɵinject(i1$4.BreakpointObserver)); };
+MediaService.ɵfac = function MediaService_Factory(t) { return new (t || MediaService)(i0.ɵɵinject(i1$3.BreakpointObserver)); };
 MediaService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MediaService, factory: MediaService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MediaService, [{
         type: Injectable,
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i1$4.BreakpointObserver }]; }, null); })();
+    }], function () { return [{ type: i1$3.BreakpointObserver }]; }, null); })();
 
 var StorageScope;
 (function (StorageScope) {
@@ -1088,5 +1071,5 @@ NetworkService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: NetworkSe
  * Generated bundle index. Do not edit.
  */
 
-export { ActivityInterceptor, ActivityService, AnalyticsService, CONFIG_OPTIONS, ConfigService, ErrorInterceptor, IgoActivityModule, IgoConfigModule, IgoCoreModule, IgoErrorModule, IgoGestureConfig, IgoGestureModule, IgoLanguageModule, IgoLoggingModule, IgoMessageModule, IgoMissingTranslationHandler, LanguageLoader, LanguageService, LoggingInterceptor, Media, MediaOrientation, MediaService, MessageCenterComponent, MessageService, MessageType, NetworkService, ROUTE_SERVICE_OPTIONS, RouteService, StorageScope, StorageService, StorageServiceEventEnum, configFactory, defaultLanguageLoader, provideConfigLoader, provideConfigOptions, provideDefaultLanguageLoader, provideLanguageLoader, provideRouteServiceOptions, version };
+export { ActivityInterceptor, ActivityService, AnalyticsService, CONFIG_OPTIONS, 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 };
 //# sourceMappingURL=igo2-core.js.map