@loxia/mst-viewer 8.1.3-202511132206 → 8.1.3-202511140957

package/fesm2022/loxia-mst-viewer.mjs

@@ -1,7 +1,7 @@
 import * as i2 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { EventEmitter, Output, Input, Component, Injectable, ChangeDetectionStrategy, ViewChild, HostListener, NgModule } from '@angular/core';
+import { EventEmitter, Output, Input, Component, Injectable, ChangeDetectionStrategy, ViewChild, InjectionToken, Optional, Inject, SkipSelf, NgModule, HostListener } from '@angular/core';
 import * as i7 from '@loxia/imx-viewer';
 import { SelectieInfo, PopoverInfo, Point, SvgInfo, ImxViewerComponent, ImxViewerModule } from '@loxia/imx-viewer';
 import * as i4 from '@loxia/rijwegen';
@@ -11,13 +11,13 @@ import { createEffect, ofType, EffectsModule } from '@ngrx/effects';
 import * as i2$1 from '@ngrx/store';
 import { createAction, union, select, createReducer, on, StoreModule } from '@ngrx/store';
 import { ResourceModule } from '@ngx-resource/handler-ngx-http';
-import { BehaviorSubject, Subscription, from, combineLatest, of, throwError } from 'rxjs';
+import { BehaviorSubject, from, Subscription, combineLatest, of, throwError } from 'rxjs';
+import { take, filter, map, catchError, withLatestFrom, switchMap, tap } from 'rxjs/operators';
+import * as i1 from '@angular/common/http';
+import { HttpHeaders, HttpContext, HttpParams } from '@angular/common/http';
 import { __decorate } from 'tslib';
-import * as i1 from '@ngx-resource/core';
+import * as i1$1 from '@ngx-resource/core';
 import { Resource, ResourceAction, ResourceRequestMethod, ResourceParams, ResourceModel } from '@ngx-resource/core';
