@loxia/mst-viewer 8.1.3-202511211601 → 8.1.3-202511232334

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/esm2022/generated/openapi/api/sbController.service.mjs +16 -17
  2. package/esm2022/generated/openapi/api/sbController.serviceInterface.mjs +1 -1
  3. package/esm2022/generated/openapi/model/algemeneRitDto.mjs +1 -1
  4. package/esm2022/generated/openapi/model/models.mjs +2 -1
  5. package/esm2022/generated/openapi/model/signaleringsbeeldRequestDto.mjs +13 -0
  6. package/esm2022/lib/resources/signaleringsbeeldinfo.resource.mjs +12 -15
  7. package/esm2022/lib/services/editor.service.mjs +1 -1
  8. package/esm2022/lib/state/actions/actions.mjs +1 -1
  9. package/esm2022/lib/state/effect/laad-route-files.effect.mjs +2 -2
  10. package/esm2022/lib/state/effect/laad-signaleringsbeelden.effect.mjs +14 -12
  11. package/esm2022/lib/state/mst-editor-state.mjs +1 -1
  12. package/esm2022/src/generated/openapi/api/sbController.service.mjs +16 -17
  13. package/esm2022/src/generated/openapi/api/sbController.serviceInterface.mjs +1 -1
  14. package/esm2022/src/generated/openapi/model/algemeneRitDto.mjs +1 -1
  15. package/esm2022/src/generated/openapi/model/models.mjs +2 -1
  16. package/esm2022/src/generated/openapi/model/signaleringsbeeldRequestDto.mjs +13 -0
  17. package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs +27 -16
  18. package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs.map +1 -1
  19. package/fesm2022/loxia-mst-viewer.mjs +52 -41
  20. package/fesm2022/loxia-mst-viewer.mjs.map +1 -1
  21. package/generated/openapi/api/sbController.service.d.ts +8 -8
  22. package/generated/openapi/api/sbController.serviceInterface.d.ts +3 -3
  23. package/generated/openapi/model/algemeneRitDto.d.ts +8 -0
  24. package/generated/openapi/model/models.d.ts +1 -0
  25. package/generated/openapi/model/signaleringsbeeldRequestDto.d.ts +16 -0
  26. package/lib/resources/signaleringsbeeldinfo.resource.d.ts +15 -10
  27. package/lib/services/editor.service.d.ts +2 -2
  28. package/lib/state/actions/actions.d.ts +14 -13
  29. package/lib/state/effect/laad-route-files.effect.d.ts +2 -2
  30. package/lib/state/effect/laad-signaleringsbeelden.effect.d.ts +3 -3
  31. package/lib/state/mst-editor-state.d.ts +6 -5
  32. package/package.json +1 -1
  33. package/src/generated/openapi/api/sbController.service.d.ts +8 -8
  34. package/src/generated/openapi/api/sbController.serviceInterface.d.ts +3 -3
  35. package/src/generated/openapi/model/algemeneRitDto.d.ts +8 -0
  36. package/src/generated/openapi/model/models.d.ts +1 -0
  37. package/src/generated/openapi/model/signaleringsbeeldRequestDto.d.ts +16 -0
@@ -17,7 +17,7 @@ import * as i1 from '@angular/common/http';
17
17
  import { HttpHeaders, HttpContext, HttpParams } from '@angular/common/http';
18
18
  import { __decorate } from 'tslib';
19
19
  import * as i1$1 from '@ngx-resource/core';
20
- import { Resource, ResourceAction, ResourceParams, ResourceModel } from '@ngx-resource/core';
20
+ import { Resource, ResourceAction, ResourceRequestMethod, ResourceParams, ResourceModel } from '@ngx-resource/core';
21
21
 
