@loxia/mst-viewer 8.1.3-202512161642 → 8.1.3-202512172157
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.
- package/esm2022/generated/openapi/api/api.mjs +26 -0
- package/esm2022/generated/openapi/api/appConfigController.service.mjs +140 -0
- package/esm2022/generated/openapi/api/appConfigController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/bewegingController.service.mjs +155 -0
- package/esm2022/generated/openapi/api/bewegingController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/class0BuildProperties.service.mjs +140 -0
- package/esm2022/generated/openapi/api/class0BuildProperties.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/connectorController.service.mjs +146 -0
- package/esm2022/generated/openapi/api/connectorController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/logController.service.mjs +150 -0
- package/esm2022/generated/openapi/api/logController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/p21Controller.service.mjs +236 -0
- package/esm2022/generated/openapi/api/p21Controller.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/sbController.service.mjs +203 -0
- package/esm2022/generated/openapi/api/sbController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api/svgController.service.mjs +155 -0
- package/esm2022/generated/openapi/api/svgController.serviceInterface.mjs +2 -0
- package/esm2022/generated/openapi/api.module.mjs +40 -0
- package/esm2022/generated/openapi/configuration.mjs +99 -0
- package/esm2022/generated/openapi/encoder.mjs +19 -0
- package/esm2022/generated/openapi/index.mjs +7 -0
- package/esm2022/generated/openapi/model/actieDto.mjs +13 -0
- package/esm2022/generated/openapi/model/algemeneRitDto.mjs +13 -0
- package/esm2022/generated/openapi/model/bewegingDto.mjs +2 -0
- package/esm2022/generated/openapi/model/frontendKeycloakConfig.mjs +13 -0
- package/esm2022/generated/openapi/model/frontendProperties.mjs +2 -0
- package/esm2022/generated/openapi/model/kilometrering.mjs +13 -0
- package/esm2022/generated/openapi/model/logDto.mjs +2 -0
- package/esm2022/generated/openapi/model/models.mjs +18 -0
- package/esm2022/generated/openapi/model/ritRequestDto.mjs +2 -0
- package/esm2022/generated/openapi/model/sein.mjs +10 -0
- package/esm2022/generated/openapi/model/signaleringsElement.mjs +13 -0
- package/esm2022/generated/openapi/model/signaleringsbeeldDto.mjs +13 -0
- package/esm2022/generated/openapi/model/spoornummer.mjs +13 -0
- package/esm2022/generated/openapi/model/spoortakFragment.mjs +2 -0
- package/esm2022/generated/openapi/model/svgInfoDto.mjs +2 -0
- package/esm2022/generated/openapi/model/svgTopology.mjs +2 -0
- package/esm2022/generated/openapi/model/topologyElement.mjs +2 -0
- package/esm2022/generated/openapi/model/wissel.mjs +2 -0
- package/esm2022/generated/openapi/param.mjs +2 -0
- package/esm2022/generated/openapi/variables.mjs +9 -0
- package/esm2022/generated.version.mjs +2 -0
- package/esm2022/lib/atomic-components/message/index.mjs +4 -0
- package/esm2022/lib/atomic-components/message/message.component.mjs +34 -0
- package/esm2022/lib/atomic-components/message/message.mjs +8 -0
- package/esm2022/lib/atomic-components/message/severity.enum.mjs +9 -0
- package/esm2022/lib/atomic-components/messages/messages.component.mjs +20 -0
- package/esm2022/lib/atomic-components/overlay/overlay.component.mjs +11 -0
- package/esm2022/lib/atomic-components/progress-indicator/progress-indicator.component.mjs +11 -0
- package/esm2022/lib/atomic-components/progress-indicator/progress-indicator.entity.mjs +11 -0
- package/esm2022/lib/atomic-components/services/messages.service.mjs +27 -0
- package/esm2022/lib/components/carousel-controls/carousel-controls.component.mjs +39 -0
- package/esm2022/lib/components/mstviewer/mstviewer.component.mjs +116 -0
- package/esm2022/lib/components/ritdelen-lijst/ritdelen-lijst.component.mjs +273 -0
- package/esm2022/lib/components/ritdelen-view/ritdelen-view.component.mjs +103 -0
- package/esm2022/lib/components/rpe/rpe.component.mjs +37 -0
- package/esm2022/lib/components/svg-visualisatie/svg-visualisatie.component.mjs +275 -0
- package/esm2022/lib/components/viewer-controls/viewer-controls.component.mjs +55 -0
- package/esm2022/lib/model/alternatief-rit-deel.mjs +7 -0
- package/esm2022/lib/model/km-range.mjs +39 -0
- package/esm2022/lib/model/melding-event.mjs +7 -0
- package/esm2022/lib/model/nieuwe-route.mjs +10 -0
- package/esm2022/lib/model/ongeplande-actie.mjs +7 -0
- package/esm2022/lib/model/rijwegplan-rijweg-dwang-combinatie.mjs +24 -0
- package/esm2022/lib/model/ritdeel.mjs +205 -0
- package/esm2022/lib/model/sein-op-ritdeel.mjs +7 -0
- package/esm2022/lib/model/wissel-kant-code.mjs +7 -0
- package/esm2022/lib/mst-viewer.module.mjs +144 -0
- package/esm2022/lib/optimo.mjs +9 -0
- package/esm2022/lib/resources/mstlogging.resource.mjs +25 -0
- package/esm2022/lib/resources/signaleringsbeeldinfo.resource.mjs +66 -0
- package/esm2022/lib/services/base-rest.service.mjs +28 -0
- package/esm2022/lib/services/beweging-utils.service.mjs +139 -0
- package/esm2022/lib/services/beweging-verrijker.service.mjs +30 -0
- package/esm2022/lib/services/connector.service.mjs +30 -0
- package/esm2022/lib/services/debug.service.mjs +59 -0
- package/esm2022/lib/services/editor.service.mjs +50 -0
- package/esm2022/lib/services/print-beweging.service.mjs +69 -0
- package/esm2022/lib/services/rit-lezer.service.mjs +104 -0
- package/esm2022/lib/services/signalerings-beeld-manager.service.mjs +92 -0
- package/esm2022/lib/services/viewer-control.service.mjs +84 -0
- package/esm2022/lib/state/actions/actions.mjs +133 -0
- package/esm2022/lib/state/actions/ritdelen.actions.mjs +45 -0
- package/esm2022/lib/state/effect/bepaal-ongeplande-acties.effect.mjs +79 -0
- package/esm2022/lib/state/effect/bepaal-sb-infos.effect.mjs +67 -0
- package/esm2022/lib/state/effect/beweging-invoegen.effect.mjs +73 -0
- package/esm2022/lib/state/effect/delete-ongeplande-actie.effect.mjs +39 -0
- package/esm2022/lib/state/effect/focus-effect.mjs +36 -0
- package/esm2022/lib/state/effect/laad-route-files.effect.mjs +64 -0
- package/esm2022/lib/state/effect/laad-signaleringsbeelden.effect.mjs +361 -0
- package/esm2022/lib/state/effect/rit-goedkeuren.effect.mjs +23 -0
- package/esm2022/lib/state/effect/ritdelen.effect.mjs +113 -0
- package/esm2022/lib/state/effect/svg-view.effect.mjs +89 -0
- package/esm2022/lib/state/mst-editor-state.mjs +88 -0
- package/esm2022/lib/state/reducer/rit-delen.reducer.mjs +62 -0
- package/esm2022/lib/util/actie-helper.mjs +441 -0
- package/esm2022/lib/util/actie-popover-bepaler.mjs +90 -0
- package/esm2022/lib/util/date.service.mjs +17 -0
- package/esm2022/lib/util/logging-helper.mjs +56 -0
- package/esm2022/lib/util/melding-builder.mjs +13 -0
- package/esm2022/lib/util/message-builder.mjs +32 -0
- package/esm2022/lib/util/multi-map.mjs +75 -0
- package/esm2022/lib/util/utils.mjs +35 -0
- package/esm2022/lib/util/zone-util.mjs +33 -0
- package/esm2022/loxia-mst-viewer.mjs +5 -0
- package/esm2022/public-api.mjs +9 -0
- package/esm2022/src/generated/openapi/api/api.mjs +26 -0
- package/esm2022/src/generated/openapi/api/appConfigController.service.mjs +140 -0
- package/esm2022/src/generated/openapi/api/appConfigController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/bewegingController.service.mjs +155 -0
- package/esm2022/src/generated/openapi/api/bewegingController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/class0BuildProperties.service.mjs +140 -0
- package/esm2022/src/generated/openapi/api/class0BuildProperties.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/connectorController.service.mjs +146 -0
- package/esm2022/src/generated/openapi/api/connectorController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/logController.service.mjs +150 -0
- package/esm2022/src/generated/openapi/api/logController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/p21Controller.service.mjs +236 -0
- package/esm2022/src/generated/openapi/api/p21Controller.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/sbController.service.mjs +203 -0
- package/esm2022/src/generated/openapi/api/sbController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api/svgController.service.mjs +155 -0
- package/esm2022/src/generated/openapi/api/svgController.serviceInterface.mjs +2 -0
- package/esm2022/src/generated/openapi/api.module.mjs +40 -0
- package/esm2022/src/generated/openapi/configuration.mjs +99 -0
- package/esm2022/src/generated/openapi/encoder.mjs +19 -0
- package/esm2022/src/generated/openapi/index.mjs +7 -0
- package/esm2022/src/generated/openapi/loxia-mst-viewer-src-generated-openapi.mjs +5 -0
- package/esm2022/src/generated/openapi/model/actieDto.mjs +13 -0
- package/esm2022/src/generated/openapi/model/algemeneRitDto.mjs +13 -0
- package/esm2022/src/generated/openapi/model/bewegingDto.mjs +2 -0
- package/esm2022/src/generated/openapi/model/frontendKeycloakConfig.mjs +13 -0
- package/esm2022/src/generated/openapi/model/frontendProperties.mjs +2 -0
- package/esm2022/src/generated/openapi/model/kilometrering.mjs +13 -0
- package/esm2022/src/generated/openapi/model/logDto.mjs +2 -0
- package/esm2022/src/generated/openapi/model/models.mjs +18 -0
- package/esm2022/src/generated/openapi/model/ritRequestDto.mjs +2 -0
- package/esm2022/src/generated/openapi/model/sein.mjs +10 -0
- package/esm2022/src/generated/openapi/model/signaleringsElement.mjs +13 -0
- package/esm2022/src/generated/openapi/model/signaleringsbeeldDto.mjs +13 -0
- package/esm2022/src/generated/openapi/model/spoornummer.mjs +13 -0
- package/esm2022/src/generated/openapi/model/spoortakFragment.mjs +2 -0
- package/esm2022/src/generated/openapi/model/svgInfoDto.mjs +2 -0
- package/esm2022/src/generated/openapi/model/svgTopology.mjs +2 -0
- package/esm2022/src/generated/openapi/model/topologyElement.mjs +2 -0
- package/esm2022/src/generated/openapi/model/wissel.mjs +2 -0
- package/esm2022/src/generated/openapi/param.mjs +2 -0
- package/esm2022/src/generated/openapi/variables.mjs +9 -0
- package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs +224 -43
- package/fesm2022/loxia-mst-viewer-src-generated-openapi.mjs.map +1 -1
- package/fesm2022/loxia-mst-viewer.mjs +774 -533
- package/fesm2022/loxia-mst-viewer.mjs.map +1 -1
- package/generated/openapi/api/api.d.ts +25 -0
- package/generated/openapi/api/appConfigController.service.d.ts +38 -0
- package/generated/openapi/api/appConfigController.serviceInterface.d.ts +24 -0
- package/generated/openapi/api/bewegingController.service.d.ts +40 -0
- package/generated/openapi/api/bewegingController.serviceInterface.d.ts +27 -0
- package/generated/openapi/api/class0BuildProperties.service.d.ts +36 -0
- package/generated/openapi/api/class0BuildProperties.serviceInterface.d.ts +23 -0
- package/generated/openapi/api/connectorController.service.d.ts +38 -0
- package/generated/openapi/api/connectorController.serviceInterface.d.ts +25 -0
- package/generated/openapi/api/logController.service.d.ts +38 -0
- package/generated/openapi/api/logController.serviceInterface.d.ts +25 -0
- package/generated/openapi/api/p21Controller.service.d.ts +62 -0
- package/generated/openapi/api/p21Controller.serviceInterface.d.ts +30 -0
- package/generated/openapi/api/sbController.service.d.ts +60 -0
- package/generated/openapi/api/sbController.serviceInterface.d.ts +32 -0
- package/generated/openapi/api/svgController.service.d.ts +40 -0
- package/generated/openapi/api/svgController.serviceInterface.d.ts +27 -0
- package/generated/openapi/api.module.d.ts +11 -0
- package/generated/openapi/configuration.d.ts +104 -0
- package/generated/openapi/encoder.d.ts +11 -0
- package/generated/openapi/index.d.ts +6 -0
- package/generated/openapi/model/actieDto.d.ts +35 -0
- package/generated/openapi/model/algemeneRitDto.d.ts +20 -0
- package/generated/openapi/model/bewegingDto.d.ts +37 -0
- package/generated/openapi/model/frontendKeycloakConfig.d.ts +16 -0
- package/generated/openapi/model/frontendProperties.d.ts +15 -0
- package/generated/openapi/model/kilometrering.d.ts +15 -0
- package/generated/openapi/model/logDto.d.ts +22 -0
- package/generated/openapi/model/models.d.ts +17 -0
- package/generated/openapi/model/ritRequestDto.d.ts +17 -0
- package/generated/openapi/model/sein.d.ts +46 -0
- package/generated/openapi/model/signaleringsElement.d.ts +16 -0
- package/generated/openapi/model/signaleringsbeeldDto.d.ts +16 -0
- package/generated/openapi/model/spoornummer.d.ts +17 -0
- package/generated/openapi/model/spoortakFragment.d.ts +26 -0
- package/generated/openapi/model/svgInfoDto.d.ts +16 -0
- package/generated/openapi/model/svgTopology.d.ts +21 -0
- package/generated/openapi/model/topologyElement.d.ts +18 -0
- package/generated/openapi/model/wissel.d.ts +31 -0
- package/generated/openapi/param.d.ts +37 -0
- package/generated/openapi/variables.d.ts +8 -0
- package/generated.version.d.ts +1 -0
- package/index.d.ts +3 -1079
- package/lib/atomic-components/message/index.d.ts +3 -0
- package/lib/atomic-components/message/message.component.d.ts +12 -0
- package/lib/atomic-components/message/message.d.ts +7 -0
- package/lib/atomic-components/message/severity.enum.d.ts +7 -0
- package/lib/atomic-components/messages/messages.component.d.ts +9 -0
- package/lib/atomic-components/overlay/overlay.component.d.ts +5 -0
- package/lib/atomic-components/progress-indicator/progress-indicator.component.d.ts +5 -0
- package/lib/atomic-components/progress-indicator/progress-indicator.entity.d.ts +6 -0
- package/lib/atomic-components/services/messages.service.d.ts +12 -0
- package/lib/components/carousel-controls/carousel-controls.component.d.ts +19 -0
- package/lib/components/mstviewer/mstviewer.component.d.ts +39 -0
- package/lib/components/ritdelen-lijst/ritdelen-lijst.component.d.ts +72 -0
- package/lib/components/ritdelen-view/ritdelen-view.component.d.ts +33 -0
- package/lib/components/rpe/rpe.component.d.ts +11 -0
- package/lib/components/svg-visualisatie/svg-visualisatie.component.d.ts +56 -0
- package/lib/components/viewer-controls/viewer-controls.component.d.ts +26 -0
- package/lib/model/alternatief-rit-deel.d.ts +7 -0
- package/lib/model/km-range.d.ts +13 -0
- package/lib/model/melding-event.d.ts +5 -0
- package/lib/model/nieuwe-route.d.ts +8 -0
- package/lib/model/ongeplande-actie.d.ts +6 -0
- package/lib/model/rijwegplan-rijweg-dwang-combinatie.d.ts +12 -0
- package/lib/model/ritdeel.d.ts +62 -0
- package/lib/model/sein-op-ritdeel.d.ts +7 -0
- package/lib/model/wissel-kant-code.d.ts +5 -0
- package/lib/mst-viewer.module.d.ts +34 -0
- package/lib/optimo.d.ts +69 -0
- package/lib/resources/mstlogging.resource.d.ts +15 -0
- package/lib/resources/signaleringsbeeldinfo.resource.d.ts +31 -0
- package/lib/services/base-rest.service.d.ts +16 -0
- package/lib/services/beweging-utils.service.d.ts +25 -0
- package/lib/services/beweging-verrijker.service.d.ts +11 -0
- package/lib/services/connector.service.d.ts +10 -0
- package/lib/services/debug.service.d.ts +15 -0
- package/lib/services/editor.service.d.ts +23 -0
- package/lib/services/print-beweging.service.d.ts +16 -0
- package/lib/services/rit-lezer.service.d.ts +22 -0
- package/lib/services/signalerings-beeld-manager.service.d.ts +29 -0
- package/lib/services/viewer-control.service.d.ts +27 -0
- package/lib/state/actions/actions.d.ts +276 -0
- package/lib/state/actions/ritdelen.actions.d.ts +97 -0
- package/lib/state/effect/bepaal-ongeplande-acties.effect.d.ts +24 -0
- package/lib/state/effect/bepaal-sb-infos.effect.d.ts +23 -0
- package/lib/state/effect/beweging-invoegen.effect.d.ts +17 -0
- package/lib/state/effect/delete-ongeplande-actie.effect.d.ts +15 -0
- package/lib/state/effect/focus-effect.d.ts +17 -0
- package/lib/state/effect/laad-route-files.effect.d.ts +27 -0
- package/lib/state/effect/laad-signaleringsbeelden.effect.d.ts +58 -0
- package/lib/state/effect/rit-goedkeuren.effect.d.ts +17 -0
- package/lib/state/effect/ritdelen.effect.d.ts +33 -0
- package/lib/state/effect/svg-view.effect.d.ts +23 -0
- package/lib/state/mst-editor-state.d.ts +71 -0
- package/lib/state/reducer/rit-delen.reducer.d.ts +4 -0
- package/lib/util/actie-helper.d.ts +117 -0
- package/lib/util/actie-popover-bepaler.d.ts +14 -0
- package/lib/util/date.service.d.ts +6 -0
- package/lib/util/logging-helper.d.ts +16 -0
- package/lib/util/melding-builder.d.ts +8 -0
- package/lib/util/message-builder.d.ts +13 -0
- package/lib/util/multi-map.d.ts +39 -0
- package/lib/util/utils.d.ts +3 -0
- package/lib/util/zone-util.d.ts +11 -0
- package/package.json +10 -6
- package/public-api.d.ts +5 -0
- package/src/generated/openapi/api/api.d.ts +25 -0
- package/src/generated/openapi/api/appConfigController.service.d.ts +38 -0
- package/src/generated/openapi/api/appConfigController.serviceInterface.d.ts +24 -0
- package/src/generated/openapi/api/bewegingController.service.d.ts +40 -0
- package/src/generated/openapi/api/bewegingController.serviceInterface.d.ts +27 -0
- package/src/generated/openapi/api/class0BuildProperties.service.d.ts +36 -0
- package/src/generated/openapi/api/class0BuildProperties.serviceInterface.d.ts +23 -0
- package/src/generated/openapi/api/connectorController.service.d.ts +38 -0
- package/src/generated/openapi/api/connectorController.serviceInterface.d.ts +25 -0
- package/src/generated/openapi/api/logController.service.d.ts +38 -0
- package/src/generated/openapi/api/logController.serviceInterface.d.ts +25 -0
- package/src/generated/openapi/api/p21Controller.service.d.ts +62 -0
- package/src/generated/openapi/api/p21Controller.serviceInterface.d.ts +30 -0
- package/src/generated/openapi/api/sbController.service.d.ts +60 -0
- package/src/generated/openapi/api/sbController.serviceInterface.d.ts +32 -0
- package/src/generated/openapi/api/svgController.service.d.ts +40 -0
- package/src/generated/openapi/api/svgController.serviceInterface.d.ts +27 -0
- package/src/generated/openapi/api.module.d.ts +11 -0
- package/src/generated/openapi/configuration.d.ts +104 -0
- package/src/generated/openapi/encoder.d.ts +11 -0
- package/src/generated/openapi/index.d.ts +6 -825
- package/src/generated/openapi/model/actieDto.d.ts +35 -0
- package/src/generated/openapi/model/algemeneRitDto.d.ts +20 -0
- package/src/generated/openapi/model/bewegingDto.d.ts +37 -0
- package/src/generated/openapi/model/frontendKeycloakConfig.d.ts +16 -0
- package/src/generated/openapi/model/frontendProperties.d.ts +15 -0
- package/src/generated/openapi/model/kilometrering.d.ts +15 -0
- package/src/generated/openapi/model/logDto.d.ts +22 -0
- package/src/generated/openapi/model/models.d.ts +17 -0
- package/src/generated/openapi/model/ritRequestDto.d.ts +17 -0
- package/src/generated/openapi/model/sein.d.ts +46 -0
- package/src/generated/openapi/model/signaleringsElement.d.ts +16 -0
- package/src/generated/openapi/model/signaleringsbeeldDto.d.ts +16 -0
- package/src/generated/openapi/model/spoornummer.d.ts +17 -0
- package/src/generated/openapi/model/spoortakFragment.d.ts +26 -0
- package/src/generated/openapi/model/svgInfoDto.d.ts +16 -0
- package/src/generated/openapi/model/svgTopology.d.ts +21 -0
- package/src/generated/openapi/model/topologyElement.d.ts +18 -0
- package/src/generated/openapi/model/wissel.d.ts +31 -0
- package/src/generated/openapi/param.d.ts +37 -0
- package/src/generated/openapi/variables.d.ts +8 -0
- package/tailwind.scss +4 -0
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { ArrayMultimap } from '../util/multi-map';
|
|
3
|
+
import * as i0 from "@angular/core";
|
|
4
|
+
import * as i1 from "./editor.service";
|
|
5
|
+
export class BewegingUtils {
|
|
6
|
+
static { this.GEWIJZIGD = 'Gewijzigd'; }
|
|
7
|
+
static { this.TOEGEVOEGD = 'Toegevoegd'; }
|
|
8
|
+
static { this.NORMAAL = 'Normaal'; }
|
|
9
|
+
static { this.SEIN_TYPE_FICTIEF = 'FICTIEF'; }
|
|
10
|
+
static { this.SPOOR_NAAR_VRIJEBAAN_POSTFIX = '_e'; }
|
|
11
|
+
constructor(editorService) {
|
|
12
|
+
this.editorService = editorService;
|
|
13
|
+
}
|
|
14
|
+
extractBewegingenUitRitdelen(ritDelen, origineleBewegingen) {
|
|
15
|
+
const retval = [];
|
|
16
|
+
retval.length = ritDelen.length;
|
|
17
|
+
const origineleBewegingMap = this.bepaalOrigineleBewegingMap(origineleBewegingen);
|
|
18
|
+
let vorigeBeweging = undefined;
|
|
19
|
+
for (let i = 0; i < ritDelen.length; i++) {
|
|
20
|
+
const ritdeel = ritDelen[i];
|
|
21
|
+
if (ritdeel.beweging) {
|
|
22
|
+
retval[i] = ritdeel.beweging;
|
|
23
|
+
const nieuwDwangNummer = BewegingUtils.toRouteFileDwangNummer(ritdeel.getDwangNummer());
|
|
24
|
+
if (BewegingUtils.isGewijzigd(ritdeel, nieuwDwangNummer, origineleBewegingMap)) {
|
|
25
|
+
retval[i].wijzigStatus = BewegingUtils.GEWIJZIGD;
|
|
26
|
+
retval[i].dwangNummer = nieuwDwangNummer;
|
|
27
|
+
ritdeel.beweging.ritActies = ritdeel.acties;
|
|
28
|
+
BewegingUtils.removeKerenExtensie(retval[i]);
|
|
29
|
+
BewegingUtils.removeKerenExtensie(vorigeBeweging);
|
|
30
|
+
}
|
|
31
|
+
else if (i === ritDelen.length - 1 && BewegingUtils.bewegingenZijnGewijzigd(ritDelen, origineleBewegingen)) {
|
|
32
|
+
BewegingUtils.removeKerenExtensie(retval[i]);
|
|
33
|
+
}
|
|
34
|
+
else if (retval[i].wijzigStatus === BewegingUtils.TOEGEVOEGD) {
|
|
35
|
+
BewegingUtils.removeKerenExtensie(vorigeBeweging);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
retval[i] = this.maakBeweging(ritdeel);
|
|
40
|
+
}
|
|
41
|
+
retval[i].volgnummerBinnenRit = i + 1;
|
|
42
|
+
vorigeBeweging = ritdeel.beweging;
|
|
43
|
+
}
|
|
44
|
+
return retval;
|
|
45
|
+
}
|
|
46
|
+
static bewegingenZijnGewijzigd(ritDelen, origineleBewegingen) {
|
|
47
|
+
const ritDelenArray = ritDelen
|
|
48
|
+
.filter(r => r.beweging?.id)
|
|
49
|
+
.map(r => r.beweging.id)
|
|
50
|
+
.sort((a, b) => a - b);
|
|
51
|
+
const bewegingenIdArray = origineleBewegingen.map(b => b.id).sort((a, b) => a - b);
|
|
52
|
+
return JSON.stringify(ritDelenArray) !== JSON.stringify(bewegingenIdArray);
|
|
53
|
+
}
|
|
54
|
+
static removeKerenExtensie(beweging) {
|
|
55
|
+
if (beweging && this.containsExtensie('_k', beweging.naarSpoor)) {
|
|
56
|
+
beweging.naarSpoor = beweging.naarSpoor.split('_k')[0];
|
|
57
|
+
beweging.wijzigStatus = this.GEWIJZIGD;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
static containsExtensie(match, stringToCheck) {
|
|
61
|
+
return stringToCheck.indexOf(match) !== -1;
|
|
62
|
+
}
|
|
63
|
+
static isGewijzigd(ritdeel, nieuwDwangNummer, origineleBewegingenMap) {
|
|
64
|
+
const dwangGewijzigd = ritdeel.beweging?.dwangNummer !== nieuwDwangNummer;
|
|
65
|
+
let gewijzigd = false;
|
|
66
|
+
if (ritdeel.beweging?.wijzigStatus === this.NORMAAL) {
|
|
67
|
+
const origineleBewegingActies = origineleBewegingenMap.get(ritdeel.beweging.id);
|
|
68
|
+
const huidigeActies = this.createSortedActieIdList(ritdeel.acties);
|
|
69
|
+
gewijzigd = JSON.stringify(huidigeActies) !== JSON.stringify(origineleBewegingActies);
|
|
70
|
+
}
|
|
71
|
+
return dwangGewijzigd || gewijzigd;
|
|
72
|
+
}
|
|
73
|
+
bepaalOrigineleBewegingMap(origineleBewegingen) {
|
|
74
|
+
const bewegingMap = new ArrayMultimap();
|
|
75
|
+
origineleBewegingen.forEach(b => {
|
|
76
|
+
const actieIds = BewegingUtils.createSortedActieIdList(b.ritActies);
|
|
77
|
+
bewegingMap.putAll(b.id, actieIds);
|
|
78
|
+
});
|
|
79
|
+
return bewegingMap;
|
|
80
|
+
}
|
|
81
|
+
static createSortedActieIdList(acties) {
|
|
82
|
+
return acties.map(actie => actie.id).sort((a, b) => a - b);
|
|
83
|
+
}
|
|
84
|
+
maakBeweging(newRitdeel) {
|
|
85
|
+
const eindSein = newRitdeel.getRoute().getEindSein();
|
|
86
|
+
let naarSeinNaam;
|
|
87
|
+
let naarSeinPplg;
|
|
88
|
+
let naarSpoor = newRitdeel.getNaarPrlSpoor();
|
|
89
|
+
if (eindSein.getTypeAlsString() === BewegingUtils.SEIN_TYPE_FICTIEF) {
|
|
90
|
+
if (newRitdeel.heeftVrijebaanInfo() && newRitdeel.getVrijebaanRijweg()) {
|
|
91
|
+
const vbEindSein = newRitdeel.getVrijebaanRijweg().getEindSein();
|
|
92
|
+
naarSeinNaam = vbEindSein.getName();
|
|
93
|
+
naarSeinPplg = vbEindSein.getPPLG();
|
|
94
|
+
naarSpoor += BewegingUtils.SPOOR_NAAR_VRIJEBAAN_POSTFIX;
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
const rijwegplan = this.editorService.getRijwegplan(newRitdeel.getPplg());
|
|
98
|
+
const rijwegAndereRichting = rijwegplan.getRijweg(newRitdeel.getVisueelNaarPrlSpoor(), newRitdeel.getVanPrlSpoor());
|
|
99
|
+
const startSeinInAndereRichting = rijwegAndereRichting.getBeginSein();
|
|
100
|
+
naarSeinNaam = startSeinInAndereRichting.getName();
|
|
101
|
+
naarSeinPplg = startSeinInAndereRichting.getPPLG();
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
naarSeinNaam = eindSein.getName();
|
|
106
|
+
naarSeinPplg = eindSein.getPPLG();
|
|
107
|
+
}
|
|
108
|
+
return BewegingUtils.vulBeweging(newRitdeel, naarSeinNaam, naarSeinPplg, naarSpoor);
|
|
109
|
+
}
|
|
110
|
+
static vulBeweging(newRitdeel, naarSeinNaam, naarSeinPplg, naarSpoor) {
|
|
111
|
+
return {
|
|
112
|
+
id: 0,
|
|
113
|
+
ritId: 0,
|
|
114
|
+
volgnummerBinnenRit: -1,
|
|
115
|
+
vanSeinType: 'BED_SEIN',
|
|
116
|
+
vanSeinNaam: newRitdeel.getRoute().getBeginSein().getName(),
|
|
117
|
+
vanSeinPplg: newRitdeel.getRoute().getBeginSein().getPPLG(),
|
|
118
|
+
naarSeinType: 'BED_SEIN',
|
|
119
|
+
naarSeinNaam,
|
|
120
|
+
naarSeinPplg,
|
|
121
|
+
dwangNummer: BewegingUtils.toRouteFileDwangNummer(newRitdeel.getDwangNummer()),
|
|
122
|
+
vanPplg: newRitdeel.getPplg(),
|
|
123
|
+
vanSpoor: newRitdeel.getVanPrlSpoor(),
|
|
124
|
+
naarPplg: newRitdeel.getPplg(),
|
|
125
|
+
naarSpoor,
|
|
126
|
+
ritActies: [],
|
|
127
|
+
wijzigStatus: this.TOEGEVOEGD
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
static toRouteFileDwangNummer(dwangNummer) {
|
|
131
|
+
return (dwangNummer === 0) ? -1 : dwangNummer;
|
|
132
|
+
}
|
|
133
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingUtils, deps: [{ token: i1.EditorService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
134
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingUtils }); }
|
|
135
|
+
}
|
|
136
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingUtils, decorators: [{
|
|
137
|
+
type: Injectable
|
|
138
|
+
}], ctorParameters: () => [{ type: i1.EditorService }] });
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"beweging-utils.service.js","sourceRoot":"","sources":["../../../../../projects/mst-viewer/src/lib/services/beweging-utils.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Ritdeel } from '../model/ritdeel';\nimport { Actie, Beweging } from '../optimo';\nimport { ArrayMultimap } from '../util/multi-map';\nimport { EditorService } from './editor.service';\n\n@Injectable()\nexport class BewegingUtils {\n    static readonly GEWIJZIGD = 'Gewijzigd';\n    static readonly TOEGEVOEGD = 'Toegevoegd';\n    static readonly NORMAAL = 'Normaal';\n    private static readonly SEIN_TYPE_FICTIEF = 'FICTIEF';\n    private static readonly SPOOR_NAAR_VRIJEBAAN_POSTFIX = '_e';\n\n    constructor(private readonly editorService: EditorService) {\n    }\n\n    public extractBewegingenUitRitdelen(ritDelen: Ritdeel[], origineleBewegingen: Beweging[]): Beweging[] {\n        const retval: Beweging[] = [];\n        retval.length = ritDelen.length;\n\n        const origineleBewegingMap = this.bepaalOrigineleBewegingMap(origineleBewegingen);\n\n        let vorigeBeweging: Beweging | undefined = undefined;\n        for (let i = 0; i < ritDelen.length; i++) {\n            const ritdeel = ritDelen[i];\n            if (ritdeel.beweging) {\n                retval[i] = ritdeel.beweging;\n                const nieuwDwangNummer = BewegingUtils.toRouteFileDwangNummer(ritdeel.getDwangNummer());\n                if (BewegingUtils.isGewijzigd(ritdeel, nieuwDwangNummer, origineleBewegingMap)) {\n                    retval[i].wijzigStatus = BewegingUtils.GEWIJZIGD;\n                    retval[i].dwangNummer = nieuwDwangNummer;\n                    ritdeel.beweging.ritActies = ritdeel.acties;\n                    BewegingUtils.removeKerenExtensie(retval[i]);\n                    BewegingUtils.removeKerenExtensie(vorigeBeweging);\n                } else if (i === ritDelen.length - 1 && BewegingUtils.bewegingenZijnGewijzigd(ritDelen, origineleBewegingen)) {\n                    BewegingUtils.removeKerenExtensie(retval[i]);\n                } else if (retval[i].wijzigStatus === BewegingUtils.TOEGEVOEGD) {\n                    BewegingUtils.removeKerenExtensie(vorigeBeweging);\n                }\n            } else {\n                retval[i] = this.maakBeweging(ritdeel);\n            }\n            retval[i].volgnummerBinnenRit = i + 1;\n            vorigeBeweging = ritdeel.beweging;\n        }\n        return retval;\n    }\n\n    private static bewegingenZijnGewijzigd(ritDelen: Ritdeel[], origineleBewegingen: Beweging[]): boolean {\n        const ritDelenArray = ritDelen\n            .filter(r => r.beweging?.id)\n            .map(r => r.beweging!.id)\n            .sort((a, b) => a - b);\n\n        const bewegingenIdArray = origineleBewegingen.map(b => b.id).sort((a, b) => a - b);\n        return JSON.stringify(ritDelenArray) !== JSON.stringify(bewegingenIdArray);\n    }\n\n    private static removeKerenExtensie(beweging: Beweging | undefined): void {\n        if (beweging && this.containsExtensie('_k', beweging.naarSpoor)) {\n            beweging.naarSpoor = beweging.naarSpoor.split('_k')[0];\n            beweging.wijzigStatus = this.GEWIJZIGD;\n        }\n    }\n\n    static containsExtensie(match: string, stringToCheck: string): boolean {\n        return stringToCheck.indexOf(match) !== -1;\n    }\n\n    private static isGewijzigd(ritdeel: Ritdeel, nieuwDwangNummer: number, origineleBewegingenMap: ArrayMultimap<number, number>): boolean {\n        const dwangGewijzigd = ritdeel.beweging?.dwangNummer !== nieuwDwangNummer;\n        let gewijzigd = false;\n        if (ritdeel.beweging?.wijzigStatus === this.NORMAAL) {\n            const origineleBewegingActies = origineleBewegingenMap.get(ritdeel.beweging.id);\n            const huidigeActies = this.createSortedActieIdList(ritdeel.acties);\n            gewijzigd = JSON.stringify(huidigeActies) !== JSON.stringify(origineleBewegingActies);\n        }\n        return dwangGewijzigd || gewijzigd;\n    }\n\n    private bepaalOrigineleBewegingMap(origineleBewegingen: Beweging[]): ArrayMultimap<number, number> {\n        const bewegingMap = new ArrayMultimap<number, number>();\n        origineleBewegingen.forEach(b => {\n            const actieIds = BewegingUtils.createSortedActieIdList(b.ritActies);\n            bewegingMap.putAll(b.id, actieIds);\n        });\n        return bewegingMap;\n    }\n\n    private static createSortedActieIdList(acties: Actie[]): number[] {\n        return acties.map(actie => actie.id).sort((a, b) => a - b);\n    }\n\n    public maakBeweging(newRitdeel: Ritdeel): Beweging {\n        const eindSein = newRitdeel.getRoute().getEindSein();\n\n        let naarSeinNaam;\n        let naarSeinPplg;\n        let naarSpoor = newRitdeel.getNaarPrlSpoor();\n        if (eindSein.getTypeAlsString() === BewegingUtils.SEIN_TYPE_FICTIEF) {\n            if (newRitdeel.heeftVrijebaanInfo() && newRitdeel.getVrijebaanRijweg()) {\n                const vbEindSein = newRitdeel.getVrijebaanRijweg()!.getEindSein();\n                naarSeinNaam = vbEindSein.getName();\n                naarSeinPplg = vbEindSein.getPPLG();\n                naarSpoor += BewegingUtils.SPOOR_NAAR_VRIJEBAAN_POSTFIX;\n            } else {\n                const rijwegplan = this.editorService.getRijwegplan(newRitdeel.getPplg());\n                const rijwegAndereRichting = rijwegplan.getRijweg(newRitdeel.getVisueelNaarPrlSpoor(), newRitdeel.getVanPrlSpoor());\n                const startSeinInAndereRichting = rijwegAndereRichting.getBeginSein();\n                naarSeinNaam = startSeinInAndereRichting.getName();\n                naarSeinPplg = startSeinInAndereRichting.getPPLG();\n            }\n        } else {\n            naarSeinNaam = eindSein.getName();\n            naarSeinPplg = eindSein.getPPLG();\n        }\n        return BewegingUtils.vulBeweging(newRitdeel, naarSeinNaam, naarSeinPplg, naarSpoor);\n    }\n\n    private static vulBeweging(newRitdeel: Ritdeel, naarSeinNaam: string, naarSeinPplg: string, naarSpoor: string): Beweging {\n        return {\n            id: 0,\n            ritId: 0,\n            volgnummerBinnenRit: -1,\n            vanSeinType: 'BED_SEIN',\n            vanSeinNaam: newRitdeel.getRoute().getBeginSein().getName(),\n            vanSeinPplg: newRitdeel.getRoute().getBeginSein().getPPLG(),\n            naarSeinType: 'BED_SEIN',\n            naarSeinNaam,\n            naarSeinPplg,\n            dwangNummer: BewegingUtils.toRouteFileDwangNummer(newRitdeel.getDwangNummer()),\n            vanPplg: newRitdeel.getPplg(),\n            vanSpoor: newRitdeel.getVanPrlSpoor(),\n            naarPplg: newRitdeel.getPplg(),\n            naarSpoor,\n            ritActies: [],\n            wijzigStatus: this.TOEGEVOEGD\n        };\n    }\n\n    private static toRouteFileDwangNummer(dwangNummer: number): number {\n        return (dwangNummer === 0) ? -1 : dwangNummer;\n    }\n}\n"]}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { HttpHeaders } from '@angular/common/http';
|
|
2
|
+
import { Injectable } from '@angular/core';
|
|
3
|
+
import { catchError } from 'rxjs/operators';
|
|
4
|
+
import { ClearProgress } from '../state/actions/actions';
|
|
5
|
+
import { BaseRestService } from './base-rest.service';
|
|
6
|
+
import * as i0 from "@angular/core";
|
|
7
|
+
export class BewegingVerrijkerService extends BaseRestService {
|
|
8
|
+
getBewegingen(bewegingen, ongeplandeActies) {
|
|
9
|
+
return this.httpClient.put(this.getUrl(this.iaVersie), { bewegingen, ongeplandeActies }, { headers: new HttpHeaders().set('Accept', 'application/json').append('Content-Type', 'application/json') })
|
|
10
|
+
.pipe(catchError((err, _caught) => this.errorHandler(err)));
|
|
11
|
+
}
|
|
12
|
+
getUrl(iaVersie) {
|
|
13
|
+
return `${this.baseUrl}/mst/rest/beweging/${iaVersie}`;
|
|
14
|
+
}
|
|
15
|
+
errorHandler(error) {
|
|
16
|
+
// eslint-disable-next-line no-console
|
|
17
|
+
console.log('error bij verrijken', error);
|
|
18
|
+
this.store.dispatch(ClearProgress());
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingVerrijkerService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
22
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingVerrijkerService, providedIn: 'root' }); }
|
|
23
|
+
}
|
|
24
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: BewegingVerrijkerService, decorators: [{
|
|
25
|
+
type: Injectable,
|
|
26
|
+
args: [{
|
|
27
|
+
providedIn: 'root'
|
|
28
|
+
}]
|
|
29
|
+
}] });
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmV3ZWdpbmctdmVycmlqa2VyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tc3Qtdmlld2VyL3NyYy9saWIvc2VydmljZXMvYmV3ZWdpbmctdmVycmlqa2VyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRTVDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0scUJBQXFCLENBQUM7O0FBS3RELE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxlQUFlO0lBRWxELGFBQWEsQ0FBQyxVQUFzQixFQUFFLGdCQUF5QjtRQUNsRSxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUN0QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFDMUIsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsRUFDaEMsRUFBRSxPQUFPLEVBQUUsSUFBSSxXQUFXLEVBQUUsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLGtCQUFrQixDQUFDLENBQUMsTUFBTSxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxFQUFFLENBQUM7YUFDcEcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFTyxNQUFNLENBQUMsUUFBZ0I7UUFDM0IsT0FBTyxHQUFJLElBQUksQ0FBQyxPQUFRLHNCQUF1QixRQUFTLEVBQUUsQ0FBQztJQUMvRCxDQUFDO0lBRUQsWUFBWSxDQUFDLEtBQVU7UUFDbkIsc0NBQXNDO1FBQ3RDLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDMUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztRQUNyQyxPQUFPLEVBQUUsQ0FBQztJQUNkLENBQUM7K0dBbkJRLHdCQUF3QjttSEFBeEIsd0JBQXdCLGNBRnJCLE1BQU07OzRGQUVULHdCQUF3QjtrQkFIcEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBIdHRwSGVhZGVycyB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBY3RpZSwgQmV3ZWdpbmcgfSBmcm9tICcuLi9vcHRpbW8nO1xuaW1wb3J0IHsgQ2xlYXJQcm9ncmVzcyB9IGZyb20gJy4uL3N0YXRlL2FjdGlvbnMvYWN0aW9ucyc7XG5pbXBvcnQgeyBCYXNlUmVzdFNlcnZpY2UgfSBmcm9tICcuL2Jhc2UtcmVzdC5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoe1xuICAgIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBCZXdlZ2luZ1ZlcnJpamtlclNlcnZpY2UgZXh0ZW5kcyBCYXNlUmVzdFNlcnZpY2Uge1xuXG4gICAgcHVibGljIGdldEJld2VnaW5nZW4oYmV3ZWdpbmdlbjogQmV3ZWdpbmdbXSwgb25nZXBsYW5kZUFjdGllczogQWN0aWVbXSk6IE9ic2VydmFibGU8QmV3ZWdpbmdbXT4ge1xuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LnB1dDxCZXdlZ2luZ1tdPihcbiAgICAgICAgICAgIHRoaXMuZ2V0VXJsKHRoaXMuaWFWZXJzaWUpLFxuICAgICAgICAgICAgeyBiZXdlZ2luZ2VuLCBvbmdlcGxhbmRlQWN0aWVzIH0sXG4gICAgICAgICAgICB7IGhlYWRlcnM6IG5ldyBIdHRwSGVhZGVycygpLnNldCgnQWNjZXB0JywgJ2FwcGxpY2F0aW9uL2pzb24nKS5hcHBlbmQoJ0NvbnRlbnQtVHlwZScsICdhcHBsaWNhdGlvbi9qc29uJykgfSlcbiAgICAgICAgICAgICAgICAgICAucGlwZShjYXRjaEVycm9yKChlcnIsIF9jYXVnaHQpID0+IHRoaXMuZXJyb3JIYW5kbGVyKGVycikpKTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGdldFVybChpYVZlcnNpZTogc3RyaW5nKTogc3RyaW5nIHtcbiAgICAgICAgcmV0dXJuIGAkeyB0aGlzLmJhc2VVcmwgfS9tc3QvcmVzdC9iZXdlZ2luZy8keyBpYVZlcnNpZSB9YDtcbiAgICB9XG5cbiAgICBlcnJvckhhbmRsZXIoZXJyb3I6IGFueSk6IFtdIHtcbiAgICAgICAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIG5vLWNvbnNvbGVcbiAgICAgICAgY29uc29sZS5sb2coJ2Vycm9yIGJpaiB2ZXJyaWprZW4nLCBlcnJvcik7XG4gICAgICAgIHRoaXMuc3RvcmUuZGlzcGF0Y2goQ2xlYXJQcm9ncmVzcygpKTtcbiAgICAgICAgcmV0dXJuIFtdO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { catchError } from 'rxjs/operators';
|
|
3
|
+
import { ClearProgress } from '../state/actions/actions';
|
|
4
|
+
import { BaseRestService } from './base-rest.service';
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
export class ConnectorService extends BaseRestService {
|
|
7
|
+
getOtherRand(puic) {
|
|
8
|
+
return this.httpClient.get(this.getUrl(this.iaVersie, puic))
|
|
9
|
+
.pipe(catchError((err, _caught) => this.handleResult(err)));
|
|
10
|
+
}
|
|
11
|
+
getUrl(iaVersie, puic) {
|
|
12
|
+
return `${this.baseUrl}/mst/rest/connector/${iaVersie}/${puic}`;
|
|
13
|
+
}
|
|
14
|
+
handleResult(res) {
|
|
15
|
+
if (res.error) {
|
|
16
|
+
console.log('error bij ophalen connector-info', res.error);
|
|
17
|
+
}
|
|
18
|
+
this.store.dispatch(ClearProgress());
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: ConnectorService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
22
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: ConnectorService, providedIn: 'root' }); }
|
|
23
|
+
}
|
|
24
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: ConnectorService, decorators: [{
|
|
25
|
+
type: Injectable,
|
|
26
|
+
args: [{
|
|
27
|
+
providedIn: 'root'
|
|
28
|
+
}]
|
|
29
|
+
}] });
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tc3Qtdmlld2VyL3NyYy9saWIvc2VydmljZXMvY29ubmVjdG9yLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQzs7QUFLdEQsTUFBTSxPQUFPLGdCQUFpQixTQUFRLGVBQWU7SUFFMUMsWUFBWSxDQUFDLElBQVk7UUFDNUIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FDdEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ3pCLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRU8sTUFBTSxDQUFDLFFBQWdCLEVBQUUsSUFBWTtRQUN6QyxPQUFPLEdBQUksSUFBSSxDQUFDLE9BQVEsdUJBQXVCLFFBQVEsSUFBSyxJQUFLLEVBQUUsQ0FBQztJQUN4RSxDQUFDO0lBRUQsWUFBWSxDQUFDLEdBQVE7UUFDakIsSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDWixPQUFPLENBQUMsR0FBRyxDQUFDLGtDQUFrQyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBQ0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztRQUNyQyxPQUFPLEVBQUUsQ0FBQztJQUNkLENBQUM7K0dBbEJRLGdCQUFnQjttSEFBaEIsZ0JBQWdCLGNBRmIsTUFBTTs7NEZBRVQsZ0JBQWdCO2tCQUg1QixVQUFVO21CQUFDO29CQUNSLFVBQVUsRUFBRSxNQUFNO2lCQUNyQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBDbGVhclByb2dyZXNzIH0gZnJvbSAnLi4vc3RhdGUvYWN0aW9ucy9hY3Rpb25zJztcbmltcG9ydCB7IEJhc2VSZXN0U2VydmljZSB9IGZyb20gJy4vYmFzZS1yZXN0LnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSh7XG4gICAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIENvbm5lY3RvclNlcnZpY2UgZXh0ZW5kcyBCYXNlUmVzdFNlcnZpY2Uge1xuXG4gICAgcHVibGljIGdldE90aGVyUmFuZChwdWljOiBzdHJpbmcpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LmdldDxzdHJpbmc+KFxuICAgICAgICAgICAgdGhpcy5nZXRVcmwodGhpcy5pYVZlcnNpZSwgcHVpYykpXG4gICAgICAgICAgICAgICAgICAgLnBpcGUoY2F0Y2hFcnJvcigoZXJyLCBfY2F1Z2h0KSA9PiB0aGlzLmhhbmRsZVJlc3VsdChlcnIpKSk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBnZXRVcmwoaWFWZXJzaWU6IHN0cmluZywgcHVpYzogc3RyaW5nKTogc3RyaW5nIHtcbiAgICAgICAgcmV0dXJuIGAkeyB0aGlzLmJhc2VVcmwgfS9tc3QvcmVzdC9jb25uZWN0b3IvJHtpYVZlcnNpZX0vJHsgcHVpYyB9YDtcbiAgICB9XG5cbiAgICBoYW5kbGVSZXN1bHQocmVzOiBhbnkpOiBbXSB7XG4gICAgICAgIGlmIChyZXMuZXJyb3IpIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKCdlcnJvciBiaWogb3BoYWxlbiBjb25uZWN0b3ItaW5mbycsIHJlcy5lcnJvcik7XG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5zdG9yZS5kaXNwYXRjaChDbGVhclByb2dyZXNzKCkpO1xuICAgICAgICByZXR1cm4gW107XG4gICAgfVxufVxuXG4iXX0=
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { JsJavaUtil } from '@loxia/rijwegen';
|
|
3
|
+
import { SetDebug } from '../state/actions/actions';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
import * as i1 from "@ngrx/store";
|
|
6
|
+
import * as i2 from "./signalerings-beeld-manager.service";
|
|
7
|
+
export class DebugService {
|
|
8
|
+
constructor(store, sbmService) {
|
|
9
|
+
this.store = store;
|
|
10
|
+
this.sbmService = sbmService;
|
|
11
|
+
this.listener = this.debugEventListener();
|
|
12
|
+
}
|
|
13
|
+
setDebugFlag(debug) {
|
|
14
|
+
this.store.dispatch(SetDebug(debug));
|
|
15
|
+
if (debug) {
|
|
16
|
+
document.getElementById('svgContainer')?.addEventListener('mouseover', this.listener);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
document.getElementById('svgContainer')?.removeEventListener('mouseover', this.listener);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
debugEventListener() {
|
|
23
|
+
return (event) => {
|
|
24
|
+
let elem = event.target;
|
|
25
|
+
let id;
|
|
26
|
+
let found = false;
|
|
27
|
+
do {
|
|
28
|
+
id = elem.id;
|
|
29
|
+
if (id.startsWith('p')) {
|
|
30
|
+
const tp = this.sbmService.getTopologyElementByPuic(id.substring(1));
|
|
31
|
+
if (tp) {
|
|
32
|
+
this.printKmInfo(tp);
|
|
33
|
+
found = true;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
elem = elem.parentElement;
|
|
37
|
+
} while (!found && elem);
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
printKmInfo(tp) {
|
|
41
|
+
const kms = JsJavaUtil.listToArray(tp.getKilometreringen());
|
|
42
|
+
if (kms.length > 0) {
|
|
43
|
+
let logline = 'Kminfo: ' + tp.getComponentName() + ', ';
|
|
44
|
+
for (const km of kms) {
|
|
45
|
+
logline += km.getKmLint() + ' ' + km.getKmWaarde() + ' ';
|
|
46
|
+
}
|
|
47
|
+
console.log(logline);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: DebugService, deps: [{ token: i1.Store }, { token: i2.SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
51
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: DebugService, providedIn: 'root' }); }
|
|
52
|
+
}
|
|
53
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: DebugService, decorators: [{
|
|
54
|
+
type: Injectable,
|
|
55
|
+
args: [{
|
|
56
|
+
providedIn: 'root'
|
|
57
|
+
}]
|
|
58
|
+
}], ctorParameters: () => [{ type: i1.Store }, { type: i2.SignaleringsBeeldManagerService }] });
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21zdC12aWV3ZXIvc3JjL2xpYi9zZXJ2aWNlcy9kZWJ1Zy5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFVBQVUsRUFBVSxNQUFNLGlCQUFpQixDQUFDO0FBRXJELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQzs7OztBQU9wRCxNQUFNLE9BQU8sWUFBWTtJQUdyQixZQUFvQixLQUE0QixFQUM1QixVQUEyQztRQUQzQyxVQUFLLEdBQUwsS0FBSyxDQUF1QjtRQUM1QixlQUFVLEdBQVYsVUFBVSxDQUFpQztRQUg5QyxhQUFRLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7SUFJdEQsQ0FBQztJQUVELFlBQVksQ0FBQyxLQUFjO1FBQ3ZCLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRXJDLElBQUksS0FBSyxFQUFFLENBQUM7WUFDUixRQUFRLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDMUYsQ0FBQzthQUFNLENBQUM7WUFDSixRQUFRLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0YsQ0FBQztJQUNMLENBQUM7SUFFTyxrQkFBa0I7UUFDdEIsT0FBTyxDQUFDLEtBQUssRUFBUSxFQUFFO1lBQ25CLElBQUksSUFBSSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDeEIsSUFBSSxFQUFVLENBQUM7WUFDZixJQUFJLEtBQUssR0FBRyxLQUFLLENBQUM7WUFDbEIsR0FBRyxDQUFDO2dCQUNBLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUNiLElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO29CQUNyQixNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLHdCQUF3QixDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDckUsSUFBSSxFQUFFLEVBQUUsQ0FBQzt3QkFDTCxJQUFJLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO3dCQUNyQixLQUFLLEdBQUcsSUFBSSxDQUFDO29CQUNqQixDQUFDO2dCQUNMLENBQUM7Z0JBQ0QsSUFBSSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUM7WUFDOUIsQ0FBQyxRQUFRLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRTtRQUM3QixDQUFDLENBQUM7SUFDTixDQUFDO0lBRU8sV0FBVyxDQUFDLEVBQTBCO1FBQzFDLE1BQU0sR0FBRyxHQUEyQixVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBQUM7UUFDcEYsSUFBSSxHQUFHLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ2pCLElBQUksT0FBTyxHQUFHLFVBQVUsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsR0FBRyxJQUFJLENBQUM7WUFDeEQsS0FBSyxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztnQkFDbkIsT0FBTyxJQUFJLEVBQUUsQ0FBQyxTQUFTLEVBQUUsR0FBRyxHQUFHLEdBQUcsRUFBRSxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsQ0FBQztZQUM3RCxDQUFDO1lBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN6QixDQUFDO0lBQ0wsQ0FBQzsrR0E3Q1EsWUFBWTttSEFBWixZQUFZLGNBRlQsTUFBTTs7NEZBRVQsWUFBWTtrQkFIeEIsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBKc0phdmFVdGlsLCBzYmJsYWQgfSBmcm9tICdAbG94aWEvcmlqd2VnZW4nO1xuaW1wb3J0IHsgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQgeyBTZXREZWJ1ZyB9IGZyb20gJy4uL3N0YXRlL2FjdGlvbnMvYWN0aW9ucyc7XG5pbXBvcnQgeyBNc3RFZGl0b3JTdGF0ZSB9IGZyb20gJy4uL3N0YXRlL21zdC1lZGl0b3Itc3RhdGUnO1xuaW1wb3J0IHsgU2lnbmFsZXJpbmdzQmVlbGRNYW5hZ2VyU2VydmljZSB9IGZyb20gJy4vc2lnbmFsZXJpbmdzLWJlZWxkLW1hbmFnZXIuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgRGVidWdTZXJ2aWNlIHtcbiAgICBwcml2YXRlIHJlYWRvbmx5IGxpc3RlbmVyID0gdGhpcy5kZWJ1Z0V2ZW50TGlzdGVuZXIoKTtcblxuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgc3RvcmU6IFN0b3JlPE1zdEVkaXRvclN0YXRlPixcbiAgICAgICAgICAgICAgICBwcml2YXRlIHNibVNlcnZpY2U6IFNpZ25hbGVyaW5nc0JlZWxkTWFuYWdlclNlcnZpY2UpIHtcbiAgICB9XG5cbiAgICBzZXREZWJ1Z0ZsYWcoZGVidWc6IGJvb2xlYW4pOiB2b2lkIHtcbiAgICAgICAgdGhpcy5zdG9yZS5kaXNwYXRjaChTZXREZWJ1ZyhkZWJ1ZykpO1xuXG4gICAgICAgIGlmIChkZWJ1Zykge1xuICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3N2Z0NvbnRhaW5lcicpPy5hZGRFdmVudExpc3RlbmVyKCdtb3VzZW92ZXInLCB0aGlzLmxpc3RlbmVyKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdzdmdDb250YWluZXInKT8ucmVtb3ZlRXZlbnRMaXN0ZW5lcignbW91c2VvdmVyJywgdGhpcy5saXN0ZW5lcik7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwcml2YXRlIGRlYnVnRXZlbnRMaXN0ZW5lcigpOiAoZTogYW55KSA9PiB2b2lkIHtcbiAgICAgICAgcmV0dXJuIChldmVudCk6IHZvaWQgPT4ge1xuICAgICAgICAgICAgbGV0IGVsZW0gPSBldmVudC50YXJnZXQ7XG4gICAgICAgICAgICBsZXQgaWQ6IHN0cmluZztcbiAgICAgICAgICAgIGxldCBmb3VuZCA9IGZhbHNlO1xuICAgICAgICAgICAgZG8ge1xuICAgICAgICAgICAgICAgIGlkID0gZWxlbS5pZDtcbiAgICAgICAgICAgICAgICBpZiAoaWQuc3RhcnRzV2l0aCgncCcpKSB7XG4gICAgICAgICAgICAgICAgICAgIGNvbnN0IHRwID0gdGhpcy5zYm1TZXJ2aWNlLmdldFRvcG9sb2d5RWxlbWVudEJ5UHVpYyhpZC5zdWJzdHJpbmcoMSkpO1xuICAgICAgICAgICAgICAgICAgICBpZiAodHApIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMucHJpbnRLbUluZm8odHApO1xuICAgICAgICAgICAgICAgICAgICAgICAgZm91bmQgPSB0cnVlO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIGVsZW0gPSBlbGVtLnBhcmVudEVsZW1lbnQ7XG4gICAgICAgICAgICB9IHdoaWxlICghZm91bmQgJiYgZWxlbSk7XG4gICAgICAgIH07XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBwcmludEttSW5mbyh0cDogc2JibGFkLlRvcG9sb2d5RWxlbWVudCk6IHZvaWQge1xuICAgICAgICBjb25zdCBrbXM6IHNiYmxhZC5LaWxvbWV0cmVyaW5nW10gPSBKc0phdmFVdGlsLmxpc3RUb0FycmF5KHRwLmdldEtpbG9tZXRyZXJpbmdlbigpKTtcbiAgICAgICAgaWYgKGttcy5sZW5ndGggPiAwKSB7XG4gICAgICAgICAgICBsZXQgbG9nbGluZSA9ICdLbWluZm86ICcgKyB0cC5nZXRDb21wb25lbnROYW1lKCkgKyAnLCAnO1xuICAgICAgICAgICAgZm9yIChjb25zdCBrbSBvZiBrbXMpIHtcbiAgICAgICAgICAgICAgICBsb2dsaW5lICs9IGttLmdldEttTGludCgpICsgJyAnICsga20uZ2V0S21XYWFyZGUoKSArICcgJztcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGNvbnNvbGUubG9nKGxvZ2xpbmUpO1xuICAgICAgICB9XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { from } from 'rxjs';
|
|
3
|
+
import * as i0 from "@angular/core";
|
|
4
|
+
import * as i1 from "./signalerings-beeld-manager.service";
|
|
5
|
+
export class EditorService {
|
|
6
|
+
constructor(signaleringsBeeldManagerService) {
|
|
7
|
+
this.signaleringsBeeldManagerService = signaleringsBeeldManagerService;
|
|
8
|
+
this.initReadyPromise();
|
|
9
|
+
}
|
|
10
|
+
// Called from GWT only, can be removed when GWT is gone. any is used because it will be removed with GWT
|
|
11
|
+
setEditor(editor) {
|
|
12
|
+
this.editor = editor;
|
|
13
|
+
this.resolveReadyPromise();
|
|
14
|
+
}
|
|
15
|
+
isReady() {
|
|
16
|
+
return this.promise;
|
|
17
|
+
}
|
|
18
|
+
// Called from GWT only, can be removed when GWT is gone
|
|
19
|
+
setSignaleringsBeeldManager(signaleringsBeeldManager) {
|
|
20
|
+
this.signaleringsBeeldManagerService.set(signaleringsBeeldManager);
|
|
21
|
+
}
|
|
22
|
+
laadSignaleringsbeelden(iaVersie, dtos) {
|
|
23
|
+
const laadSignaleringsbeelden = this.editor.laadSignaleringsbeelden(iaVersie, dtos);
|
|
24
|
+
return from(laadSignaleringsbeelden);
|
|
25
|
+
}
|
|
26
|
+
laadRouteFiles(iaVersie, pplgs) {
|
|
27
|
+
return this.editor.laadRouteFiles(iaVersie, pplgs);
|
|
28
|
+
}
|
|
29
|
+
getRijwegplan(pplg) {
|
|
30
|
+
return this.editor.getRijwegplan(pplg);
|
|
31
|
+
}
|
|
32
|
+
getVrijebaanRijwegplan(pplg, vanSpoor) {
|
|
33
|
+
return this.editor.getVrijebaanRijwegplan(pplg, vanSpoor);
|
|
34
|
+
}
|
|
35
|
+
getRijwegplannen() {
|
|
36
|
+
return this.editor.getRijwegplannen();
|
|
37
|
+
}
|
|
38
|
+
initReadyPromise() {
|
|
39
|
+
const that = this;
|
|
40
|
+
this.promise = this.promise === undefined ? new Promise(function (resolve, _reject) {
|
|
41
|
+
that.resolveReadyPromise = resolve;
|
|
42
|
+
}) : this.promise;
|
|
43
|
+
}
|
|
44
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: EditorService, deps: [{ token: i1.SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
45
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: EditorService }); }
|
|
46
|
+
}
|
|
47
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: EditorService, decorators: [{
|
|
48
|
+
type: Injectable
|
|
49
|
+
}], ctorParameters: () => [{ type: i1.SignaleringsBeeldManagerService }] });
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWRpdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tc3Qtdmlld2VyL3NyYy9saWIvc2VydmljZXMvZWRpdG9yLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsSUFBSSxFQUFjLE1BQU0sTUFBTSxDQUFDOzs7QUFLeEMsTUFBTSxPQUFPLGFBQWE7SUFLdEIsWUFBb0IsK0JBQWdFO1FBQWhFLG9DQUErQixHQUEvQiwrQkFBK0IsQ0FBaUM7UUFDaEYsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7SUFDNUIsQ0FBQztJQUVELHlHQUF5RztJQUN6RyxTQUFTLENBQUMsTUFBVztRQUNqQixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUVyQixJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztJQUMvQixDQUFDO0lBRUQsT0FBTztRQUNILE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDO0lBRUQsd0RBQXdEO0lBQ3hELDJCQUEyQixDQUFDLHdCQUE2QjtRQUNyRCxJQUFJLENBQUMsK0JBQStCLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUVELHVCQUF1QixDQUFDLFFBQWdCLEVBQUUsSUFBNEI7UUFDbEUsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHVCQUF1QixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNwRixPQUFPLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxjQUFjLENBQUMsUUFBZ0IsRUFBRSxLQUFlO1FBQzVDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxhQUFhLENBQUMsSUFBWTtRQUN0QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxJQUFZLEVBQUUsUUFBZ0I7UUFDakQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLHNCQUFzQixDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRUQsZ0JBQWdCO1FBQ1osT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVPLGdCQUFnQjtRQUNwQixNQUFNLElBQUksR0FBRyxJQUFJLENBQUM7UUFDbEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsVUFBUyxPQUFPLEVBQUUsT0FBTztZQUM3RSxJQUFJLENBQUMsbUJBQW1CLEdBQUcsT0FBTyxDQUFDO1FBQ3ZDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7K0dBbkRRLGFBQWE7bUhBQWIsYUFBYTs7NEZBQWIsYUFBYTtrQkFEekIsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGRvbWVpbiB9IGZyb20gJ0Bsb3hpYS9yaWp3ZWdlbic7XG5pbXBvcnQgeyBmcm9tLCBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBTaWduYWxlcmluZ3NCZWVsZE1hbmFnZXJTZXJ2aWNlIH0gZnJvbSAnLi9zaWduYWxlcmluZ3MtYmVlbGQtbWFuYWdlci5zZXJ2aWNlJztcbmltcG9ydCB7U2lnbmFsZXJpbmdzYmVlbGREdG99IGZyb20gXCIuLi8uLi9nZW5lcmF0ZWQvb3BlbmFwaVwiO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgRWRpdG9yU2VydmljZSB7XG4gICAgcHJpdmF0ZSBlZGl0b3I6IGFueTtcbiAgICBwcml2YXRlIHJlc29sdmVSZWFkeVByb21pc2U6IGFueTtcbiAgICBwcml2YXRlIHByb21pc2U6IGFueTtcblxuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgc2lnbmFsZXJpbmdzQmVlbGRNYW5hZ2VyU2VydmljZTogU2lnbmFsZXJpbmdzQmVlbGRNYW5hZ2VyU2VydmljZSkge1xuICAgICAgICB0aGlzLmluaXRSZWFkeVByb21pc2UoKTtcbiAgICB9XG5cbiAgICAvLyBDYWxsZWQgZnJvbSBHV1Qgb25seSwgY2FuIGJlIHJlbW92ZWQgd2hlbiBHV1QgaXMgZ29uZS4gYW55IGlzIHVzZWQgYmVjYXVzZSBpdCB3aWxsIGJlIHJlbW92ZWQgd2l0aCBHV1RcbiAgICBzZXRFZGl0b3IoZWRpdG9yOiBhbnkpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5lZGl0b3IgPSBlZGl0b3I7XG5cbiAgICAgICAgdGhpcy5yZXNvbHZlUmVhZHlQcm9taXNlKCk7XG4gICAgfVxuXG4gICAgaXNSZWFkeSgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMucHJvbWlzZTtcbiAgICB9XG5cbiAgICAvLyBDYWxsZWQgZnJvbSBHV1Qgb25seSwgY2FuIGJlIHJlbW92ZWQgd2hlbiBHV1QgaXMgZ29uZVxuICAgIHNldFNpZ25hbGVyaW5nc0JlZWxkTWFuYWdlcihzaWduYWxlcmluZ3NCZWVsZE1hbmFnZXI6IGFueSk6IHZvaWQge1xuICAgICAgICB0aGlzLnNpZ25hbGVyaW5nc0JlZWxkTWFuYWdlclNlcnZpY2Uuc2V0KHNpZ25hbGVyaW5nc0JlZWxkTWFuYWdlcik7XG4gICAgfVxuXG4gICAgbGFhZFNpZ25hbGVyaW5nc2JlZWxkZW4oaWFWZXJzaWU6IHN0cmluZywgZHRvczogU2lnbmFsZXJpbmdzYmVlbGREdG9bXSk6IE9ic2VydmFibGU8YW55PiB7XG4gICAgICAgIGNvbnN0IGxhYWRTaWduYWxlcmluZ3NiZWVsZGVuID0gdGhpcy5lZGl0b3IubGFhZFNpZ25hbGVyaW5nc2JlZWxkZW4oaWFWZXJzaWUsIGR0b3MpO1xuICAgICAgICByZXR1cm4gZnJvbShsYWFkU2lnbmFsZXJpbmdzYmVlbGRlbik7XG4gICAgfVxuXG4gICAgbGFhZFJvdXRlRmlsZXMoaWFWZXJzaWU6IHN0cmluZywgcHBsZ3M6IHN0cmluZ1tdKTogYW55IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuZWRpdG9yLmxhYWRSb3V0ZUZpbGVzKGlhVmVyc2llLCBwcGxncyk7XG4gICAgfVxuXG4gICAgZ2V0Umlqd2VncGxhbihwcGxnOiBzdHJpbmcpOiBkb21laW4uUmlqd2VncGxhbiB7XG4gICAgICAgIHJldHVybiB0aGlzLmVkaXRvci5nZXRSaWp3ZWdwbGFuKHBwbGcpO1xuICAgIH1cblxuICAgIGdldFZyaWplYmFhblJpandlZ3BsYW4ocHBsZzogc3RyaW5nLCB2YW5TcG9vcjogc3RyaW5nKTogZG9tZWluLlZyaWplYmFhblJpandlZ3BsYW4ge1xuICAgICAgICByZXR1cm4gdGhpcy5lZGl0b3IuZ2V0VnJpamViYWFuUmlqd2VncGxhbihwcGxnLCB2YW5TcG9vcik7XG4gICAgfVxuXG4gICAgZ2V0Umlqd2VncGxhbm5lbigpOiBkb21laW4uUmlqd2VncGxhbltdIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuZWRpdG9yLmdldFJpandlZ3BsYW5uZW4oKTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGluaXRSZWFkeVByb21pc2UoKTogdm9pZCB7XG4gICAgICAgIGNvbnN0IHRoYXQgPSB0aGlzO1xuICAgICAgICB0aGlzLnByb21pc2UgPSB0aGlzLnByb21pc2UgPT09IHVuZGVmaW5lZCA/IG5ldyBQcm9taXNlKGZ1bmN0aW9uKHJlc29sdmUsIF9yZWplY3QpIHtcbiAgICAgICAgICAgIHRoYXQucmVzb2x2ZVJlYWR5UHJvbWlzZSA9IHJlc29sdmU7XG4gICAgICAgIH0pIDogdGhpcy5wcm9taXNlO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { take, tap } from 'rxjs/operators';
|
|
3
|
+
import * as MstActions from '../state/actions/actions';
|
|
4
|
+
import { ClearProgress, ShowProgress } from '../state/actions/actions';
|
|
5
|
+
import { navigeerVanaf, setZichtbaarheidAlleRitdelen, toggleZichtbaarheidVoorBewegingen } from '../state/actions/ritdelen.actions';
|
|
6
|
+
import * as i0 from "@angular/core";
|
|
7
|
+
import * as i1 from "@ngrx/store";
|
|
8
|
+
import * as i2 from "./viewer-control.service";
|
|
9
|
+
import * as i3 from "./signalerings-beeld-manager.service";
|
|
10
|
+
export class PrintBewegingService {
|
|
11
|
+
constructor(store, viewerControlService, sbmService) {
|
|
12
|
+
this.store = store;
|
|
13
|
+
this.viewerControlService = viewerControlService;
|
|
14
|
+
this.sbmService = sbmService;
|
|
15
|
+
}
|
|
16
|
+
printBeweging(bewegingId, paginationSize) {
|
|
17
|
+
return new Promise((resolve, reject) => {
|
|
18
|
+
this.store.select('ritDelen').pipe(take(1), tap(ritdelen => {
|
|
19
|
+
const gevondenRitdeel = ritdelen.filter(r => Number.parseInt(r.getBewegingId(), 10) === bewegingId);
|
|
20
|
+
// hide/show de knoppen
|
|
21
|
+
const printing = !!bewegingId && gevondenRitdeel.length === 1;
|
|
22
|
+
this.viewerControlService.setPrinting(printing);
|
|
23
|
+
if (!printing) {
|
|
24
|
+
reject(new Error('Geen beweging gevonden voor ' + bewegingId));
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const ritdeel = gevondenRitdeel[0];
|
|
28
|
+
if (ritdeel.isNietBeschikbaar()) {
|
|
29
|
+
this.store.dispatch(navigeerVanaf(paginationSize, ritdeel));
|
|
30
|
+
this.store.dispatch(ShowProgress());
|
|
31
|
+
setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
this.focusOpBeweging(ritdeel, resolve);
|
|
35
|
+
}
|
|
36
|
+
})).subscribe();
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
focusOpBeweging(ritdeel, resolve) {
|
|
40
|
+
// deselecteer alles
|
|
41
|
+
this.store.dispatch(setZichtbaarheidAlleRitdelen(false));
|
|
42
|
+
// enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)
|
|
43
|
+
this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));
|
|
44
|
+
setTimeout(() => {
|
|
45
|
+
// dit neemt niet de vrijebaan elementen mee
|
|
46
|
+
const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());
|
|
47
|
+
const dwangPuics = this.getPuics(topoElementen);
|
|
48
|
+
this.store.dispatch(MstActions.focusOpIds(dwangPuics));
|
|
49
|
+
setTimeout(() => {
|
|
50
|
+
// resolve de promise, om aan te geven dat focus klaar is
|
|
51
|
+
resolve(true);
|
|
52
|
+
this.viewerControlService.setPrinting(false);
|
|
53
|
+
this.store.dispatch(ClearProgress());
|
|
54
|
+
}, 1000);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
getPuics(topoElementen) {
|
|
58
|
+
return topoElementen.map(e => e.getPuic());
|
|
59
|
+
}
|
|
60
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: PrintBewegingService, deps: [{ token: i1.Store }, { token: i2.ViewerControlService }, { token: i3.SignaleringsBeeldManagerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
61
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: PrintBewegingService, providedIn: 'root' }); }
|
|
62
|
+
}
|
|
63
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: PrintBewegingService, decorators: [{
|
|
64
|
+
type: Injectable,
|
|
65
|
+
args: [{
|
|
66
|
+
providedIn: 'root'
|
|
67
|
+
}]
|
|
68
|
+
}], ctorParameters: () => [{ type: i1.Store }, { type: i2.ViewerControlService }, { type: i3.SignaleringsBeeldManagerService }] });
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"print-beweging.service.js","sourceRoot":"","sources":["../../../../../projects/mst-viewer/src/lib/services/print-beweging.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { sbblad } from '@loxia/rijwegen';\nimport { Store } from '@ngrx/store';\nimport { take, tap } from 'rxjs/operators';\nimport { Ritdeel } from '../model/ritdeel';\nimport * as MstActions from '../state/actions/actions';\nimport { ClearProgress, ShowProgress } from '../state/actions/actions';\nimport { navigeerVanaf, setZichtbaarheidAlleRitdelen, toggleZichtbaarheidVoorBewegingen } from '../state/actions/ritdelen.actions';\nimport { MstEditorState } from '../state/mst-editor-state';\nimport { SignaleringsBeeldManagerService } from './signalerings-beeld-manager.service';\nimport { ViewerControlService } from './viewer-control.service';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class PrintBewegingService {\n    constructor(private readonly store: Store<MstEditorState>,\n                private readonly viewerControlService: ViewerControlService,\n                private readonly sbmService: SignaleringsBeeldManagerService) {}\n\n    printBeweging(bewegingId: number, paginationSize: number): Promise<boolean> {\n        return new Promise<boolean>((resolve, reject) => {\n            this.store.select('ritDelen').pipe(\n                take(1),\n                tap( ritdelen => {\n                const gevondenRitdeel: Ritdeel[] = ritdelen.filter(r => Number.parseInt(r.getBewegingId(), 10) === bewegingId);\n\n                // hide/show de knoppen\n                const printing = !!bewegingId && gevondenRitdeel.length === 1;\n                this.viewerControlService.setPrinting(printing);\n\n                if (!printing) {\n                    reject(new Error('Geen beweging gevonden voor ' + bewegingId));\n                    return;\n                }\n\n                const ritdeel = gevondenRitdeel[0];\n                if (ritdeel.isNietBeschikbaar()) {\n                    this.store.dispatch(navigeerVanaf(paginationSize, ritdeel));\n                    this.store.dispatch(ShowProgress());\n                    setTimeout(() => this.focusOpBeweging(ritdeel, resolve), 1000);\n                } else {\n                    this.focusOpBeweging(ritdeel, resolve);\n                }\n            })).subscribe();\n        });\n    }\n\n    private focusOpBeweging(ritdeel: Ritdeel, resolve: Function): void {\n        // deselecteer alles\n        this.store.dispatch(setZichtbaarheidAlleRitdelen(false));\n        // enable ritacties (checkbox) voor alle ritdelen met beweging die matched met bewegingId(s)\n        this.store.dispatch(toggleZichtbaarheidVoorBewegingen([parseInt(ritdeel.getBewegingId(), 10)]));\n        setTimeout(() => {\n\n            // dit neemt niet de vrijebaan elementen mee\n            const topoElementen = this.sbmService.bepaalRouteElementen(ritdeel.getRoute());\n            const dwangPuics = this.getPuics(topoElementen);\n            this.store.dispatch(MstActions.focusOpIds(dwangPuics));\n\n            setTimeout(() => {\n                // resolve de promise, om aan te geven dat focus klaar is\n                resolve(true);\n                this.viewerControlService.setPrinting(false);\n                this.store.dispatch(ClearProgress());\n            }, 1000);\n        });\n    }\n\n    private getPuics(topoElementen: sbblad.HasIdentifier[]): string[] {\n        return topoElementen.map(e => e.getPuic());\n    }\n\n}\n"]}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { JsJavaUtil } from '@loxia/rijwegen';
|
|
3
|
+
import { RijwegplanRijwegDwangCombinatie } from '../model/rijwegplan-rijweg-dwang-combinatie';
|
|
4
|
+
import { Ritdeel } from '../model/ritdeel';
|
|
5
|
+
import { MessageBuilder } from '../util/message-builder';
|
|
6
|
+
import * as i0 from "@angular/core";
|
|
7
|
+
import * as i1 from "./editor.service";
|
|
8
|
+
import * as i2 from "../atomic-components/services/messages.service";
|
|
9
|
+
const SPOOR_NAAR_VRIJEBAAN_POSTFIX = '_e';
|
|
10
|
+
const SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX = '_v';
|
|
11
|
+
export class RitLezerService {
|
|
12
|
+
constructor(rijwegPlanEditorService, messagesService) {
|
|
13
|
+
this.rijwegPlanEditorService = rijwegPlanEditorService;
|
|
14
|
+
this.messagesService = messagesService;
|
|
15
|
+
}
|
|
16
|
+
parseRit(rit, ritGewijzigdToegestaan) {
|
|
17
|
+
const ritDelen = [];
|
|
18
|
+
const missingPplgs = [];
|
|
19
|
+
if (!this.ritBestandIsGewijzigd(rit, ritGewijzigdToegestaan)) {
|
|
20
|
+
rit.bewegingen.forEach(beweging => this.parseBeweging(beweging, ritDelen, missingPplgs));
|
|
21
|
+
}
|
|
22
|
+
return ritDelen;
|
|
23
|
+
}
|
|
24
|
+
parseBeweging(beweging, ritDelen, missingPplgs) {
|
|
25
|
+
const rijwegPlan = this.getRijwegPlan(beweging.vanPplg);
|
|
26
|
+
if (!rijwegPlan) {
|
|
27
|
+
if (!missingPplgs.includes(beweging.vanPplg)) {
|
|
28
|
+
this.messagesService.showMessage(MessageBuilder.rijwegplanNietGevonden(beweging));
|
|
29
|
+
missingPplgs.push(beweging.vanPplg);
|
|
30
|
+
}
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const rijweg = this.getRijweg(rijwegPlan, beweging.vanSpoor, beweging.naarSpoor);
|
|
34
|
+
if (!rijweg) {
|
|
35
|
+
this.messagesService.showMessage(MessageBuilder.rijwegNietGevonden(beweging));
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
const dwang = this.getDwang(rijweg, beweging.dwangNummer);
|
|
39
|
+
if (!dwang) {
|
|
40
|
+
this.messagesService.showMessage(MessageBuilder.dwangNietGevonden(beweging));
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const { vrijebaanDwangInfo, vervolgSpoor } = this.extractVrijebaanDwangInfo(beweging, rijwegPlan, rijweg);
|
|
44
|
+
const dwangInfo = new RijwegplanRijwegDwangCombinatie(rijwegPlan, rijweg, dwang);
|
|
45
|
+
ritDelen.push(new Ritdeel(dwangInfo, beweging.ritActies, beweging, vrijebaanDwangInfo, vervolgSpoor, []));
|
|
46
|
+
}
|
|
47
|
+
extractVrijebaanDwangInfo(beweging, rijwegPlan, rijweg) {
|
|
48
|
+
let vrijebaanDwangInfo = undefined;
|
|
49
|
+
let vervolgSpoor;
|
|
50
|
+
if (beweging.naarSpoor.endsWith(SPOOR_NAAR_VRIJEBAAN_POSTFIX) ||
|
|
51
|
+
beweging.naarSpoor.endsWith(SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX)) {
|
|
52
|
+
let vrijebaanRijweg;
|
|
53
|
+
let vrijebaanDwang;
|
|
54
|
+
const vrijebaanRijwegplan = this.rijwegPlanEditorService.getVrijebaanRijwegplan(rijwegPlan.getPPLG(), rijweg.getEindSein().getName());
|
|
55
|
+
if (vrijebaanRijwegplan) {
|
|
56
|
+
const rijwegenArray = JsJavaUtil.listToArray(vrijebaanRijwegplan.getRijwegen());
|
|
57
|
+
const vrijebaanRijwegen = rijwegenArray.filter(vbRijweg => vbRijweg.getBeginSein().getName() === rijweg.getEindSein().getName());
|
|
58
|
+
if (vrijebaanRijwegen.length > 0) {
|
|
59
|
+
vrijebaanRijweg = vrijebaanRijwegen[0];
|
|
60
|
+
vrijebaanDwang = vrijebaanRijweg.getDwangVoorDwangNummer(0);
|
|
61
|
+
vervolgSpoor = vrijebaanRijwegplan.getVervolgSpoor(vrijebaanRijweg);
|
|
62
|
+
vrijebaanDwangInfo =
|
|
63
|
+
new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return { vrijebaanDwangInfo, vervolgSpoor };
|
|
68
|
+
}
|
|
69
|
+
getRijwegPlan(pplg) {
|
|
70
|
+
return this.rijwegPlanEditorService.getRijwegplan(pplg);
|
|
71
|
+
}
|
|
72
|
+
getDwang(rijweg, dwangNummer) {
|
|
73
|
+
return rijweg.getDwangVoorDwangNummer(this.converteerDwangNummer(dwangNummer));
|
|
74
|
+
}
|
|
75
|
+
getRijweg(rijwegPlan, vanSpoor, naarSpoor) {
|
|
76
|
+
const vanPrlSpoor = this.verwijderExtendedInformatie(vanSpoor);
|
|
77
|
+
const naarPrlSpoor = this.verwijderExtendedInformatie(naarSpoor);
|
|
78
|
+
return rijwegPlan.getRijweg(vanPrlSpoor, naarPrlSpoor);
|
|
79
|
+
}
|
|
80
|
+
ritBestandIsGewijzigd(rit, ritGewijzigdToegestaan) {
|
|
81
|
+
for (const beweging of rit.bewegingen) {
|
|
82
|
+
if (this.isGewijzigd(beweging) && !ritGewijzigdToegestaan) {
|
|
83
|
+
this.messagesService.showMessage(MessageBuilder.ritFileAlGewijzigdError(beweging));
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
verwijderExtendedInformatie(spoor) {
|
|
90
|
+
return spoor.split('_')[0];
|
|
91
|
+
}
|
|
92
|
+
converteerDwangNummer(dwangNummer) {
|
|
93
|
+
return (dwangNummer === -1) ? 0 : dwangNummer;
|
|
94
|
+
}
|
|
95
|
+
isGewijzigd(beweging) {
|
|
96
|
+
return beweging.wijzigStatus === 'Gewijzigd';
|
|
97
|
+
}
|
|
98
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: RitLezerService, deps: [{ token: i1.EditorService }, { token: i2.MessagesService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
99
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: RitLezerService }); }
|
|
100
|
+
}
|
|
101
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: RitLezerService, decorators: [{
|
|
102
|
+
type: Injectable
|
|
103
|
+
}], ctorParameters: () => [{ type: i1.EditorService }, { type: i2.MessagesService }] });
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rit-lezer.service.js","sourceRoot":"","sources":["../../../../../projects/mst-viewer/src/lib/services/rit-lezer.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { domein, JsJavaUtil } from '@loxia/rijwegen';\nimport { MessagesService } from '../atomic-components/services/messages.service';\nimport { RijwegplanRijwegDwangCombinatie } from '../model/rijwegplan-rijweg-dwang-combinatie';\nimport { Ritdeel } from '../model/ritdeel';\nimport { Beweging, Rit } from '../optimo';\nimport { MessageBuilder } from '../util/message-builder';\nimport { EditorService } from './editor.service';\n\nconst SPOOR_NAAR_VRIJEBAAN_POSTFIX = '_e';\nconst SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX = '_v';\n\n@Injectable()\nexport class RitLezerService {\n    constructor(private readonly rijwegPlanEditorService: EditorService,\n                private readonly messagesService: MessagesService) {\n    }\n\n    public parseRit(rit: Rit, ritGewijzigdToegestaan: boolean): Ritdeel[] {\n        const ritDelen: Ritdeel[] = [];\n        const missingPplgs: string[] = [];\n        if (!this.ritBestandIsGewijzigd(rit, ritGewijzigdToegestaan)) {\n            rit.bewegingen.forEach(beweging => this.parseBeweging(beweging, ritDelen, missingPplgs));\n        }\n        return ritDelen;\n    }\n\n    private parseBeweging(beweging: Beweging, ritDelen: Ritdeel[], missingPplgs: string[]): void {\n        const rijwegPlan = this.getRijwegPlan(beweging.vanPplg);\n        if (!rijwegPlan) {\n            if (!missingPplgs.includes(beweging.vanPplg)) {\n                this.messagesService.showMessage(MessageBuilder.rijwegplanNietGevonden(beweging));\n                missingPplgs.push(beweging.vanPplg);\n            }\n            return;\n        }\n        const rijweg = this.getRijweg(rijwegPlan, beweging.vanSpoor, beweging.naarSpoor);\n        if (!rijweg) {\n            this.messagesService.showMessage(MessageBuilder.rijwegNietGevonden(beweging));\n            return;\n        }\n\n        const dwang = this.getDwang(rijweg, beweging.dwangNummer);\n        if (!dwang) {\n            this.messagesService.showMessage(MessageBuilder.dwangNietGevonden(beweging));\n            return;\n        }\n        const { vrijebaanDwangInfo, vervolgSpoor } = this.extractVrijebaanDwangInfo(beweging, rijwegPlan, rijweg);\n        const dwangInfo = new RijwegplanRijwegDwangCombinatie(rijwegPlan, rijweg, dwang);\n        ritDelen.push(new Ritdeel(dwangInfo, beweging.ritActies, beweging, vrijebaanDwangInfo, vervolgSpoor, []));\n    }\n\n    private extractVrijebaanDwangInfo(beweging: Beweging, rijwegPlan: domein.Rijwegplan, rijweg: domein.Rijweg): { vrijebaanDwangInfo: RijwegplanRijwegDwangCombinatie | undefined, vervolgSpoor: string | undefined } {\n        let vrijebaanDwangInfo: RijwegplanRijwegDwangCombinatie | undefined = undefined;\n        let vervolgSpoor;\n        if (beweging.naarSpoor.endsWith(SPOOR_NAAR_VRIJEBAAN_POSTFIX) ||\n            beweging.naarSpoor.endsWith(SPOOR_NAAR_VEERWISSEL_VRIJEBAAN_POSTFIX)) {\n            let vrijebaanRijweg: domein.Rijweg;\n            let vrijebaanDwang;\n            const vrijebaanRijwegplan =\n                this.rijwegPlanEditorService.getVrijebaanRijwegplan(rijwegPlan.getPPLG(),\n                    rijweg.getEindSein().getName());\n            if (vrijebaanRijwegplan) {\n                const rijwegenArray: domein.Rijweg[] = JsJavaUtil.listToArray(vrijebaanRijwegplan.getRijwegen());\n\n                const vrijebaanRijwegen =\n                    rijwegenArray.filter(\n                        vbRijweg => vbRijweg.getBeginSein().getName() === rijweg.getEindSein().getName());\n                if (vrijebaanRijwegen.length > 0) {\n                    vrijebaanRijweg = vrijebaanRijwegen[0];\n                    vrijebaanDwang = vrijebaanRijweg.getDwangVoorDwangNummer(0);\n                    vervolgSpoor = vrijebaanRijwegplan.getVervolgSpoor(vrijebaanRijweg);\n\n                    vrijebaanDwangInfo =\n                        new RijwegplanRijwegDwangCombinatie(vrijebaanRijwegplan, vrijebaanRijweg, vrijebaanDwang);\n                }\n            }\n        }\n        return { vrijebaanDwangInfo, vervolgSpoor };\n    }\n\n    private getRijwegPlan(pplg: string): domein.Rijwegplan {\n        return this.rijwegPlanEditorService.getRijwegplan(pplg);\n    }\n\n    private getDwang(rijweg: domein.Rijweg, dwangNummer: number): domein.Dwang {\n        return rijweg.getDwangVoorDwangNummer(this.converteerDwangNummer(dwangNummer));\n    }\n\n    private getRijweg(rijwegPlan: domein.Rijwegplan, vanSpoor: string, naarSpoor: string): domein.Rijweg {\n        const vanPrlSpoor = this.verwijderExtendedInformatie(vanSpoor);\n        const naarPrlSpoor = this.verwijderExtendedInformatie(naarSpoor);\n        return rijwegPlan.getRijweg(vanPrlSpoor, naarPrlSpoor);\n    }\n\n    private ritBestandIsGewijzigd(rit: Rit, ritGewijzigdToegestaan: boolean): boolean {\n        for (const beweging of rit.bewegingen) {\n            if (this.isGewijzigd(beweging) && !ritGewijzigdToegestaan) {\n                this.messagesService.showMessage(MessageBuilder.ritFileAlGewijzigdError(beweging));\n                return true;\n            }\n        }\n        return false;\n    }\n\n    private verwijderExtendedInformatie(spoor: string): string {\n        return spoor.split('_')[0];\n    }\n\n    private converteerDwangNummer(dwangNummer: number): number {\n        return (dwangNummer === -1) ? 0 : dwangNummer;\n    }\n\n    private isGewijzigd(beweging: Beweging): boolean {\n        return beweging.wijzigStatus === 'Gewijzigd';\n    }\n}\n"]}
|