-import { take, filter, map, catchError, withLatestFrom, switchMap, tap } from 'rxjs/operators';
-import * as i1$1 from '@angular/common/http';
-import { HttpHeaders } from '@angular/common/http';
 
 class Message {
     constructor(severity, text, timeout = 0) {
@@ -41,7 +41,7 @@ class MessageComponent {
         this.onClearMessage = new EventEmitter();
     }
     ngOnInit() {
-        if (this.message.timeout > 0) {
+        if (this.message && this.message.timeout > 0) {
             setTimeout(() => {
                 this.closeMessage({ stopPropagation: () => null });
             }, this.message.timeout);
@@ -53,7 +53,7 @@ class MessageComponent {
         this.message = undefined;
     }
     get severity() {
-        return this.message.severity;
+        return this.message?.severity ?? '?';
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MessageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: MessageComponent, selector: "loxia-message", inputs: { message: "message" }, outputs: { onClearMessage: "onClearMessage" }, ngImport: i0, template: "<div id=\"alert-1\" *ngIf=\"message\"\n     [ngClass]=\"severity\"\n     class=\" loxia-message flex items-center p-4 text-white\" role=\"alert\">\n        <svg class=\"flex-shrink-0 size-4 mt-0.5\" xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\">\n        <path d=\"m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z\"></path>\n        <path d=\"M12 9v4\"></path>\n        <path d=\"M12 17h.01\"></path>\n    </svg>\n    <span class=\"sr-only\">Info</span>\n    <div class=\"ms-3 text-sm font-medium\">\n        {{message.text}}\n    </div>\n    <button type=\"button\"\n            (click)=\"closeMessage($event)\"\n            class=\"ms-auto -mx-1.5 -my-1.5 rounded-lg inline-flex items-center justify-center h-8 w-8\" data-dismiss-target=\"#alert-1\" aria-label=\"Close\">\n        <span class=\"sr-only\">Close</span>\n        <svg class=\"w-3 h-3\" aria-hidden=\"true\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 14 14\">\n            <path stroke=\"currentColor\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6\"/>\n        </svg>\n    </button>\n</div>\n", styles: ["svg{background-color:transparent;stroke-width:unset}.loxia-message.information{background-color:#0288d1}.loxia-message.warning{background-color:#ff6a00}.loxia-message.notification{background-color:#f3ed38}.loxia-message.error{background-color:#b5061b}.loxia-message.success{background-color:#297d03}\n"], dependencies: [{ kind: "directive", type: i2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
@@ -299,191 +299,6 @@ const ritdeelActions = union({
     ritdeelInvoegen
 });
 
-let MstLoggingResource = class MstLoggingResource extends Resource {
-    constructor(restHandler, store) {
-        super(restHandler);
-        this.store = store;
-        this.subscriptions = new Subscription();
-        this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => this.$setUrl(baseUrl)));
-    }
-    ngOnDestroy() {
-        this.subscriptions.unsubscribe();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, deps: [{ token: i1.ResourceHandler }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource }); }
-};
-__decorate([
-    ResourceAction({
-        path: '/',
-        method: ResourceRequestMethod.Post
-    })
-], MstLoggingResource.prototype, "logErrorMessages", void 0);
-MstLoggingResource = __decorate([
-    ResourceParams({
-        pathPrefix: '/mst/services/rest/logging'
-    })
-], MstLoggingResource);
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: i1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { logErrorMessages: [] } });
-class MstLoggingDto extends ResourceModel {
-    constructor(data) {
-        super();
-        this.$resource = MstLoggingResource;
-        this.$setData(data);
-    }
-    toJSON() {
-        return {
-            iaVersie: this.iaVersie,
-            meldingLevel: this.meldingLevel,
-            meldingMessage: this.meldingMessage,
-            algemeneRitInfoDto: this.algemeneRitInfoDto,
-            actieDto: this.actieDto,
-            sbinfoDtos: this.sbinfoDtos
-        };
-    }
-    toString() {
-        return `${this.iaVersie},${this.meldingLevel},${this.meldingMessage},${this.algemeneRitInfoDto},
-                ${this.actieDto},${this.sbinfoDtos}`;
-    }
-    $setData(data) {
-        if (data) {
-            this.iaVersie = data.iaVersie;
-            this.meldingLevel = data.meldingLevel;
-            this.meldingMessage = data.meldingMessage;
-            this.algemeneRitInfoDto = data.algemeneRitInfoDto;
-            this.actieDto = data.actieDto;
-            this.sbinfoDtos = data.sbinfoDtos;
-        }
-        return this;
-    }
-}
-class ActieDto {
-    constructor(data) {
-        this.$setData(data);
-    }
-    toJSON() {
-        return {
-            pplgNaam: this.pplgNaam,
-            ritActieTypeOmschrijving: this.ritActieTypeOmschrijving,
-            ritActieStatus: this.ritActieStatus,
-            bewegingId: this.bewegingId,
-            wisselType: this.wisselType,
-            wisselNaam: this.wisselNaam,
-            wisselKantCode: this.wisselKantCode,
-            vanKilometerlint: this.vanKilometerlint,
-            vanKilometrering: this.vanKilometrering,
-            totKilometerlint: this.totKilometerlint,
-            totKilometrering: this.totKilometrering
-        };
-    }
-    toString() {
-        return `${this.pplgNaam},${this.ritActieTypeOmschrijving},${this.ritActieStatus},
-        ${this.bewegingId},${this.wisselType},${this.wisselNaam},${this.wisselKantCode},
-        ${this.vanKilometerlint},${this.vanKilometrering},${this.totKilometerlint},${this.totKilometrering}`;
-    }
-    $setData(data) {
-        if (data) {
-            this.pplgNaam = data.pplgNaam;
-            this.ritActieTypeOmschrijving = data.ritActieTypeOmschrijving;
-            this.ritActieStatus = data.ritActieStatus;
-            this.bewegingId = data.bewegingId;
-            this.wisselType = data.wisselType;
-            this.wisselNaam = data.wisselNaam;
-            this.wisselKantCode = data.wisselKantCode;
-            this.vanKilometerlint = data.vanKilometerlint;
-            this.vanKilometrering = data.vanKilometrering;
-            this.totKilometerlint = data.totKilometerlint;
-            this.totKilometrering = data.totKilometrering;
-        }
-        return this;
-    }
-}
-class AlgemeneRitInfoDto {
-    constructor(data) {
-        this.$setData(data);
-    }
-    toJSON() {
-        return {
-            id: this.id,
-            jaarplanId: this.jaarplanId,
-            volgnummer: this.volgnummer,
-            machineTypeId: this.machineTypeId,
-            machineTypeOmschrijving: this.machineTypeOmschrijving,
-            ritDatum: this.ritDatum,
-            startDatum: this.startDatum,
-            eindDatum: this.eindDatum,
-            ritNaam: this.ritNaam,
-            startLocatie: this.startLocatie,
-            eindLocatie: this.eindLocatie,
-            ritStatus: this.ritStatus,
-            modified: this.modified,
-            modifiedBy: this.modifiedBy,
-            planJobId: this.planJobId
-        };
-    }
-    toString() {
-        return `${this.id},${this.jaarplanId},${this.volgnummer},${this.machineTypeId},${this.machineTypeOmschrijving}
-                ,${this.ritDatum},${this.startDatum},${this.eindDatum},${this.ritNaam},${this.startLocatie}
-                ,${this.eindLocatie},${this.ritStatus},${this.modified},${this.modifiedBy},${this.planJobId}`;
-    }
-    $setData(data) {
-        if (data) {
-            this.id = data.id;
-            this.jaarplanId = data.jaarplanId;
-            this.volgnummer = data.volgnummer;
-            this.machineTypeId = data.machineTypeId;
-            this.machineTypeOmschrijving = data.machineTypeOmschrijving;
-            this.ritDatum = data.ritDatum;
-            this.startDatum = data.startDatum;
-            this.eindDatum = data.eindDatum;
-            this.ritNaam = data.ritNaam;
-            this.startLocatie = data.startLocatie;
-            this.eindLocatie = data.eindLocatie;
-            this.ritStatus = data.ritStatus;
-            this.modified = data.modified;
-            this.modifiedBy = data.modifiedBy;
-            this.planJobId = data.planJobId;
-        }
-        return this;
-    }
-}
-
-class Utils {
-    static flatMap(xs, f) {
-        return xs.reduce((acc, x) => acc.concat(f(x)), []);
-    }
-    static getValidErorrMessage(err) {
-        let errorMsg = '';
-        if (err.msg) {
-            errorMsg += err.msg;
-        }
-        if (Array.isArray(err.body)) {
-            err.body.forEach(x => errorMsg += x);
-        }
-        else if (err.body) {
-            if (err.body instanceof ProgressEvent) {
-                errorMsg = 'Kon geen verbinding maken met de server';
-            }
-            else if (err.body.text) {
-                errorMsg += err.body.text;
-            }
-            else {
-                errorMsg += err.body;
-            }
-        }
-        if (err.message) {
-            errorMsg += err.message;
-        }
-        if (typeof err === 'string' || err instanceof String) {
-            errorMsg += err;
-        }
-        if (errorMsg !== '') {
-            return errorMsg;
-        }
-    }
-}
-
 /**
  * https://gist.github.com/jordanluyke/609a4fffb69d1ebafdadd313ee2ee804
  *
@@ -547,7 +362,7 @@ class ArrayMultimap {
         return Array.from(new Set(this._entries.map(entry => entry.key)));
     }
     values() {
-        return Utils.flatMap(this._entries, x => x.value);
+        return this._entries.reduce((acc, x) => acc.concat(x.value), []);
     }
     put(key, value) {
         this._entries.push(new MultimapEntry(key, value));
@@ -653,6 +468,7 @@ class EditorService {
         this.signaleringsBeeldManagerService = signaleringsBeeldManagerService;
         this.initReadyPromise();
     }
+    // Called from GWT only, can be removed when GWT is gone
     setEditor(editor) {
         this.editor = editor;
         this.resolveReadyPromise();
@@ -660,6 +476,7 @@ class EditorService {
     isReady() {
         return this.promise;
     }
+    // Called from GWT only, can be removed when GWT is gone
     setSignaleringsBeeldManager(signaleringsBeeldManager) {
         this.signaleringsBeeldManagerService.set(signaleringsBeeldManager);
     }
@@ -889,7 +706,7 @@ class ViewerControlService {
     }
     setOrigineelTreinPad(treinpad) {
         const rit = JSON.parse(JSON.stringify(treinpad));
-        this.store.dispatch(SetAlgemeneRitInfo(new AlgemeneRitInfoDto({
+        this.store.dispatch(SetAlgemeneRitInfo({
             id: rit.id,
             jaarplanId: rit.jaarplanId,
             volgnummer: rit.volgnummer,
@@ -905,7 +722,7 @@ class ViewerControlService {
             modified: rit.modified,
             modifiedBy: rit.modifiedBy,
             planJobId: rit.planJobId
-        })));
+        }));
         this.origineelTreinPad = rit;
     }
     isValideRit$() {
@@ -992,184 +809,1565 @@ class PrintBewegingService {
         if (!printing) {
             return Promise.reject(new Error('Geen beweging gevonden voor ' + bewegingId));
         }
-        return new Promise((resolve) => {
-            const ritdeel = gevondenRitdeel[0];
-            if (ritdeel.isNietBeschikbaar()) {
-                this.store.dispatch(navigeerVanaf(paginationSize, iaVersieInfo, ritdeel));
-                this.store.dispatch(ShowProgress());
-                setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);
+        return new Promise((resolve) => {
+            const ritdeel = gevondenRitdeel[0];
+            if (ritdeel.isNietBeschikbaar()) {
+                this.store.dispatch(navigeerVanaf(paginationSize, iaVersieInfo, ritdeel));
+                this.store.dispatch(ShowProgress());
+                setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);
+            }
+            else {
+                this.focusOpBeweging(ritdeel, resolve);
+            }
+        });
+    }
+    focusOpBeweging(ritdeel, resolve) {
+        // deselecteer alles
+        this.store.dispatch(setZichtbaarheidAlleRitdelen(false));
+        // enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)
+        this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));
+        setTimeout(() => {
+            // dit neemt niet de vrijebaan elementen mee
+            const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());
+            const dwangPuics = this.getPuics(topoElementen);
+            this.store.dispatch(focusOpIds(dwangPuics));
+            setTimeout(() => {
+                // resolve de promise, om aan te geven dat focus klaar is
+                resolve(true);
+                this.viewerControlService.setPrinting(false);
+                this.store.dispatch(ClearProgress());
+            }, 1000);
+        });
+    }
+    getPuics(topoElementen) {
+        return topoElementen.map(e => e.getPuic());
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, deps: [{ token: i2$1.Store }, { token: ViewerControlService }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i2$1.Store }, { type: ViewerControlService }, { type: SignaleringsBeeldManagerService }] });
+
+class RpeComponent {
+    convertToScript() {
+        const element = this.script.nativeElement;
+        const script = document.createElement('script');
+        script.type = 'text/javascript';
+        if (this.baseurl && this.path) {
+            script.src = this.baseurl + this.path;
+            // eslint-disable-next-line no-console
+            console.log('Code geladen van: ' + script.src); //useful for debugging in GWT environment
+        }
+        const parent = element.parentElement;
+        parent.parentElement.replaceChild(script, parent);
+    }
+    ngAfterViewInit() {
+        this.convertToScript();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: RpeComponent, selector: "rpe-component", inputs: { baseurl: "baseurl", path: "path" }, viewQueries: [{ propertyName: "script", first: true, predicate: ["rpescript"], descendants: true }], ngImport: i0, template: "<div #rpescript style.display=\"none\">\n    <ng-content></ng-content>\n</div>\n" }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'rpe-component', template: "<div #rpescript style.display=\"none\">\n    <ng-content></ng-content>\n</div>\n" }]
+        }], propDecorators: { baseurl: [{
+                type: Input
+            }], path: [{
+                type: Input
+            }], script: [{
+                type: ViewChild,
+                args: ['rpescript']
+            }] } });
+
+class OngeplandeActie {
+    constructor(actie, puics) {
+        this.actie = actie;
+        this.puics = puics;
+    }
+}
+
+class KmRange {
+    constructor(topologyElement, vanKilometreringen, totKilometreringen) {
+        this.topologyElement = topologyElement;
+        this.vanKilometreringen = vanKilometreringen;
+        this.totKilometreringen = totKilometreringen;
+    }
+    static rangeVoorPuntObject(topologyElement) {
+        return new KmRange(topologyElement, JsJavaUtil.listToArray(topologyElement.getKilometreringen()), JsJavaUtil.listToArray(topologyElement.getKilometreringen()));
+    }
+    static rangeVoorStrekObject(topologyElement, vanKilometreringen, totKilometreringen) {
+        return new KmRange(topologyElement, vanKilometreringen, totKilometreringen);
+    }
+    static getKilometrering(lintNaam, kilometreringen) {
+        const result = kilometreringen.filter(kilometrering => kilometrering.getKmLint() === lintNaam);
+        if (result.length >= 1) {
+            return result[0];
+        }
+        return null;
+    }
+    heeftOverlap(kilometrering1, kilometrering2) {
+        const vanKilometrering = KmRange.getKilometrering(kilometrering1.getKmLint(), this.vanKilometreringen);
+        const totKilometrering = KmRange.getKilometrering(kilometrering2.getKmLint(), this.totKilometreringen);
+        if (!vanKilometrering || !totKilometrering) {
+            return false;
+        }
+        let startKmWaarde = vanKilometrering.getKmWaarde();
+        let endKmWaarde = totKilometrering.getKmWaarde();
+        if (startKmWaarde > endKmWaarde) {
+            const temp = { end: endKmWaarde, start: startKmWaarde };
+            startKmWaarde = temp.end;
+            endKmWaarde = temp.start;
+        }
+        const actieStartKmWaarde = kilometrering1.getKmWaarde();
+        const actieEndKmWaarde = kilometrering2.getKmWaarde();
+        return endKmWaarde >= actieStartKmWaarde && actieEndKmWaarde >= startKmWaarde;
+    }
+}
+
+class WisselKantCode {
+    constructor(naam, kantCode) {
+        this.naam = naam;
+        this.kantCode = kantCode;
+    }
+}
+
+class MeldingEvent {
+    constructor(meldingMessage, meldingLevel) {
+        this.meldingMessage = meldingMessage;
+        this.meldingLevel = meldingLevel;
+    }
+}
+
+const MELDING_LEVEL_ERROR = 'error';
+const MELDING_LEVEL_WARNING = 'warn';
+const MELDING_LEVEL_INFO = 'info';
+class MeldingBuilder {
+    static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
+        return new MeldingEvent('Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken, MELDING_LEVEL_INFO);
+    }
+    static actieHighlightError(actieZonderElementen) {
+        return new MeldingEvent('Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen, MELDING_LEVEL_ERROR);
+    }
+}
+
+class Utils {
+    static getValidErorrMessage(err) {
+        let errorMsg = '';
+        if (err.msg) {
+            errorMsg += err.msg;
+        }
+        if (Array.isArray(err.body)) {
+            err.body.forEach((x) => errorMsg += x);
+        }
+        else if (err.body) {
+            if (err.body instanceof ProgressEvent) {
+                errorMsg = 'Kon geen verbinding maken met de server';
+            }
+            else if (err.body.text) {
+                errorMsg += err.body.text;
+            }
+            else {
+                errorMsg += err.body;
+            }
+        }
+        if (err.message) {
+            errorMsg += err.message;
+        }
+        if (typeof err === 'string' || err instanceof String) {
+            errorMsg += err;
+        }
+        if (errorMsg !== '') {
+            return errorMsg;
+        }
+    }
+}
+
+class MessageBuilder {
+    static rwpDataNietGevonden(err) {
+        return new Message(Severity.ERROR, 'Error bij ophalen van rijwegplan data: ' + err);
+    }
+    static rijwegNietGevonden(beweging) {
+        return new Message(Severity.ERROR, `Rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
+    }
+    static rijwegplanNietGevonden(beweging) {
+        return new Message(Severity.ERROR, `Rijwegplan van PPLG ${beweging.vanPplg} niet gevonden`);
+    }
+    static dwangNietGevonden(beweging) {
+        return new Message(Severity.ERROR, `Dwang ${beweging.dwangNummer} voor rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
+    }
+    static nietGevondenSBI(err) {
+        return new Message(Severity.ERROR, 'Error bij het ophalen van signaleringsbeeldinfo: ' + Utils.getValidErorrMessage(err));
+    }
+    static actieHighlightError(actieZonderElementen) {
+        return new Message(Severity.ERROR, 'Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen);
+    }
+    static ritFileAlGewijzigdError(beweging) {
+        return new Message(Severity.ERROR, 'Rit bevat een beweging met status \'Gewijzigd\': Beweging met ID:' + beweging.id);
+    }
+    static meerDan12BladenGevonden(bladAmount) {
+        return new Message(Severity.WARNING, 'Warning, Rit bevat ' + bladAmount + ' bladen. Er worden maximaal 12 bladen ondersteund.');
+    }
+    static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
+        return new Message(Severity.INFORMATION, 'Info, Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken);
+    }
+}
+
+/**
+ * Custom HttpParameterCodec
+ * Workaround for https://github.com/angular/angular/issues/18261
+ */
+class CustomHttpParameterCodec {
+    encodeKey(k) {
+        return encodeURIComponent(k);
+    }
+    encodeValue(v) {
+        return encodeURIComponent(v);
+    }
+    decodeKey(k) {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v) {
+        return decodeURIComponent(v);
+    }
+}
+
+const BASE_PATH = new InjectionToken('basePath');
+const COLLECTION_FORMATS = {
+    'csv': ',',
+    'tsv': '   ',
+    'ssv': ' ',
+    'pipes': '|'
+};
+
+class Configuration {
+    constructor(configurationParameters = {}) {
+        this.apiKeys = configurationParameters.apiKeys;
+        this.username = configurationParameters.username;
+        this.password = configurationParameters.password;
+        this.accessToken = configurationParameters.accessToken;
+        this.basePath = configurationParameters.basePath;
+        this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
+        if (configurationParameters.encodeParam) {
+            this.encodeParam = configurationParameters.encodeParam;
+        }
+        else {
+            this.encodeParam = param => this.defaultEncodeParam(param);
+        }
+        if (configurationParameters.credentials) {
+            this.credentials = configurationParameters.credentials;
+        }
+        else {
+            this.credentials = {};
+        }
+        // init default keycloak_auth credential
+        if (!this.credentials['keycloak_auth']) {
+            this.credentials['keycloak_auth'] = () => {
+                return typeof this.accessToken === 'function'
+                    ? this.accessToken()
+                    : this.accessToken;
+            };
+        }
+    }
+    /**
+     * Select the correct content-type to use for a request.
+     * Uses {@link Configuration#isJsonMime} to determine the correct content-type.
+     * If no content type is found return the first found type if the contentTypes is not empty
+     * @param contentTypes - the array of content types that are available for selection
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
+     */
+    selectHeaderContentType(contentTypes) {
+        if (contentTypes.length === 0) {
+            return undefined;
+        }
+        const type = contentTypes.find((x) => this.isJsonMime(x));
+        if (type === undefined) {
+            return contentTypes[0];
+        }
+        return type;
+    }
+    /**
+     * Select the correct accept content-type to use for a request.
+     * Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
+     * If no content type is found return the first found type if the contentTypes is not empty
+     * @param accepts - the array of content types that are available for selection.
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
+     */
+    selectHeaderAccept(accepts) {
+        if (accepts.length === 0) {
+            return undefined;
+        }
+        const type = accepts.find((x) => this.isJsonMime(x));
+        if (type === undefined) {
+            return accepts[0];
+        }
+        return type;
+    }
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    isJsonMime(mime) {
+        const jsonMime = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
+        return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
+    }
+    lookupCredential(key) {
+        const value = this.credentials[key];
+        return typeof value === 'function'
+            ? value()
+            : value;
+    }
+    defaultEncodeParam(param) {
+        // This implementation exists as fallback for missing configuration
+        // and for backwards compatibility to older typescript-angular generator versions.
+        // It only works for the 'simple' parameter style.
+        // Date-handling only works for the 'date-time' format.
+        // All other styles and Date-formats are probably handled incorrectly.
+        //
+        // But: if that's all you need (i.e.: the most common use-case): no need for customization!
+        const value = param.dataFormat === 'date-time' && param.value instanceof Date
+            ? param.value.toISOString()
+            : param.value;
+        return encodeURIComponent(String(value));
+    }
+}
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class AppConfigControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    getAppConfig(observe = 'body', reportProgress = false, options) {
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                '*/*'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/appconfig`;
+        return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AppConfigControllerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class BewegingControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    verrijkBewegingenMetOngeplandeActies(iaVersie, ritRequestDto, observe = 'body', reportProgress = false, options) {
+        if (iaVersie === null || iaVersie === undefined) {
+            throw new Error('Required parameter iaVersie was null or undefined when calling verrijkBewegingenMetOngeplandeActies.');
+        }
+        if (ritRequestDto === null || ritRequestDto === undefined) {
+            throw new Error('Required parameter ritRequestDto was null or undefined when calling verrijkBewegingenMetOngeplandeActies.');
+        }
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                '*/*'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        // to determine the Content-Type header
+        const consumes = [
+            'application/json'
+        ];
+        const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/beweging/${this.configuration.encodeParam({ name: "iaVersie", value: iaVersie, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}`;
+        return this.httpClient.request('put', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            body: ritRequestDto,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BewegingControllerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class Class0BuildPropertiesService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    getBuildProperties(observe = 'body', reportProgress = false, options) {
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/build.properties`;
+        return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: Class0BuildPropertiesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class ConnectorControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    getOtherConnector(iaVersie, connectorPuic, observe = 'body', reportProgress = false, options) {
+        if (iaVersie === null || iaVersie === undefined) {
+            throw new Error('Required parameter iaVersie was null or undefined when calling getOtherConnector.');
+        }
+        if (connectorPuic === null || connectorPuic === undefined) {
+            throw new Error('Required parameter connectorPuic was null or undefined when calling getOtherConnector.');
+        }
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                '*/*'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/connector/${this.configuration.encodeParam({ name: "iaVersie", value: iaVersie, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}/${this.configuration.encodeParam({ name: "connectorPuic", value: connectorPuic, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}`;
+        return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ConnectorControllerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class LogControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    log(logDto, observe = 'body', reportProgress = false, options) {
+        if (logDto === null || logDto === undefined) {
+            throw new Error('Required parameter logDto was null or undefined when calling log.');
+        }
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        // to determine the Content-Type header
+        const consumes = [
+            'application/json'
+        ];
+        const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/logging/`;
+        return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            body: logDto,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LogControllerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class P21ControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    canConsumeForm(consumes) {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
+        }
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    createP21Levering(p21Levering, update, observe = 'body', reportProgress = false, options) {
+        if (p21Levering === null || p21Levering === undefined) {
+            throw new Error('Required parameter p21Levering was null or undefined when calling createP21Levering.');
+        }
+        let localVarHeaders = this.defaultHeaders;
+        let localVarCredential;
+        // authentication (keycloak_auth) required
+        localVarCredential = this.configuration.lookupCredential('keycloak_auth');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                '*/*'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        // to determine the Content-Type header
+        const consumes = [
+            'multipart/form-data'
+        ];
+        const canConsumeForm = this.canConsumeForm(consumes);
+        let localVarFormParams;
+        let localVarUseForm = false;
+        let localVarConvertFormParamsToString = false;
+        // use FormData to transmit files using content-type "multipart/form-data"
+        // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data
+        localVarUseForm = canConsumeForm;
+        if (localVarUseForm) {
+            localVarFormParams = new FormData();
+        }
+        else {
+            localVarFormParams = new HttpParams({ encoder: this.encoder });
+        }
+        if (update !== undefined) {
+            localVarFormParams = localVarFormParams.append('update', update) || localVarFormParams;
+        }
+        if (p21Levering !== undefined) {
+            localVarFormParams = localVarFormParams.append('p21Levering', p21Levering) || localVarFormParams;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
             }
             else {
-                this.focusOpBeweging(ritdeel, resolve);
+                responseType_ = 'blob';
             }
+        }
+        let localVarPath = `/services/secure/rest/backend/uploadversie`;
+        return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            body: localVarConvertFormParamsToString ? localVarFormParams.toString() : localVarFormParams,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
         });
     }
-    focusOpBeweging(ritdeel, resolve) {
-        // deselecteer alles
-        this.store.dispatch(setZichtbaarheidAlleRitdelen(false));
-        // enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)
-        this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));
-        setTimeout(() => {
-            // dit neemt niet de vrijebaan elementen mee
-            const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());
-            const dwangPuics = this.getPuics(topoElementen);
-            this.store.dispatch(focusOpIds(dwangPuics));
-            setTimeout(() => {
-                // resolve de promise, om aan te geven dat focus klaar is
-                resolve(true);
-                this.viewerControlService.setPrinting(false);
-                this.store.dispatch(ClearProgress());
-            }, 1000);
+    getVersies(observe = 'body', reportProgress = false, options) {
+        let localVarHeaders = this.defaultHeaders;
+        let localVarCredential;
+        // authentication (keycloak_auth) required
+        localVarCredential = this.configuration.lookupCredential('keycloak_auth');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/services/secure/rest/backend/versies`;
+        return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
         });
     }
-    getPuics(topoElementen) {
-        return topoElementen.map(e => e.getPuic());
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, deps: [{ token: i2$1.Store }, { token: ViewerControlService }, { token: SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: P21ControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: P21ControllerService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: PrintBewegingService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: P21ControllerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i2$1.Store }, { type: ViewerControlService }, { type: SignaleringsBeeldManagerService }] });
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
 
-class RpeComponent {
-    convertToScript() {
-        const element = this.script.nativeElement;
-        const script = document.createElement('script');
-        script.type = 'text/javascript';
-        if (this.baseurl && this.path) {
-            script.src = this.baseurl + this.path;
-            // eslint-disable-next-line no-console
-            console.log('Code geladen van: ' + script.src); //useful for debugging in GWT environment
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+class SbControllerService {
+    constructor(httpClient, basePath, configuration) {
+        this.httpClient = httpClient;
+        this.basePath = 'http://localhost:8080/mst';
+        this.defaultHeaders = new HttpHeaders();
+        this.configuration = new Configuration();
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
         }
-        const parent = element.parentElement;
-        parent.parentElement.replaceChild(script, parent);
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
-    ngAfterViewInit() {
-        this.convertToScript();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.7", type: RpeComponent, selector: "rpe-component", inputs: { baseurl: "baseurl", path: "path" }, viewQueries: [{ propertyName: "script", first: true, predicate: ["rpescript"], descendants: true }], ngImport: i0, template: "<div #rpescript style.display=\"none\">\n    <ng-content></ng-content>\n</div>\n" }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RpeComponent, decorators: [{
-            type: Component,
-            args: [{ selector: 'rpe-component', template: "<div #rpescript style.display=\"none\">\n    <ng-content></ng-content>\n</div>\n" }]
-        }], propDecorators: { baseurl: [{
-                type: Input
-            }], path: [{
-                type: Input
-            }], script: [{
-                type: ViewChild,
-                args: ['rpescript']
-            }] } });
-
-class OngeplandeActie {
-    constructor(actie, puics) {
-        this.actie = actie;
-        this.puics = puics;
-    }
-}
-
-class KmRange {
-    constructor(topologyElement, vanKilometreringen, totKilometreringen) {
-        this.topologyElement = topologyElement;
-        this.vanKilometreringen = vanKilometreringen;
-        this.totKilometreringen = totKilometreringen;
-    }
-    static rangeVoorPuntObject(topologyElement) {
-        return new KmRange(topologyElement, JsJavaUtil.listToArray(topologyElement.getKilometreringen()), JsJavaUtil.listToArray(topologyElement.getKilometreringen()));
-    }
-    static rangeVoorStrekObject(topologyElement, vanKilometreringen, totKilometreringen) {
-        return new KmRange(topologyElement, vanKilometreringen, totKilometreringen);
+    // @ts-ignore
+    addToHttpParams(httpParams, value, key) {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        }
+        else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
     }
-    static getKilometrering(lintNaam, kilometreringen) {
-        const result = kilometreringen.filter(kilometrering => kilometrering.getKmLint() === lintNaam);
-        if (result.length >= 1) {
-            return result[0];
+    addToHttpParamsRecursive(httpParams, value, key) {
+        if (value == null) {
+            return httpParams;
         }
-        return null;
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            }
+            else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, value.toISOString().substring(0, 10));
+                }
+                else {
+                    throw Error("key may not be null if value is Date");
+                }
+            }
+            else {
+                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        }
+        else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        }
+        else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+    getSignaleringsbeelden(signaleringsbeeldRequestDto, observe = 'body', reportProgress = false, options) {
+        if (signaleringsbeeldRequestDto === null || signaleringsbeeldRequestDto === undefined) {
+            throw new Error('Required parameter signaleringsbeeldRequestDto was null or undefined when calling getSignaleringsbeelden.');
+        }
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [
+                '*/*'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        // to determine the Content-Type header
+        const consumes = [
+            'application/json'
+        ];
+        const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/signaleringsbeeldeninfo`;
+        return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            body: signaleringsbeeldRequestDto,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
     }
-    heeftOverlap(kilometrering1, kilometrering2) {
-        const vanKilometrering = KmRange.getKilometrering(kilometrering1.getKmLint(), this.vanKilometreringen);
-        const totKilometrering = KmRange.getKilometrering(kilometrering2.getKmLint(), this.totKilometreringen);
-        if (!vanKilometrering || !totKilometrering) {
-            return false;
+    valideerIaVersie(versie, observe = 'body', reportProgress = false, options) {
+        if (versie === null || versie === undefined) {
+            throw new Error('Required parameter versie was null or undefined when calling valideerIaVersie.');
         }
-        let startKmWaarde = vanKilometrering.getKmWaarde();
-        let endKmWaarde = totKilometrering.getKmWaarde();
-        if (startKmWaarde > endKmWaarde) {
-            const temp = { end: endKmWaarde, start: startKmWaarde };
-            startKmWaarde = temp.end;
-            endKmWaarde = temp.start;
+        let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
+        if (versie !== undefined && versie !== null) {
+            localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, versie, 'versie');
         }
-        const actieStartKmWaarde = kilometrering1.getKmWaarde();
-        const actieEndKmWaarde = kilometrering2.getKmWaarde();
-        return endKmWaarde >= actieStartKmWaarde && actieEndKmWaarde >= startKmWaarde;
+        let localVarHeaders = this.defaultHeaders;
+        let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts = [];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+        let localVarHttpContext = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+        let localVarTransferCache = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+        let responseType_ = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            }
+            else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            }
+            else {
+                responseType_ = 'blob';
+            }
+        }
+        let localVarPath = `/rest/signaleringsbeeldeninfo/valideeriaversie`;
+        return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
+            context: localVarHttpContext,
+            params: localVarQueryParameters,
+            responseType: responseType_,
+            withCredentials: this.configuration.withCredentials,
+            headers: localVarHeaders,
+            observe: observe,
+            transferCache: localVarTransferCache,
+            reportProgress: reportProgress
+        });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SbControllerService, deps: [{ token: i1.HttpClient }, { token: BASE_PATH, optional: true }, { token: Configuration, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SbControllerService, providedIn: 'root' }); }
 }
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SbControllerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [BASE_PATH]
+                }] }, { type: Configuration, decorators: [{
+                    type: Optional
+                }] }] });
 
-class WisselKantCode {
-    constructor(naam, kantCode) {
-        this.naam = naam;
-        this.kantCode = kantCode;
-    }
-}
+const APIS = [AppConfigControllerService, BewegingControllerService, Class0BuildPropertiesService, ConnectorControllerService, LogControllerService, P21ControllerService, SbControllerService];
 
-class MeldingEvent {
-    constructor(meldingMessage, meldingLevel) {
-        this.meldingMessage = meldingMessage;
-        this.meldingLevel = meldingLevel;
-    }
-}
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
 
-const MELDING_LEVEL_ERROR = 'error';
-const MELDING_LEVEL_WARNING = 'warn';
-const MELDING_LEVEL_INFO = 'info';
-class MeldingBuilder {
-    static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
-        return new MeldingEvent('Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken, MELDING_LEVEL_INFO);
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * MST
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+class ApiModule {
+    static forRoot(configurationFactory) {
+        return {
+            ngModule: ApiModule,
+            providers: [{ provide: Configuration, useFactory: configurationFactory }]
+        };
     }
-    static actieHighlightError(actieZonderElementen) {
-        return new MeldingEvent('Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen, MELDING_LEVEL_ERROR);
+    constructor(parentModule, http) {
+        if (parentModule) {
+            throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
+        }
+        if (!http) {
+            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
+                'See also https://github.com/angular/angular/issues/20575');
+        }
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule, deps: [{ token: ApiModule, optional: true, skipSelf: true }, { token: i1.HttpClient, optional: true }], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.7", ngImport: i0, type: ApiModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule }); }
 }
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: ApiModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    imports: [],
+                    declarations: [],
+                    exports: [],
+                    providers: []
+                }]
+        }], ctorParameters: () => [{ type: ApiModule, decorators: [{
+                    type: Optional
+                }, {
+                    type: SkipSelf
+                }] }, { type: i1.HttpClient, decorators: [{
+                    type: Optional
+                }] }] });
 
-class MessageBuilder {
-    static rwpDataNietGevonden(err) {
-        return new Message(Severity.ERROR, 'Error bij ophalen van rijwegplan data: ' + err);
-    }
-    static rijwegNietGevonden(beweging) {
-        return new Message(Severity.ERROR, `Rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
-    }
-    static rijwegplanNietGevonden(beweging) {
-        return new Message(Severity.ERROR, `Rijwegplan van PPLG ${beweging.vanPplg} niet gevonden`);
-    }
-    static dwangNietGevonden(beweging) {
-        return new Message(Severity.ERROR, `Dwang ${beweging.dwangNummer} voor rijweg van ${beweging.vanSpoor} in PPLG ${beweging.vanPplg} naar ${beweging.naarSpoor} niet gevonden`);
-    }
-    static nietGevondenSBI(err) {
-        return new Message(Severity.ERROR, 'Error bij het ophalen van signaleringsbeeldinfo: ' + Utils.getValidErorrMessage(err));
-    }
-    static actieHighlightError(actieZonderElementen) {
-        return new Message(Severity.ERROR, 'Highlight error. Geen elementen kunnen vinden voor actie(s) met id: ' + actieZonderElementen);
-    }
-    static ritFileAlGewijzigdError(beweging) {
-        return new Message(Severity.ERROR, 'Rit bevat een beweging met status \'Gewijzigd\': Beweging met ID:' + beweging.id);
+class MstLoggingResource {
+    constructor(controller, store) {
+        this.controller = controller;
+        this.store = store;
+        this.subscriptions = new Subscription();
+        this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => controller.configuration.basePath = baseUrl + '/mst'));
     }
-    static meerDan12BladenGevonden(bladAmount) {
-        return new Message(Severity.WARNING, 'Warning, Rit bevat ' + bladAmount + ' bladen. Er worden maximaal 12 bladen ondersteund.');
+    ngOnDestroy() {
+        this.subscriptions.unsubscribe();
     }
-    static nietGevondenTakkenOngeplandeActies(nietGevondenTakken) {
-        return new Message(Severity.INFORMATION, 'Info, Niet gevonden takken uit \'OngeplandeActies\': ' + nietGevondenTakken);
+    logMessages(logDto) {
+        this.controller.log(logDto).subscribe();
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, deps: [{ token: LogControllerService }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource }); }
 }
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstLoggingResource, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [{ type: LogControllerService }, { type: i2$1.Store }] });
 
 class LoggingHelper {
-    constructor(sbmService, store) {
-        this.sbmService = sbmService;
+    constructor(store) {
         this.store = store;
     }
     maakLogDTO(melding, actie) {
@@ -1183,7 +2381,7 @@ class LoggingHelper {
             iaVersie = ia.versie;
         });
         if (actie) {
-            actieDto = new ActieDto({
+            actieDto = {
                 pplgNaam: actie.pplgNaam,
                 ritActieTypeOmschrijving: actie.ritActieTypeOmschrijving,
                 ritActieStatus: actie.ritActieStatus,
@@ -1195,16 +2393,16 @@ class LoggingHelper {
                 vanKilometrering: actie.vanKilometrering,
                 totKilometerlint: actie.totKilometerlint,
                 totKilometrering: actie.totKilometrering
-            });
+            };
         }
-        return new MstLoggingDto({
+        return {
             iaVersie,
             meldingLevel: melding.meldingLevel,
             meldingMessage: melding.meldingMessage,
             actieDto,
             algemeneRitInfoDto,
             sbinfoDtos: this.getSbInfoDtos()
-        });
+        };
     }
     getSbInfoDtos() {
         const sbInfoDtos = [];
@@ -1215,12 +2413,12 @@ class LoggingHelper {
         });
         return sbInfoDtos;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, deps: [{ token: SignaleringsBeeldManagerService }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, deps: [{ token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: LoggingHelper, decorators: [{
             type: Injectable
-        }], ctorParameters: () => [{ type: SignaleringsBeeldManagerService }, { type: i2$1.Store }] });
+        }], ctorParameters: () => [{ type: i2$1.Store }] });
 
 /**
  * export const RIT_ACTIE_1 = 1;
@@ -1543,9 +2741,9 @@ class ActieHelper {
         this.logLegeMeldingDto(logMeldingDTOs);
         return retval;
     }
-    logLegeMeldingDto(logMeldingDTOs) {
-        if (logMeldingDTOs.length > 0) {
-            this.mstLogResource.logErrorMessages(logMeldingDTOs);
+    logLegeMeldingDto(logDto) {
+        if (logDto.length > 0) {
+            return this.mstLogResource.logMessages(logDto);
         }
     }
     verwerkTopoElementen(topoElementen) {
@@ -1628,14 +2826,14 @@ class ActieHelper {
         if (ActieHelper.isKantCodeLinks(kantcode)) {
             return wissel.getLeft();
         }
-        return null;
+        return undefined;
     }
     bepaalPuicVoorWisselSlijpenActie(actie) {
         const storingsSymboolPuic = this.sbmService.getSBWissel(actie.wisselNaam, actie.pplgNaam)?.getStoringSymboolPuic();
         if (!storingsSymboolPuic && this.debug) {
             const melding = MeldingBuilder.actieHighlightError([actie.id]);
             this.messagesService.showMessage(MessageBuilder.actieHighlightError([actie.id]));
-            this.mstLogResource.logErrorMessages([this.loggingHelper.maakLogDTO(melding, actie)]);
+            this.mstLogResource.logMessages([this.loggingHelper.maakLogDTO(melding, actie)]);
         }
         return storingsSymboolPuic ? [storingsSymboolPuic] : [];
     }
@@ -1650,10 +2848,16 @@ class RitdelenLijstComponent {
     constructor(store, sbmService) {
         this.store = store;
         this.sbmService = sbmService;
+        this.nietGeplandeActies = [];
         this.focusEmitter = new EventEmitter();
         this.keurAlleActiesGoed = new EventEmitter();
+        this.ritdeelViewModels = [];
         this.selectedRitdeelActies = [];
         this.selectedRitdeelOngeplandeActies = [];
+        this.disableActieKnoppenVanRitdeel = true;
+        this.editable = false;
+        this.ongeplandeActiesMap = new ArrayMultimap();
+        this.geplandeActies = new ArrayMultimap();
         this.NG_ACTIE_PREFIX = '* ';
         this.subscriptions = [];
         this.subscriptions.push(store.select('ritDelen').subscribe((ritdelen) => {
@@ -1703,12 +2907,14 @@ class RitdelenLijstComponent {
         this.store.dispatch(deleteRitdeel(ritdeel));
     }
     deleteActiesUitRit() {
-        this.selectedRitdeel.acties.slice().forEach(actie => {
+        this.selectedRitdeel?.acties.slice().forEach(actie => {
             this.deleteActieUitRit(actie);
         });
     }
     deleteActieUitRit(actie) {
-        const acties = this.selectedRitdeel.acties;
+        if (!this.selectedRitdeel)
+            return;
+        const acties = this.selectedRitdeel.acties ?? [];
         const idx = acties.indexOf(actie);
         if (idx >= 0) {
             this.verhuisActieNaarOngepland(actie);
@@ -1836,13 +3042,13 @@ class RitdelenLijstComponent {
         return `${prefix}${ActieHelper.getVSTActieOmschrijving(actie)}`;
     }
     bepaalPrefixVoorActieOmschrijving(actie) {
-        const prefix = '';
-        if (this.selectedRitdeel.acties.includes(actie)) {
+        const noPrefix = '';
+        if (this.selectedRitdeel?.acties.includes(actie)) {
             // Afwijkende naam bij niet gevisualiseerde actie in rit
             const puics = this.geplandeActies.get(actie);
-            return puics.length > 0 ? prefix : this.NG_ACTIE_PREFIX;
+            return puics.length > 0 ? noPrefix : this.NG_ACTIE_PREFIX;
         }
-        return prefix;
+        return noPrefix;
     }
     actieVanKmTekst(actie) {
         if (ActieHelper.isWisselSlijpenActie(actie)) {
@@ -1863,6 +3069,7 @@ class RitdelenLijstComponent {
         return ritdeel.getPplgString();
     }
     getKantCode(stand) {
+        // @ts-ignore
         if (stand === window['domein'].Stand.LINKS) {
             return 'L';
         }
@@ -2042,6 +3249,7 @@ class ViewerControlsComponent {
         this.printing$ = this.viewerControlsService.isPrinting$();
         this.valideRit$ = this.viewerControlsService.isValideRit$();
         this.subscriptions = new Subscription();
+        this.editable = false;
         this.subscriptions.add(this.store.select('editable').subscribe(editable => this.editable = editable));
     }
     ngOnChanges({ treinpad }) {
@@ -2125,7 +3333,7 @@ class ActiePopoverBepaler {
             ongeplandeActies.entries.forEach(entry => {
                 const treinNummerActieInfos = puicNaarOngeplandeActieMap.get(entry.key);
                 if (!treinNummerActieInfos?.map(({ actie }) => actie).includes(entry.value.actie)) {
-                    puicNaarOngeplandeActieMap.put(entry.key, { treinNummer: undefined, actie: entry.value.actie });
+                    puicNaarOngeplandeActieMap.put(entry.key, { actie: entry.value.actie });
                 }
             });
         }
@@ -2185,12 +3393,15 @@ class SvgVisualisatieComponent {
         this.actieHelper = actieHelper;
         this.sbmService = sbmService;
         this.editorService = editorService;
+        this.nietGeplandeActies = [];
+        this.useClickArea = false;
         this.svgInfos$ = this.store.select('svgInfos');
         this.popoverInfos = [];
         this.clickableIds = [];
         this.rightClickableIds = [];
         this.contextMenuActions = [];
         this.contextMenuStyle = { display: 'none' };
+        this.editable = false;
         this.puicNaarBeginSeinRitdeel = new Map();
         this.puicNaarEindSeinCombinatie = new Map();
         this.puicNaarAlternatieveRoute = new Map();
@@ -2214,7 +3425,7 @@ class SvgVisualisatieComponent {
         }));
     }
     ngOnInit() {
-        document.getElementById('contextMenu').addEventListener('mouseleave', () => this.hideContextMenu());
+        document.getElementById('contextMenu')?.addEventListener('mouseleave', () => this.hideContextMenu());
     }
     ngOnDestroy() {
         this.subscriptions.forEach(s => s.unsubscribe());
@@ -2385,7 +3596,7 @@ class SvgVisualisatieComponent {
         });
         this.viewerControlsService.setValideRit(!gebrokenRit);
         this.store.dispatch(SetGeplandeActies(actieOpRitSelectiePuics));
-        const actieOpRitSelectiePuicsArray = Utils.flatMap(Array.from(actieOpRitSelectiePuics.values()), x => x);
+        const actieOpRitSelectiePuicsArray = Array.from(actieOpRitSelectiePuics.values()).reduce((acc, val) => acc.concat(val), []);
         this.store.dispatch(SetActieOpRitSelectieIds(actieOpRitSelectiePuicsArray));
         ritSelectiePuics = ritSelectiePuics.filter(item => actieOpRitSelectiePuicsArray.indexOf(item) < 0); // make mutually exclusive
         this.store.dispatch(SetRitSelectieIds(ritSelectiePuics));
@@ -2532,7 +3743,7 @@ let SignaleringsbeeldInfoResource = class SignaleringsbeeldInfoResource extends
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, deps: [{ token: i1.ResourceHandler }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, deps: [{ token: i1$1.ResourceHandler }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource }); }
 };
 __decorate([
@@ -2553,7 +3764,7 @@ SignaleringsbeeldInfoResource = __decorate([
 ], SignaleringsbeeldInfoResource);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, decorators: [{
             type: Injectable
-        }], ctorParameters: () => [{ type: i1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { laadSignaleringsbeeldInfo: [], getBestaatIALevering: [] } });
+        }], ctorParameters: () => [{ type: i1$1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { laadSignaleringsbeeldInfo: [], getBestaatIALevering: [] } });
 class SignaleringsbeeldInfoDto extends ResourceModel {
     constructor(data) {
         super();
@@ -2587,7 +3798,7 @@ class BaseRestService {
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, deps: [{ token: i1$1.HttpClient }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, deps: [{ token: i1.HttpClient }, { token: i2$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: BaseRestService, decorators: [{
@@ -2595,7 +3806,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$1.HttpClient }, { type: i2$1.Store }] });
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2$1.Store }] });
 
 class BewegingVerrijkerService extends BaseRestService {
     getBewegingen(bewegingen, ongeplandeActies) {
@@ -2837,10 +4048,10 @@ class Ritdeel {
     getZichtbaarheidBuitenPaginatie() {
         return this.zichtbaarBuitenPaginatie;
     }
-    bepaalTopologieElementen(signaleringsBeeldManagerService) {
-        const topoElementen = signaleringsBeeldManagerService.bepaalRouteElementen(this.getRoute());
+    bepaalTopologieElementen(sbmService) {
+        const topoElementen = sbmService.bepaalRouteElementen(this.getRoute());
         if (this.heeftVrijebaanInfo()) {
-            const vrijebaanTopoElementen = signaleringsBeeldManagerService.bepaalRouteElementen(this.getVrijebaanPrlRoute());
+            const vrijebaanTopoElementen = sbmService.bepaalRouteElementen(this.getVrijebaanPrlRoute());
             topoElementen.push(...vrijebaanTopoElementen);
         }
         this.topoElementen = topoElementen;
@@ -2886,7 +4097,7 @@ class RitLezerService {
         ritDelen.push(new Ritdeel(dwangInfo, beweging.ritActies, beweging, vrijebaanDwangInfo, vervolgSpoor, []));
     }
     extractVrijebaanDwangInfo(beweging, rijwegPlan, rijweg) {
-        let vrijebaanDwangInfo = null;
+        let vrijebaanDwangInfo = undefined;
         let vervolgSpoor;
         if (beweging.naarSpoor.endsWith(SPOOR_NAAR_VRIJEBAAN_POSTFIX) ||
             beweging.naarSpoor.endsWith(SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX)) {
@@ -2900,9 +4111,9 @@ class RitLezerService {
                     vrijebaanRijweg = vrijebaanRijwegen[0];
                     vrijebaanDwang = vrijebaanRijweg.getDwangVoorDwangNummer(0);
                     vervolgSpoor = vrijebaanRijwegplan.getVervolgSpoor(vrijebaanRijweg);
+                    vrijebaanDwangInfo =
+                        new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);
                 }
-                vrijebaanDwangInfo =
-                    new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);
             }
         }
         return { vrijebaanDwangInfo, vervolgSpoor };
@@ -2985,7 +4196,7 @@ class BepaalOngeplandeActiesEffect {
                 this.messagesService.showMessage(MessageBuilder.nietGevondenTakkenOngeplandeActies(nietGevondenTakken));
             }
             if (logMeldingDTOs.length > 0) {
-                this.mstLogResource.logErrorMessages(logMeldingDTOs);
+                this.mstLogResource.logMessages(logMeldingDTOs);
             }
             this.store.dispatch(SetOngeplandeActies(puicActieMap));
             this.store.dispatch(SetOngeplandeActieSelectieIds(Array.from(puicActieMap.keys())));
@@ -3055,7 +4266,7 @@ class BepaalSbInfosEffect {
             next: _res => this.store.dispatch(laadEnVerwerkSignaleringsbeeldInfo(treinpad, paginationSize, pplgs, ritGewijzigdToegestaan)),
             error: err => {
                 this.messagesService.showMessage(new Message(Severity.INFORMATION, Utils.getValidErorrMessage(err)));
-                const iaVersieInfo = { versie: 'DONNA_77136_VER_1', ingangsDatum: this.dateService.getCurrentDate() };
+                const iaVersieInfo = { versie: 'DONNA_97207_VER_1', ingangsDatum: this.dateService.getCurrentDate() };
                 this.store.dispatch(SetIaVersie(iaVersieInfo));
                 this.store.dispatch(laadEnVerwerkSignaleringsbeeldInfo(treinpad, paginationSize, pplgs, ritGewijzigdToegestaan));
             }
@@ -3209,7 +4420,7 @@ class LaadRouteFilesEffect {
             const promise = this.editorService.laadRouteFiles(actie.iaversieinfo.versie, pplgs);
             promise.then(() => {
                 this.updateRitdelen(actie);
-            }, err => {
+            }, (err) => {
                 this.messagesService.showMessage(MessageBuilder.rwpDataNietGevonden(Utils.getValidErorrMessage(err)));
             });
         });
@@ -3269,14 +4480,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
         }] });
 
 class LaadSignaleringsbeeldenEffect {
-    constructor(actions$, store, signaleringsBeeldManagerService, editorService, sbiResource, connectorService, messagesSerivce) {
+    constructor(actions$, store, signaleringsBeeldManagerService, editorService, sbiResource, connectorService, messagesService) {
         this.actions$ = actions$;
         this.store = store;
         this.signaleringsBeeldManagerService = signaleringsBeeldManagerService;
         this.editorService = editorService;
         this.sbiResource = sbiResource;
         this.connectorService = connectorService;
-        this.messagesSerivce = messagesSerivce;
+        this.messagesService = messagesService;
         this.SVG_PIXEL_RUIMTE = 30;
         this.verwerkRitdelen$ = createEffect(() => this.actions$.pipe(ofType(setRitDelen, navigeer, navigeerVanaf), withLatestFrom(this.store), map(([actie, storeState]) => {
             this.store.dispatch(SetOngeplandeActiesBepaald(false));
@@ -3291,13 +4502,13 @@ class LaadSignaleringsbeeldenEffect {
     }
     handleSignaleringsbeeldInfo({ actie, storeState }) {
         return this.sbiResource.laadSignaleringsbeeldInfo(this.createSignaleringsbeeldInfoQueryDto(actie.pplgs, storeState.iaVersie)).pipe(take(1), tap((dtos) => this.processResponse({ dtos, storeState, actie })), catchError((err) => {
-            this.messagesSerivce.showMessage(MessageBuilder.nietGevondenSBI(err));
+            this.messagesService.showMessage(MessageBuilder.nietGevondenSBI(err));
             return throwError(() => err);
         }));
     }
     processResponse({ dtos, storeState, actie }) {
         if (dtos && dtos.filter(dto => dto.metVisualisatie).length > 12) {
-            this.messagesSerivce.showMessage(MessageBuilder.meerDan12BladenGevonden(dtos.length));
+            this.messagesService.showMessage(MessageBuilder.meerDan12BladenGevonden(dtos.length));
         }
         this.store.dispatch(SetSignaleringsbeeldInfoDtos(dtos, storeState.iaVersie, actie.rit, actie.paginationSize, actie.ritGewijzigdToegestaan));
         this.store.dispatch(SetVisibleSignaleringsbeeldInfoDtos(dtos));
@@ -3331,7 +4542,7 @@ class LaadSignaleringsbeeldenEffect {
             this.verwerkSvgs(svgDataUrls);
             this.updateState(ritDelen, visibleDtos, storeState, visibleRitPplgs, loadingDtos, isInit, storeDtos);
         }), catchError(err => {
-            this.messagesSerivce.showMessage(MessageBuilder.rwpDataNietGevonden(Utils.getValidErorrMessage(err)));
+            this.messagesService.showMessage(MessageBuilder.rwpDataNietGevonden(Utils.getValidErorrMessage(err)));
             throw err;
         })).subscribe();
     }
@@ -3386,8 +4597,8 @@ class LaadSignaleringsbeeldenEffect {
         dtos.filter(d => !visibleDtos.includes(d)).forEach(d => d.metVisualisatie = false);
         return visibleDtos;
     }
-    distinct(value, index, self) {
-        return self.indexOf(value) === index;
+    distinct(value, index, values) {
+        return values.indexOf(value) === index;
     }
     addPrevNonVisibleDto(firstIdx, ritdelen, loadingDtos, visibleRitPplgs, allDtos) {
         if (firstIdx >= 0) {
@@ -3476,7 +4687,7 @@ class LaadSignaleringsbeeldenEffect {
                 }
             }
         }
-        this.updateZichtbaarheidAangrezendeRitdelen(min, max, ritdelen, visibleDtos);
+        this.updateZichtbaarheidAangrenzendeRitdelen(min, max, ritdelen, visibleDtos);
         return this.updateZichtbaarheidBuitenWindow(ritdelen, visibleDtos);
     }
     updateZichtbaarheidBuitenWindow(nieuweRitdelen, visibleDtos) {
@@ -3492,7 +4703,7 @@ class LaadSignaleringsbeeldenEffect {
         }
         return nieuweRitdelen;
     }
-    updateZichtbaarheidAangrezendeRitdelen(min, max, nieuweRitdelen, visibleDtos) {
+    updateZichtbaarheidAangrenzendeRitdelen(min, max, nieuweRitdelen, visibleDtos) {
         let i = min - 1;
         while (i >= 0) {
             i = this.updateZichtbaarHeid(i, 0, visibleDtos, nieuweRitdelen) - 1;
@@ -3627,11 +4838,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
         }], ctorParameters: () => [{ type: i1$2.Actions }, { type: i2$1.Store }, { type: BewegingVerrijkerService }] });
 
 class RitdelenEffect {
-    constructor(actions$, store, sbmService, rijwegPlanEditorService) {
+    constructor(actions$, store, sbmService, editorService) {
         this.actions$ = actions$;
         this.store = store;
         this.sbmService = sbmService;
-        this.rijwegPlanEditorService = rijwegPlanEditorService;
+        this.editorService = editorService;
         this.updateRitDelen$ = createEffect(() => this.actions$.pipe(ofType(updateRitDelen), withLatestFrom(this.store), map(([actie, _storeState]) => {
             const nieuweRitDelen = actie.ritDelen.map(ritDeel => ritDeel.isZichtbaar() ?
                 ritDeel.copyMetAlternatieveRoutes(this.sbmService.bepaalAlternativeRoutes(ritDeel.getRijweg())) : ritDeel);
@@ -3649,25 +4860,25 @@ class RitdelenEffect {
             return setRitdelenAfterUpdate(ritDelen);
         })));
         this.ritdeelInvoegen$ = createEffect(() => this.actions$.pipe(ofType(ritdeelInvoegen), withLatestFrom(this.store), map(([actie, storeState]) => {
-            const ritDelen = this.ritdeelInvoegenFunc(storeState.ritDelen, actie.nieuweRoute, this.rijwegPlanEditorService, this.sbmService);
+            const ritDelen = this.ritdeelInvoegenFunc(storeState.ritDelen, actie.nieuweRoute);
             return setRitdelenAfterUpdate(ritDelen);
         })));
     }
-    ritdeelInvoegenFunc(ritDelen, nieuweRoute, rijwegPlanEditorService, sbmService) {
+    ritdeelInvoegenFunc(ritDelen, nieuweRoute) {
         const origineelRitdeel = nieuweRoute.beginSeinOpRitdeel.ritdeel;
         const beginSein = nieuweRoute.beginSeinOpRitdeel.sein;
-        const rijwegplan = rijwegPlanEditorService.getRijwegplan(beginSein.getPPLG());
+        const rijwegplan = this.editorService.getRijwegplan(beginSein.getPPLG());
         const dwangen = JsJavaUtil.listToArray(rijwegplan.getOnderliggendeDwangenTotEnVanSein(origineelRitdeel.getDwang(), beginSein));
         const isSamengesteldeRoute = dwangen[0] && dwangen[1];
         let newRitdeel1 = origineelRitdeel;
         if (isSamengesteldeRoute) {
-            newRitdeel1 = this.verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, sbmService, ritDelen);
+            newRitdeel1 = this.verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, ritDelen);
         }
         if (nieuweRoute.combinatieVoorEindsein.isVrijeBaanRijweg()) {
-            this.extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute, sbmService);
+            this.extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute);
         }
         else {
-            this.maakNieuwRitdeel(newRitdeel1, nieuweRoute, sbmService, ritDelen);
+            this.maakNieuwRitdeel(newRitdeel1, nieuweRoute, ritDelen);
         }
         if (isSamengesteldeRoute) {
             ritDelen.splice(ritDelen.indexOf(origineelRitdeel), 1);
@@ -3682,38 +4893,38 @@ class RitdelenEffect {
             }
         }
     }
-    verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, sbmService, ritDelen) {
+    verwerkSamengesteldeRoute(origineelRitdeel, rijwegplan, dwangen, ritDelen) {
         // dwangen in 2 nieuwe ritdelen verwerken voor de knip
         const nieuweRijweg1 = rijwegplan.getRijwegVoorSeinen(dwangen[0].getRoute().getBeginSein(), dwangen[0].getRoute().getEindSein());
         const dwangInfo1 = new RijwegplanRijwegDwangCombinatie(rijwegplan, nieuweRijweg1, dwangen[0]);
-        const newRitdeel1 = new Ritdeel(dwangInfo1, [], null, null, null, []);
+        const newRitdeel1 = new Ritdeel(dwangInfo1, [], undefined, undefined, undefined, []);
         // remove vrijbaan info uit ritdeel
-        newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi = null;
-        newRitdeel1.vervolgSpoor = null;
-        newRitdeel1.bepaalTopologieElementen(sbmService);
+        newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi = undefined;
+        newRitdeel1.vervolgSpoor = undefined;
+        newRitdeel1.bepaalTopologieElementen(this.sbmService);
         this.insertRitdeel(ritDelen, origineelRitdeel, newRitdeel1);
         const nieuweRijweg2 = rijwegplan.getRijwegVoorSeinen(dwangen[1].getRoute().getBeginSein(), dwangen[1].getRoute().getEindSein());
         const dwangInfo2 = new RijwegplanRijwegDwangCombinatie(rijwegplan, nieuweRijweg2, dwangen[1]);
-        const newRitdeel2 = new Ritdeel(dwangInfo2, [], null, null, null, []);
-        newRitdeel2.bepaalTopologieElementen(sbmService);
+        const newRitdeel2 = new Ritdeel(dwangInfo2, [], undefined, undefined, undefined, []);
+        newRitdeel2.bepaalTopologieElementen(this.sbmService);
         this.insertRitdeel(ritDelen, newRitdeel1, newRitdeel2);
         return newRitdeel1;
     }
-    extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute, sbmService) {
+    extendRitdeelMetVrijebaanInfo(newRitdeel1, nieuweRoute) {
         newRitdeel1.vrijebaanRijwegplanRijwegDwangCombi = nieuweRoute.combinatieVoorEindsein;
         const vbrwp = nieuweRoute.combinatieVoorEindsein.rijwegplan;
         newRitdeel1.vervolgSpoor = vbrwp.getVervolgSpoor(nieuweRoute.combinatieVoorEindsein.rijweg);
-        newRitdeel1.bepaalTopologieElementen(sbmService);
+        newRitdeel1.bepaalTopologieElementen(this.sbmService);
     }
-    maakNieuwRitdeel(newRitdeel1, nieuweRoute, sbmService, ritDelen) {
+    maakNieuwRitdeel(newRitdeel1, nieuweRoute, ritDelen) {
         let newRitdeel = this.createRitdeel(nieuweRoute);
-        const altRoutes = sbmService.bepaalAlternativeRoutes(newRitdeel.getRijweg());
+        const altRoutes = this.sbmService.bepaalAlternativeRoutes(newRitdeel.getRijweg());
         newRitdeel = newRitdeel.copyMetAlternatieveRoutes(altRoutes);
-        newRitdeel.bepaalTopologieElementen(sbmService);
+        newRitdeel.bepaalTopologieElementen(this.sbmService);
         this.insertRitdeel(ritDelen, newRitdeel1, newRitdeel);
     }
     createRitdeel(nieuweRoute) {
-        return new Ritdeel(nieuweRoute.combinatieVoorEindsein, [], null, null, null, []);
+        return new Ritdeel(nieuweRoute.combinatieVoorEindsein, [], undefined, undefined, undefined, []);
     }
     insertRitdeel(ritdelen, naRitdeelPositie, newRitdeel) {
         const idx = ritdelen.indexOf(naRitdeelPositie);
@@ -3764,6 +4975,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
             type: Injectable
         }], ctorParameters: () => [{ type: i1$2.Actions }, { type: i2$1.Store }, { type: SignaleringsBeeldManagerService }, { type: i4.SignaleringsbeeldSvgUtilityService }] });
 
+class ProgressIndicator {
+    constructor(lowerText, upperText, iconClass) {
+        this.lowerText = '';
+        this.upperText = '';
+        this.iconClass = '';
+        this.lowerText = lowerText ?? this.lowerText;
+        this.upperText = upperText ?? this.upperText;
+        this.iconClass = iconClass ?? this.iconClass;
+    }
+}
+
 class NieuweRoute {
     constructor(beginSeinOpRitdeel, combinatieVoorEindsein) {
         this.beginSeinOpRitdeel = beginSeinOpRitdeel;
@@ -3836,7 +5058,7 @@ function addRitdeelActieFunc(ritDelen, { ritDeel, actie }) {
 const onIdsActionHandler = (action) => on(action, (_, { ids }) => ids);
 const createIdsReducer = (action) => createReducer([], onIdsActionHandler(action));
 const editableReducer = createReducer(true, on(setEditable, (_, { editable }) => editable));
-const progressIndicatorReducer = createReducer(undefined, on(ShowProgress, () => ({ progressIndicator: {} })), on(ClearProgress, () => undefined));
+const progressIndicatorReducer = createReducer({}, on(ShowProgress, () => ({ progressIndicator: new ProgressIndicator() })), on(ClearProgress, () => ({})));
 const svgInfoReducer = createReducer([], on(SetSvgInfos, (_, { svgInfos }) => svgInfos));
 const debugReducer = createReducer(false, on(SetDebug, (_, { debug }) => debug));
 const ritSelectieIdsReducer = createIdsReducer(SetRitSelectieIds);
@@ -3862,12 +5084,10 @@ const ongeplandeActieReducer = createReducer(new ArrayMultimap(), on(SetOngeplan
     ongeplandeActie.puics.forEach(puic => ongeplandeActies.delete(puic, ongeplandeActie));
     return new ArrayMultimap(ongeplandeActies);
 }));
-const ongeplandeActieSelectieIdsReducer = createReducer([], 
-// on(MstActions.SetOngeplandeActieSelectieIds, (_, { ids }) => ids),
-onIdsActionHandler(SetOngeplandeActieSelectieIds), on(AddOngeplandeActie, (ids, { ongeplandeActie }) => {
+const ongeplandeActieSelectieIdsReducer = createReducer([], onIdsActionHandler(SetOngeplandeActieSelectieIds), on(AddOngeplandeActie, (ids, { ongeplandeActie }) => {
     ongeplandeActie.puics.filter(puic => !ids.includes(puic)).forEach(puic => ids.push(puic));
     return [...ids];
-}), on(DeleteOngeplandeActieSelectieId, (ids, { id }) => [].concat(ids.includes(id) ? ids.filter(_id => _id !== id) : ids)));
+}), on(DeleteOngeplandeActieSelectieId, (ids, { id }) => ids.includes(id) ? ids.filter(_id => _id !== id) : ids));
 const gebrokenRitSelectieIdsReducer = createIdsReducer(SetGebrokenRitSelectieIds);
 const alternatievenSelectieIdsReducer = createIdsReducer(SetAlternatievenSelectieIds);
 const beginSeinSelectieIdsReducer = createIdsReducer(SetBeginSeinSelectieIds);
@@ -3876,16 +5096,16 @@ const alternatievenClickableIdsReducer = createIdsReducer(SetAlternatievenClicka
 const eindSeinenClickableIdsReducer = createIdsReducer(SetEindSeinenClickableIds);
 const connectorClickableIdsReducer = createIdsReducer(SetConnectorenClickableIds);
 const beginSeinRightClickableIdsReducer = createIdsReducer(SetBeginSeinRightClickableIds);
-const nieuweRouteReducer = createReducer(new NieuweRoute(null, null), on(SetNieuwRouteBeginSein, (_, { startSeinOpRitdeel }) => new NieuweRoute(startSeinOpRitdeel, null)), on(SetNieuwRouteEindSein, (nieuweRoute, { combinatieVoorEindsein }) => new NieuweRoute(nieuweRoute.beginSeinOpRitdeel, combinatieVoorEindsein)), on(ResetNieuweRoute, () => new NieuweRoute(null, null)));
+const nieuweRouteReducer = createReducer(undefined, on(SetNieuwRouteBeginSein, (_, { startSeinOpRitdeel }) => new NieuweRoute(startSeinOpRitdeel, null)), on(SetNieuwRouteEindSein, (nieuweRoute, { combinatieVoorEindsein }) => new NieuweRoute(nieuweRoute.beginSeinOpRitdeel, combinatieVoorEindsein)), on(ResetNieuweRoute, () => undefined));
 const signaleringsbeeldInfoDtosReducer = createReducer([], on(SetSignaleringsbeeldInfoDtos, (_, { dtos }) => dtos), on(UpdateSignaleringsbeeldInfoDtos, (_, { dtos }) => [...dtos]));
 const visibleSbInfoDtosReducer = createReducer([], on(SetVisibleSignaleringsbeeldInfoDtos, (_, { dtos }) => dtos), on(UpdateVisibleSignaleringsbeeldInfoDtos, (_, { dtos }) => [...dtos]));
-const iaVersieReducer = createReducer({}, on(SetIaVersie, (_, { iaVersie }) => Object.assign({}, iaVersie, { versie: iaVersie.versie.toUpperCase() })));
-const algemeneRitInfoDtoReducer = createReducer(new AlgemeneRitInfoDto(), on(SetAlgemeneRitInfo, (_, { algemeneRitInfoDto }) => algemeneRitInfoDto));
+const iaVersieReducer = createReducer({ versie: 'unknown', ingangsDatum: new Date() }, on(SetIaVersie, (_, { iaVersie }) => Object.assign({}, iaVersie, { versie: iaVersie.versie.toUpperCase() })));
+const algemeneRitInfoDtoReducer = createReducer({}, on(SetAlgemeneRitInfo, (_, { algemeneRitInfoDto }) => algemeneRitInfoDto));
 const ongeplandeActiesBepaaldReducer = createReducer(false, on(SetOngeplandeActiesBepaald, (_, { bepaald }) => bepaald));
-const nieuweBewegingReducer = createReducer({}, on(UpdateRit, (_, { bewegingen }) => bewegingen));
-const baseUrlReducer = createReducer(undefined, on(SetBaseUrl, (_, { baseUrl }) => baseUrl));
-const focusIdsReducer = createReducer({}, on(focusOpIds, (_, { puics }) => puics));
-const selectedRitdeelIdReducer = createReducer({}, on(SetSelectedRitdeel, (_, { id }) => id));
+const nieuweBewegingReducer = createReducer([], on(UpdateRit, (_, { bewegingen }) => bewegingen));
+const baseUrlReducer = createReducer('', on(SetBaseUrl, (_, { baseUrl }) => baseUrl));
+const focusIdsReducer = createReducer([], on(focusOpIds, (_, { puics }) => puics));
+const selectedRitdeelIdReducer = createReducer(-1, on(SetSelectedRitdeel, (_, { id }) => id));
 const storeReducers = {
     ritDelen: ritdelenReducer,
     ritSelectieIds: ritSelectieIdsReducer,
@@ -3917,6 +5137,7 @@ const storeReducers = {
     selectedRitdeelId: selectedRitdeelIdReducer
 };
 
+// @ts-nocheck
 class ZoneUtil {
     constructor(ngZone) {
         this.ngZone = ngZone;
@@ -3979,6 +5200,7 @@ class MstViewerModule {
     constructor(service, zoneUtil) {
         this.service = service;
         // maak de EditorService toegankelijk voor GWT code
+        // @ts-ignore
         window['rpe'] = {
             EditorService: zoneUtil.proxy(service)
         };
@@ -3996,7 +5218,7 @@ class MstViewerModule {
             SvgVisualisatieComponent,
             MessagesComponent], imports: [CommonModule,
             ImxViewerModule,
-            RijwegenModule, i1.ResourceModule, i2$1.StoreRootModule, i1$2.EffectsRootModule], exports: [MstviewerComponent] }); }
+            RijwegenModule, i1$1.ResourceModule, i2$1.StoreRootModule, i1$2.EffectsRootModule], exports: [MstviewerComponent] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: MstViewerModule, providers: [
             ZoneUtil,
             SignaleringsbeeldInfoResource,