22
22
  class Message {
23
23
  constructor(severity, text, timeout = 0) {
@@ -2165,25 +2165,16 @@ class SbControllerService {
2165
2165
  }
2166
2166
  return httpParams;
2167
2167
  }
2168
- getSignaleringsbeelden(iaVersie, pplg, observe = 'body', reportProgress = false, options) {
2169
- if (iaVersie === null || iaVersie === undefined) {
2170
- throw new Error('Required parameter iaVersie was null or undefined when calling getSignaleringsbeelden.');
2171
- }
2172
- if (pplg === null || pplg === undefined) {
2173
- throw new Error('Required parameter pplg was null or undefined when calling getSignaleringsbeelden.');
2174
- }
2175
- let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
2176
- if (pplg) {
2177
- pplg.forEach((element) => {
2178
- localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, element, 'pplg');
2179
- });
2168
+ getSignaleringsbeelden(signaleringsbeeldRequestDto, observe = 'body', reportProgress = false, options) {
2169
+ if (signaleringsbeeldRequestDto === null || signaleringsbeeldRequestDto === undefined) {
2170
+ throw new Error('Required parameter signaleringsbeeldRequestDto was null or undefined when calling getSignaleringsbeelden.');
2180
2171
  }
2181
2172
  let localVarHeaders = this.defaultHeaders;
2182
2173
  let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
2183
2174
  if (localVarHttpHeaderAcceptSelected === undefined) {
2184
2175
  // to determine the Accept header
2185
2176
  const httpHeaderAccepts = [
2186
- 'application/json'
2177
+ '*/*'
2187
2178
  ];
2188
2179
  localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
2189
2180
  }
@@ -2198,6 +2189,14 @@ class SbControllerService {
2198
2189
  if (localVarTransferCache === undefined) {
2199
2190
  localVarTransferCache = true;
2200
2191
  }
2192
+ // to determine the Content-Type header
2193
+ const consumes = [
2194
+ 'application/json'
2195
+ ];
2196
+ const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
2197
+ if (httpContentTypeSelected !== undefined) {
2198
+ localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
2199
+ }
2201
2200
  let responseType_ = 'json';
2202
2201
  if (localVarHttpHeaderAcceptSelected) {
2203
2202
  if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
@@ -2210,10 +2209,10 @@ class SbControllerService {
2210
2209
  responseType_ = 'blob';
2211
2210
  }
2212
2211
  }
2213
- let localVarPath = `/rest/${this.configuration.encodeParam({ name: "iaVersie", value: iaVersie, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}/SignaleringsbeeldAndPplgs`;
2214
- return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
2212
+ let localVarPath = `/rest/signaleringsbeeldeninfo`;
2213
+ return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
2215
2214
  context: localVarHttpContext,
2216
- params: localVarQueryParameters,
2215
+ body: signaleringsbeeldRequestDto,
2217
2216
  responseType: responseType_,
2218
2217
  withCredentials: this.configuration.withCredentials,
2219
2218
  headers: localVarHeaders,
@@ -2339,6 +2338,18 @@ const APIS = [AppConfigControllerService, BewegingControllerService, Class0Build
2339
2338
  * Do not edit the class manually.
2340
2339
  */
2341
2340
 
2341
+ /**
2342
+ * MST
2343
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
2344
+ *
2345
+ * The version of the OpenAPI document: 1
2346
+ *
2347
+ *
2348
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
2349
+ * https://openapi-generator.tech
2350
+ * Do not edit the class manually.
2351
+ */
2352
+
2342
2353
  class ApiModule {
2343
2354
  static forRoot(configurationFactory) {
2344
2355
  return {
@@ -3732,26 +3743,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
3732
3743
  }] } });
3733
3744
 
3734
3745
  let SignaleringsbeeldInfoResource = class SignaleringsbeeldInfoResource extends Resource {
3735
- constructor(restHandler, store, sbControllerService) {
3746
+ constructor(restHandler, store) {
3736
3747
  super(restHandler);
3737
- this.restHandler = restHandler;
3738
3748
  this.store = store;
3739
- this.sbControllerService = sbControllerService;
3740
3749
  this.subscriptions = new Subscription();
3741
- this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => {
3742
- this.$setUrl(baseUrl);
3743
- sbControllerService.configuration.basePath = baseUrl + '/mst';
3744
- }));
3750
+ this.subscriptions.add(this.store.select('baseUrl').subscribe(baseUrl => this.$setUrl(baseUrl)));
3745
3751
  }
3746
3752
  ngOnDestroy() {
3747
3753
  this.subscriptions.unsubscribe();
3748
3754
  }
3749
- laadSignaleringsbeeldInfo(versie, pplgs) {
3750
- return this.sbControllerService.getSignaleringsbeelden(versie, pplgs);
3751
- }
3752
- 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 }, { token: SbControllerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
3755
+ 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 }); }
3753
3756
  static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource }); }
3754
3757
  };
3758
+ __decorate([
3759
+ ResourceAction({
3760
+ path: '/',
3761
+ method: ResourceRequestMethod.Post
3762
+ })
3763
+ ], SignaleringsbeeldInfoResource.prototype, "laadSignaleringsbeeldInfo", void 0);
3755
3764
  __decorate([
3756
3765
  ResourceAction({
3757
3766
  path: '/valideeriaversie'
@@ -3764,7 +3773,7 @@ SignaleringsbeeldInfoResource = __decorate([
3764
3773
  ], SignaleringsbeeldInfoResource);
3765
3774
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: SignaleringsbeeldInfoResource, decorators: [{
3766
3775
  type: Injectable
3767
- }], ctorParameters: () => [{ type: i1$1.ResourceHandler }, { type: i2$1.Store }, { type: SbControllerService }], propDecorators: { getBestaatIALevering: [] } });
3776
+ }], ctorParameters: () => [{ type: i1$1.ResourceHandler }, { type: i2$1.Store }], propDecorators: { laadSignaleringsbeeldInfo: [], getBestaatIALevering: [] } });
3768
3777
  class SignaleringsbeeldInfoDto extends ResourceModel {
3769
3778
  constructor(data) {
3770
3779
  super();
@@ -4441,7 +4450,7 @@ class LaadRouteFilesEffect {
4441
4450
  bepaalSbDtoPplgs(dtos) {
4442
4451
  const pplgs = [];
4443
4452
  dtos.forEach(dto => {
4444
- dto.pplgs?.forEach(pplg => {
4453
+ dto.pplgs.forEach(pplg => {
4445
4454
  if (!pplgs.includes(pplg)) {
4446
4455
  pplgs.push(pplg);
4447
4456
  }
@@ -4503,7 +4512,7 @@ class LaadSignaleringsbeeldenEffect {
4503
4512
  }).pipe(switchMap(this.getOtherRand.bind(this)), switchMap(this.loadRouteFilesAndSignaleringsbeeldInfo.bind(this)), switchMap(this.loadSignaleringsbeelden.bind(this)), map(this.processSvgsAndUpdateRitdelen.bind(this))))), { dispatch: false });
4504
4513
  }
4505
4514
  handleSignaleringsbeeldInfo({ actie, storeState }) {
4506
- return this.sbiResource.laadSignaleringsbeeldInfo(storeState.iaVersie.versie, actie.pplgs).pipe(take(1), tap((dtos) => this.processResponse({ dtos, storeState, actie })), catchError((err) => {
4515
+ return this.sbiResource.laadSignaleringsbeeldInfo(this.createSignaleringsbeeldInfoQueryDto(actie.pplgs, storeState.iaVersie)).pipe(take(1), tap((dtos) => this.processResponse({ dtos, storeState, actie })), catchError((err) => {
4507
4516
  this.messagesService.showMessage(MessageBuilder.nietGevondenSBI(err));
4508
4517
  return throwError(() => err);
4509
4518
  }));
@@ -4520,7 +4529,7 @@ class LaadSignaleringsbeeldenEffect {
4520
4529
  }
4521
4530
  loadRouteFilesAndSignaleringsbeeldInfo({ otherPplg, rand, storeState }) {
4522
4531
  this.editorService.laadRouteFiles(storeState.iaVersie.versie, [rand.getPPLG(), otherPplg]);
4523
- return this.sbiResource.laadSignaleringsbeeldInfo(storeState.iaVersie.versie, [rand.getPPLG(), otherPplg]).pipe(map(dtos => ({ dtos, storeState })));
4532
+ return this.sbiResource.laadSignaleringsbeeldInfo(this.createSignaleringsbeeldInfoQueryDto([rand.getPPLG(), otherPplg], storeState.iaVersie)).pipe(map(dtos => ({ dtos, storeState })));
4524
4533
  }
4525
4534
  loadSignaleringsbeelden({ dtos, storeState }) {
4526
4535
  return this.editorService.laadSignaleringsbeelden(storeState.iaVersie.versie, dtos).pipe(map(svgDataUrls => ({ svgDataUrls, ritDelen: storeState.ritDelen, dtos })));
@@ -4559,6 +4568,10 @@ class LaadSignaleringsbeeldenEffect {
4559
4568
  this.store.dispatch(updateRitDelen(nieuweRitdelen));
4560
4569
  }, 0);
4561
4570
  }
4571
+ createSignaleringsbeeldInfoQueryDto(pplgs, iainfo) {
4572
+ const datum = iainfo.ingangsDatum && !isNaN(iainfo.ingangsDatum.getTime()) ? iainfo.ingangsDatum.toISOString() : undefined;
4573
+ return { pplgs, versie: iainfo.versie, ingangsDatum: datum };
4574
+ }
4562
4575
  verwerkSvgs(svgDataUrls) {
4563
4576
  this.store.dispatch(SetSvgInfos(this.bepaalSvgInfos(svgDataUrls)));
4564
4577
  }
@@ -4585,7 +4598,7 @@ class LaadSignaleringsbeeldenEffect {
4585
4598
  bepaalZichtbareDtos(visibleRitPplgs, dtos) {
4586
4599
  const visibleDtos = [];
4587
4600
  visibleRitPplgs.forEach(pplg => {
4588
- dtos.filter(dto => dto.pplgs?.includes(pplg)).forEach(dto => {
4601
+ dtos.filter(dto => dto.pplgs.includes(pplg)).forEach(dto => {
4589
4602
  if (!visibleDtos.includes(dto)) {
4590
4603
  visibleDtos.push(dto);
4591
4604
  }
@@ -4601,7 +4614,7 @@ class LaadSignaleringsbeeldenEffect {
4601
4614
  addPrevNonVisibleDto(firstIdx, ritdelen, loadingDtos, visibleRitPplgs, allDtos) {
4602
4615
  if (firstIdx >= 0) {
4603
4616
  const pplg = ritdelen[firstIdx].getPplg();
4604
- const ritdeelDtos = allDtos.filter(dto => dto.pplgs?.includes(pplg)).filter(dto => !loadingDtos.includes(dto));
4617
+ const ritdeelDtos = allDtos.filter(dto => dto.pplgs.includes(pplg)).filter(dto => !loadingDtos.includes(dto));
4605
4618
  if (!visibleRitPplgs.includes(pplg) && ritdeelDtos.length > 0) {
4606
4619
  ritdeelDtos.filter(d => !loadingDtos.includes(d)).forEach(d => {
4607
4620
  d.metVisualisatie = false;
@@ -4616,7 +4629,7 @@ class LaadSignaleringsbeeldenEffect {
4616
4629
  addNextNonVisibleDto(lastIdx, ritdelen, loadingDtos, visibleRitPplgs, allDtos) {
4617
4630
  if (lastIdx <= ritdelen.length - 1) {
4618
4631
  const pplg = ritdelen[lastIdx].getPplg();
4619
- const ritdeelDtos = allDtos.filter(dto => dto.pplgs?.includes(pplg)).filter(dto => !loadingDtos.includes(dto));
4632
+ const ritdeelDtos = allDtos.filter(dto => dto.pplgs.includes(pplg)).filter(dto => !loadingDtos.includes(dto));
4620
4633
  if (!visibleRitPplgs.includes(pplg) && ritdeelDtos.length > 0) {
4621
4634
  ritdeelDtos.filter(d => !loadingDtos.includes(d)).forEach(d => {
4622
4635
  d.metVisualisatie = false;
@@ -4737,11 +4750,9 @@ class LaadSignaleringsbeeldenEffect {
4737
4750
  }
4738
4751
  bevatGevisualiseerdePplg(visibleDtos, pplg) {
4739
4752
  for (const dto of visibleDtos) {
4740
- if (dto.pplgs) {
4741
- for (const dtopplg of dto.pplgs) {
4742
- if (dtopplg === pplg) {
4743
- return true;
4744
- }
4753
+ for (const dtopplg of dto.pplgs) {
4754
+ if (dtopplg === pplg) {
4755
+ return true;
4745
4756
  }
4746
4757
  }
4747
4758
  }
@@ -4791,7 +4802,7 @@ class LaadSignaleringsbeeldenEffect {
4791
4802
  pplgsWindow.push(itemPplg);
4792
4803
  }
4793
4804
  const pplgDtos = [];
4794
- dtos.filter(dto => dto.pplgs?.includes(itemPplg)).forEach(dto => {
4805
+ dtos.filter(dto => dto.pplgs.includes(itemPplg)).forEach(dto => {
4795
4806
  if (!pplgDtos.includes(dto)) {
4796
4807
  pplgDtos.push(dto);
4797
4808
  }